Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/authors into lp:widelands

2015-02-23 Thread GunChleoc
No problem. This is why we're a team - it make for better code ;)
-- 
https://code.launchpad.net/~widelands-dev/widelands/authors/+merge/250513
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/authors into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1397500 into lp:widelands

2015-02-23 Thread GunChleoc
Yes, we could do that. For GUI images, we would then still need to prefix 
"data" to the image files, which sort of means that we are redefining the same 
information all the time all over the code base. This is why I came up with the 
image catalog for GUI images, but we could also use other means to the same end 
- here are 2 ideas:

1. If the file doesn't exist, the image loader will prefix "image" and check 
again if the file exists.

2. We use a "tribes:" prefix for the images from Lua, just like we already do 
with the "map:" prefix for other files. If the image doesn't have a prefix, 
Widelands will assume that it is in the "images" directory.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1397500 into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~hjd/widelands-website/django1.3.7 into lp:widelands-website

2015-02-23 Thread kaputtnik
Oh, i havn't seen this is deployd and sorry for testing  :-(

The file "pip_requirements.txt" on 
http://bazaar.launchpad.net/~widelands-dev/widelands-website/trunk/files is 
still the same (no django 1.3.7) and its still on revision 383.




-- 
https://code.launchpad.net/~hjd/widelands-website/django1.3.7/+merge/245447
Your team Widelands Developers is requested to review the proposed merge of 
lp:~hjd/widelands-website/django1.3.7 into lp:widelands-website.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1397500 into lp:widelands

2015-02-23 Thread SirVer
> For GUI images, we would then still need to prefix "data" to the image files, 
> which sort of means that we are redefining the same information all the time 
> all over the code base.

Why? They load their graphics through load_image, which uses g_fs too. If we 
only register data/ into g_fs, it will just work and no mention of data/ is 
ever needed. Or am I missing something?
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1397500 into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~hjd/widelands-website/django1.3.7 into lp:widelands-website

2015-02-23 Thread noreply
The proposal to merge lp:~hjd/widelands-website/django1.3.7 into 
lp:widelands-website has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~hjd/widelands-website/django1.3.7/+merge/245447
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~hjd/widelands-website/django1.3.7 into lp:widelands-website.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~hjd/widelands-website/django1.3.7 into lp:widelands-website

2015-02-23 Thread SirVer
I forgot to push. Thanks for the poke!
-- 
https://code.launchpad.net/~hjd/widelands-website/django1.3.7/+merge/245447
Your team Widelands Developers is requested to review the proposed merge of 
lp:~hjd/widelands-website/django1.3.7 into lp:widelands-website.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] offer to contribute

2015-02-23 Thread daAlx1
Dear Widelands-team,


I have found widelands a couple of days ago and I first of all want to
tell you that I really like the game you have created. A long time ago I
had much fun with settlers and I am looking forward to nice gaming
experiences with widelands.

Moreover, I have some background in computer science and I decided
recently that I would like to train my C++-abilities on some useful
project. So if you allow I would like to do some contributions to
widelands. I already had a look at the widelands source-code for some
days now and at the list of bugs. If you agree I would like
to deal with the "Multiple hunters hunt for same animal"-bug
(https://bugs.launchpad.net/widelands/+bug/1407418). I have some ideas
how to fix this problem, but there are still a few questions I would
like to discuss about it first. I assume that the best place for such a
discussion is the comment section of this bug (correct me if I am
wrong), so I will put something there as well.

Kind regards,

daAlx1

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] offer to contribute

2015-02-23 Thread Holger Rapp
Sorry, this message got stopped by Launchpads stupid email list policy…

I think the bug is great starting point. Discussion should indeed take place 
there.

Cheers,
Holger

> On 23.02.2015, at 22:13, daAlx1  wrote:
> 
> Dear Widelands-team,
> 
> 
> I have found widelands a couple of days ago and I first of all want to
> tell you that I really like the game you have created. A long time ago I
> had much fun with settlers and I am looking forward to nice gaming
> experiences with widelands.
> 
> Moreover, I have some background in computer science and I decided
> recently that I would like to train my C++-abilities on some useful
> project. So if you allow I would like to do some contributions to
> widelands. I already had a look at the widelands source-code for some
> days now and at the list of bugs. If you agree I would like
> to deal with the "Multiple hunters hunt for same animal"-bug
> (https://bugs.launchpad.net/widelands/+bug/1407418). I have some ideas
> how to fix this problem, but there are still a few questions I would
> like to discuss about it first. I assume that the best place for such a
> discussion is the comment section of this bug (correct me if I am
> wrong), so I will put something there as well.
> 
> Kind regards,
> 
> daAlx1
> 
> ___
> Mailing list: https://launchpad.net/~widelands-dev
> Post to : widelands-dev@lists.launchpad.net
> Unsubscribe : https://launchpad.net/~widelands-dev
> More help   : https://help.launchpad.net/ListHelp


___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/handle_big_images into lp:widelands-website

2015-02-23 Thread SirVer
Sorry that you invested your weekend and did not find anything out. It is much 
appreciated that you took the time though.

> Restriction to 100 Characters:

I am not sure if this can be changed easily. It will require a schema change in 
the database if i understand correctly. I do not know if django deals 
gracefully with that.

The storageclass sounds better imho. 

Let me know when this should be merged again and if I can help with anything.
-- 
https://code.launchpad.net/~franku/widelands-website/handle_big_images/+merge/247235
Your team Widelands Developers is subscribed to branch lp:widelands-website.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/find_attack_soldiers into lp:widelands

2015-02-23 Thread SirVer
> - update military site window when the user changes the soldier preference
(at the moment you have to close and open the window again to see the soldiers 
in the right ordering)

use a Boost::signal for that - i.e. the militarysite has one, and the ui can 
connect to it to update it whenever something is changed.

> - make sure healthy soldiers defend when the preference is set for rookies 
> (instead of wounded ones who have lower power and are therefore prefered)

How do you want to deal with that? It sounds like you want a different sorting 
for this.

> nice to have: when upgrading soldiers/occupying a building send the best 
> soldiers available (according to the preference set)

Actually that has been discussed before. It makes for an interesting strategic 
element when new buildings are not immediately manned with an invincible army. 
It gives the other player an opportunity to strike. I think this is cool and 
more dynamic than immediately having the best soldiers at the front. 

> keeping the soldiers sorted permanently is more difficult than I expected, 
> the soldiercontrol interface does not offer a unified way of storing them, so 
> for military sites they are upcasted from workers each time.

Why not change that? Remove the soldier control interface and instead make a 
HasSoldier container that can be owned by a building and handles all soldiers 
in the building. This gets rid of some inheritance which is usually bad and 
will solve your case. Just a suggestion of course.

Is this branch ready for review/merging now or do you still want to work on it?
-- 
https://code.launchpad.net/~widelands-dev/widelands/find_attack_soldiers/+merge/245276
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/find_attack_soldiers.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~franku/widelands-website/handle_big_images into lp:widelands-website

2015-02-23 Thread kaputtnik
The proposal to merge lp:~franku/widelands-website/handle_big_images into 
lp:widelands-website has been updated.

Status: Merged => Work in progress

For more details, see:
https://code.launchpad.net/~franku/widelands-website/handle_big_images/+merge/247235
-- 
Your team Widelands Developers is subscribed to branch lp:widelands-website.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp