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

2015-05-29 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1459529 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1459529 in widelands: Fullscreen toggle with the f button doesn't work properly https://bugs.launchpad.net/widelands/+bug

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

2015-05-26 Thread GunChleoc
From what I've seen on other projects, GPL for code and CC-BY-SA for graphics/sound is a common model. Some projects use the GPL for graphics as well, such as Battle for Wesnoth. From what I can see, CC-BY-SA would be the better choice though. Is is important that the licence doesn't include a

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

2015-05-24 Thread GunChleoc
I think we're good to go then. Will merge. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1455732/+merge/259326 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1455732. ___ Mailing list:

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

2015-07-28 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1375579 into lp:widelands. Requested reviews: SirVer (sirver) Related bugs: Bug #1375579 in widelands: Code cleanup: get rid of using namespace https://bugs.launchpad.net/widelands/+bug/1375579 For more details, see: https

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

2015-07-28 Thread GunChleoc
Review: Approve Thanks for fixing - this is good to go. There are still iterators all over the code from before we switched to C++11. We should get rid of as many as them as possible, because this makes the code easier to read. So, I'm trying to avoid adding new ones. I actually once had a go

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

2015-07-31 Thread GunChleoc
Good idea - done :) -- https://code.launchpad.net/~widelands-dev/widelands/economy_tutorial_fix/+merge/266519 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/economy_tutorial_fix. ___ Mailing list:

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

2015-07-31 Thread GunChleoc
desired_speed sets the speed instead of just reading it. -- https://code.launchpad.net/~widelands-dev/widelands/economy_tutorial_fix/+merge/266519 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/economy_tutorial_fix.

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

2015-08-02 Thread GunChleoc
Merged. Thanks for the review :) -- https://code.launchpad.net/~widelands-dev/widelands/economy_tutorial_fix/+merge/266519 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/economy_tutorial_fix. ___ Mailing list:

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

2015-07-31 Thread GunChleoc
I have added a codecheck rule. Please have a look. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1375579/+merge/266060 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1375579. ___ Mailing list:

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

2015-07-31 Thread GunChleoc
Thanks! -- https://code.launchpad.net/~widelands-dev/widelands/authors_and_languages/+merge/265892 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/authors_and_languages. ___ Mailing list:

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands

2015-07-31 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Description changed to: Various string fixes for issues reported on Transifex. Eliminated preceding and trailing whitespaces. For more details, see:

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

2015-07-31 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/economy_tutorial_fix into lp:widelands. Requested reviews: wl-zocker (wl-zocker) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/economy_tutorial_fix/+merge/266519 Economy tutorial: the building statistics

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/stock-policy-icons into lp:widelands

2015-07-31 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/stock-policy-icons into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/stock-policy-icons/+merge/266518 New warehouse stock policy

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands

2015-07-31 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/266520 Various string fixes for issues reported

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

2015-07-29 Thread GunChleoc
Code still LGTM :) -- https://code.launchpad.net/~franku/widelands-website/devs_and_locales_list/+merge/266025 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to

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

2015-07-29 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1201398 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1201398 in widelands: Save game claims win condition is Scenario, even when it isn't https://bugs.launchpad.net/widelands

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

2015-07-28 Thread GunChleoc
Review: Approve I can't test this, but code LGTM - just some small formatting nits. I also found a typo that's not in the diff: line 86: at given position and prepaire all for wl_markdown prepaire = prepare Diff comments: === modified file 'mainpage/views.py' --- mainpage/views.py

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

2015-07-29 Thread GunChleoc
Since you also approved the Widelands-part, whenever kaputtnik says he is happy with his code now :) Then, we will need the coordinated merging and website deployment like you did last time. -- https://code.launchpad.net/~franku/widelands-website/devs_and_locales_list/+merge/266025 Your team

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

2015-08-11 Thread GunChleoc
I will merge this, so the recipes will tell us. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1480937/+merge/267587 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1480937. ___ Mailing list:

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

2015-08-08 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-978175 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #978175 in widelands: localization not yet loaded in command line https://bugs.launchpad.net/widelands/+bug/978175 For more

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

2015-08-08 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-978175 into lp:widelands has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-978175/+merge/267432 -- Your team Widelands Developers is requested to review the

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

2015-08-04 Thread GunChleoc
Excellent, will I merge this then? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1201398/+merge/266182 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1201398 into lp:widelands.

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

2015-08-06 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1480937 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1480937 in widelands: Escape key doesn't work in all dialogues https://bugs.launchpad.net/widelands/+bug/1480937 For more

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

2015-08-10 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1480937 into lp:widelands. Requested reviews: Hans Joachim Desserud (hjd) Related bugs: Bug #1480937 in widelands: Escape key doesn't work in all dialogues https://bugs.launchpad.net/widelands/+bug/1480937 For more details

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

2015-08-12 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1463829 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1463829 in widelands: Building statistics: Last line needs more space https://bugs.launchpad.net/widelands/+bug/1463829

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

2015-08-06 Thread GunChleoc
Thanks, will merge :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1201398/+merge/266182 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1201398. ___ Mailing list:

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

2015-07-27 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1357510 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1357510 in widelands: Integrate the use of pgettext from the gettext library in C++ https://bugs.launchpad.net/widelands

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

2015-07-27 Thread GunChleoc
Thanks for the comments - all implemented. I also fixed up the building statistics, because that's where I stole the code from ;) -- https://code.launchpad.net/~widelands-dev/widelands/bug-653308/+merge/265931 Your team Widelands Developers is subscribed to branch

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

2015-07-26 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1326395 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1326395 in widelands: Information tool in the editor has large tool area https://bugs.launchpad.net/widelands/+bug/1326395

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

2015-07-26 Thread GunChleoc
Thanks :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1460724/+merge/265896 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1460724. ___ Mailing list: https://launchpad.net/~widelands-dev Post to

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands

2015-07-26 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/265906 Various string fixes for issues reported

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

2015-07-27 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-653308 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #653308 in widelands: The attack dialog is not updating the number of possible attackers https://bugs.launchpad.net/widelands

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

2015-07-25 Thread GunChleoc
Review: Resubmit I think I'm done now. Could someone please go over my last commit? -- https://code.launchpad.net/~widelands-dev/widelands/empire/+merge/257141 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/empire.

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

2015-07-25 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1460724 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1460724 in widelands: Icon in news inbox overlaps with long message text https://bugs.launchpad.net/widelands/+bug/1460724

Re: [Widelands-dev] [Merge] lp:~majcherlk/widelands/seafaring-check into lp:widelands

2015-07-25 Thread GunChleoc
Diff comments: === modified file 'src/logic/map.cc' --- src/logic/map.cc 2015-02-24 13:51:38 + +++ src/logic/map.cc 2015-06-30 00:48:12 + @@ -1992,6 +1996,61 @@ } +/* +=== +Map::check_check_seafaring() + +This function checks if there are two ports that are

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

2015-07-25 Thread GunChleoc
Venatrix has approved the changes on the forum, so I'm going to merge this now :) -- https://code.launchpad.net/~widelands-dev/widelands/empire/+merge/257141 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/empire.

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

2015-07-25 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/authors_and_languages into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1424072 in widelands: Automatically add translator credits to authors list https://bugs.launchpad.net/widelands

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

2015-07-25 Thread GunChleoc
I have gone through the code and added my usual nitpicking. I haven't gotten around to any testing yet. Diff comments: === modified file 'src/ai/defaultai.cc' --- src/ai/defaultai.cc 2015-05-07 20:46:32 + +++ src/ai/defaultai.cc 2015-06-29 19:22:37 + @@ -253,8 +268,17

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

2015-07-16 Thread GunChleoc
Thanks for making the changes... Yes, it would be great if everybody was still around - but this is the nature of Open Source projects. People come and stay as long as it is fun for them and they have the time, then they move on. Sometimes, they will disappear for a while and then come back.

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

2015-07-16 Thread GunChleoc
Widelands doesn't have a locale sk_SK@UTF-8 like Linux does, for example, but we use simply sk. So, we move from back to front until we find a matching locale. So, this is just some console output that you can ignore - It is sometimes important for me when I am working on i18n stuff, so I'd

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

2015-10-24 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1509452 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1509452 in widelands: "Scenario maps aren't loaded as scenarios" https://bugs.launchpad.net/widelands/+bug/1509452

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

2015-10-24 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1480928 into lp:widelands with lp:~widelands-dev/widelands/one_tribe as a prerequisite. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1480928 in widelands: "Lumberjack animation glitches&quo

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

2015-10-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/block_dummy_scenario into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/block_dummy_scenario/+merge/275563 Disable OK button while

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

2015-10-24 Thread GunChleoc
Excellent :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1509301/+merge/275624 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1509301. ___ Mailing list: https://launchpad.net/~widelands-dev Post

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

2015-10-23 Thread GunChleoc
Thanks for the review :) -- https://code.launchpad.net/~widelands-dev/widelands/textareas_and_labels/+merge/274054 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/textareas_and_labels. ___ Mailing list:

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

2015-10-23 Thread GunChleoc
I am getting this error on trunk as well. -- https://code.launchpad.net/~widelands-dev/widelands/ai_persistent_data/+merge/271853 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_persistent_data. ___ Mailing list:

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

2015-10-25 Thread GunChleoc
Here's the answer: http://stackoverflow.com/questions/1610030/why-can-you-return-from-a-non-void-function-without-returning-a-value-without-pr -Werror=return-type will treat just that warning as an error. Full manual: https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html --

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

2015-10-25 Thread GunChleoc
Review: Approve LGTM :) I don't know how to force the check. -- https://code.launchpad.net/~widelands-dev/widelands/ai_return_added/+merge/275638 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_return_added. ___

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

2015-10-25 Thread GunChleoc
So I guess we better shift the return statement a few lines up into the else block. -- https://code.launchpad.net/~widelands-dev/widelands/ai_return_added/+merge/275638 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_return_added.

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

2015-10-22 Thread GunChleoc
Thanks for the 2 reviews :) -- https://code.launchpad.net/~widelands-dev/widelands/map_building_packet_version/+merge/274941 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/map_building_packet_version. ___ Mailing

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

2015-10-26 Thread GunChleoc
I don't know that we would gain anything by this - it would add extra continue statements where we already have continue statements that do the job. There isn't just one major loop where we can put this on top - these are all separate places in the code. Maybe you can reorder things so that we

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

2015-10-26 Thread GunChleoc
Oops, I mean Player* other... -- https://code.launchpad.net/~widelands-dev/widelands/ai_null_enemy/+merge/275673 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_null_enemy. ___ Mailing list:

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

2015-10-26 Thread GunChleoc
How about: Player other = game().get_player(j); TeamNumber const tm = other ? other->team_number() : 0; etc. -- https://code.launchpad.net/~widelands-dev/widelands/ai_null_enemy/+merge/275673 Your team Widelands Developers is subscribed to branch

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

2015-10-27 Thread GunChleoc
Thanks for helping me fix this up :) -- https://code.launchpad.net/~widelands-dev/widelands/ai_null_enemy/+merge/275673 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_null_enemy. ___ Mailing list:

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

2015-10-27 Thread GunChleoc
I just grabbed a fresh copy of this branch from Launchpad and I can't reproduce the problem. Maybe try giving your local copy a different name? If you don't want to deal with this right now, you can give this review low priority, because one_tribe needs to go in first anyway. --

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

2015-10-29 Thread GunChleoc
Review: Approve LGTM :) I couldn't get the AI to mount a successful expedition though, due to lack of gold. The AI did conquer the required mountain, but didn't send out any geologists. Maybe as a next step, the AI could give the search for gold higher priority once there is a port or

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

2015-10-24 Thread GunChleoc
Review: Approve My guess is that it does - but not caused by this branch. So, this can go in now :) -- https://code.launchpad.net/~widelands-dev/widelands/ai_persistent_data/+merge/271853 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_persistent_data.

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

2015-10-24 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1509301 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1509301 in widelands: "Loading older multiplayer savegame doesn't work" https://bugs.launchpad.net/widelands/+b

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

2015-10-29 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/map_compatibility into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/map_compatibility/+merge/276088 There is a problem with loading

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

2015-10-26 Thread GunChleoc
I think we're done now. I also found an instance where the team number was fetched twice. -- https://code.launchpad.net/~widelands-dev/widelands/ai_null_enemy/+merge/275673 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_null_enemy.

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

2015-10-26 Thread GunChleoc
Done :) -- https://code.launchpad.net/~widelands-dev/widelands/ai_null_enemy/+merge/275673 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_null_enemy. ___ Mailing list: https://launchpad.net/~widelands-dev Post to

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

2015-10-26 Thread GunChleoc
Added a question. Diff comments: > === modified file 'src/ai/defaultai.cc' > --- src/ai/defaultai.cc 2015-10-25 12:26:20 + > +++ src/ai/defaultai.cc 2015-10-26 12:01:30 + > @@ -5075,8 +5076,12 @@ > } > // adding power of team (minus my power) divided by 2 >

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

2015-10-26 Thread GunChleoc
I think the comment wasn't saved - I don't see it. -- https://code.launchpad.net/~widelands-dev/widelands/ai_null_enemy/+merge/275673 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_null_enemy. ___ Mailing list:

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-986611-asserts into lp:widelands

2015-10-25 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-986611-asserts into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #986611 in widelands: "Issues reported by cppcheck" https://bugs.launchpad.net/widelands/+bug/986611 For mo

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

2015-10-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1171231 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1171231 in widelands: "Size of minimap in the editor not changed when new map is loaded" https://bugs.lau

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

2015-10-23 Thread GunChleoc
You need to switch your interface language to something other then English in order for it to appear. The function does not make sense if the player looks at the English map names anyway. -- https://code.launchpad.net/~widelands-dev/widelands/textareas_and_labels/+merge/274054 Your team

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

2015-10-25 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/ai_return_added into lp:widelands has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ai_return_added/+merge/275638 -- Your team Widelands Developers is subscribed to

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

2015-11-11 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/warehouse_worker into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/warehouse_worker/+merge/277221 Fixed bug in warehouse where check

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

2015-11-09 Thread GunChleoc
Actually it is good that you forgot to check - because this gave us info about bugs that need fixing in trunk :) -- https://code.launchpad.net/~widelands-dev/widelands/artifacts/+merge/276527 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/artifacts.

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

2015-11-08 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/purpose_helptexts into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/purpose_helptexts/+merge/276931 All buildings now have a purpose

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

2015-11-12 Thread GunChleoc
The purpose is not to have 4 different data types that all map to WareIndex anyway in the end. And why would the DescriptionMaintainer be using WareIndex rather than BuildingIndex or TerrainIndex? It just doesn't make sense. --

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

2015-11-12 Thread GunChleoc
Answered :) Diff comments: > === modified file 'src/logic/warehouse.cc' > --- src/logic/warehouse.cc2015-10-18 15:42:01 + > +++ src/logic/warehouse.cc2015-11-11 09:47:46 + > @@ -883,30 +883,30 @@ > worker->set_location(this); // >

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

2015-11-14 Thread GunChleoc
Thanks :) -- https://code.launchpad.net/~widelands-dev/widelands/multiplayer_help/+merge/274271 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/multiplayer_help. ___ Mailing list: https://launchpad.net/~widelands-dev

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

2015-11-16 Thread GunChleoc
Hi Nasenbaer, the history here is that I recently removed all savegame compatibility code. I assumed te same thing that you do, thet maps would not know about buildings, workers etc. Turns out they do, so we get cpmpatibility problems with maps. I think one of he problematic maps was Together

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

2015-11-11 Thread GunChleoc
Yes, that's the one. -- https://code.launchpad.net/~widelands-dev/widelands/warehouse_worker/+merge/277221 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/warehouse_worker into lp:widelands. ___

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

2015-11-11 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/index_types into lp:widelands has been updated. Description changed to: All Descr objects kept in DescriptionMaintainer lists are now indexed by DescriptionIndex rather than WareIndex, BuildingIndex, TerrainIndex etc. Important files to review

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

2015-11-17 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1516777 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1516777 in widelands: "Atlantean corn farms unproductive" https://bugs.launchpad.net/widelands/+bug/1516777 For mo

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

2015-11-17 Thread GunChleoc
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/artifacts/+merge/276527 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/artifacts. ___ Mailing list: https://launchpad.net/~widelands-dev Post

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

2015-11-17 Thread GunChleoc
I have finished reviewing the Lua code and testing. Now somebody needs to review the C++ changes - they are all in 1 commit: https://bazaar.launchpad.net/~widelands-dev/widelands/artifacts/revision/7571 -- https://code.launchpad.net/~widelands-dev/widelands/artifacts/+merge/276527 Your team

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands

2015-11-17 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland"" https://bugs.launchpad.ne

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

2015-11-01 Thread GunChleoc
Regarding http://bazaar.launchpad.net/~widelands-dev/widelands/one_tribe/revision/7452#tribes/buildings/militarysites/atlanteans/guardhouse/init.lua Renaming "outputs" to "occupants" won't work, because this is a feature of production sites in general and not just militarysites. --

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

2015-11-01 Thread GunChleoc
Some comments to the code review - posting them here rather than in the code in order not change the branch, in case you're still working on it: Regarding http://bazaar.launchpad.net/~widelands-dev/widelands/one_tribe/revision/7452#tribes/init.lua We do need the number glob for parsing the

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

2015-11-02 Thread GunChleoc
Yes, I would like to have this. I don't know how to fix the Python stuff for the test suite, which is why this branch is still waiting. I think other things are highter priority though - I'd be happy to target this for Build 20. --

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

2015-11-03 Thread GunChleoc
Review: Approve Tested and LGTM. +1 for the renaming :) -- https://code.launchpad.net/~widelands-dev/widelands/fleet_update/+merge/276457 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fleet_update. ___ Mailing

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

2015-10-30 Thread GunChleoc
Thanks for all the reviews :) Well, I could have my ! wrong :P -- https://code.launchpad.net/~widelands-dev/widelands/bug-986611-asserts/+merge/275642 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-986611-asserts.

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

2015-10-30 Thread GunChleoc
The mountain is conquered, but no geologists sent out. -- https://code.launchpad.net/~widelands-dev/widelands/ai_persdata_fix/+merge/276056 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_persdata_fix. ___ Mailing

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

2015-10-30 Thread GunChleoc
I had a look at the map in the editor, the gold isn't where I thought is was. So, forget that I said anything - the AI is probably fine :) -- https://code.launchpad.net/~widelands-dev/widelands/ai_persdata_fix/+merge/276056 Your team Widelands Developers is subscribed to branch

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

2015-11-04 Thread GunChleoc
Review: Approve I haven't tested this, but code LTGM :) -- https://code.launchpad.net/~franku/widelands-website/little_navi_changes/+merge/276625 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list:

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

2015-11-02 Thread GunChleoc
Thanks for the review! Regarding the lookup tables http://bazaar.launchpad.net/~widelands-dev/widelands/one_tribe/revision/7464 We do need the compatibility, because map loading has a building packet etc. I only included those entities in it that can't be avoided for map loading. I decided to

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

2015-11-04 Thread GunChleoc
I like learning good coe design though, so I'll put it on the todo-list :) -- https://code.launchpad.net/~widelands-dev/widelands/one_tribe/+merge/274832 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/one_tribe. ___

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

2015-10-19 Thread GunChleoc
Review: Approve I had a look at the impact of None vs. Failed - it is for the statistics only. Since it doesn't matter to have the productivity go down if there is no use for ships anyway, LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/bug1504948/+merge/274076 Your team

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

2015-10-19 Thread GunChleoc
Thanks for checking again. I think we're fine now :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1291904/+merge/237128 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1291904. ___ Mailing list:

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

2015-10-08 Thread GunChleoc
I didn't know that there was a basic binary file to add in addition to the dir, which I have now accidentally deleted. So, I'll have to recreate them. I player Long, Long Way with the first 3 AIs set to Atlanteans and the rest to Barbarians and Empire. --

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

2015-10-16 Thread GunChleoc
I can't say anything about how good the heuristics are, but I have added some code style comments / ideas. Diff comments: > === modified file 'src/ai/ai_help_structs.h' > --- src/ai/ai_help_structs.h 2015-08-19 19:29:56 + > +++ src/ai/ai_help_structs.h 2015-10-05 17:29:41 + > @@

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

2015-10-15 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/s2_map into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/s2_map/+merge/274627 Made Settlers II maps reappear in map selection windows

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

2015-10-19 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/map_building_packet_version into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/map_building_packet_version/+merge/274941 We need some

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

2015-10-20 Thread GunChleoc
Increase it to 17 please. Diff comments: > > === modified file 'src/game_io/game_player_info_packet.cc' > --- src/game_io/game_player_info_packet.cc2014-10-12 07:35:42 + > +++ src/game_io/game_player_info_packet.cc2015-10-19 20:06:10 + > @@ -30,7 +30,12 @@ > > namespace

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

2015-10-20 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1508117 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1508117 in widelands: "New game menu can trigger assert" https://bugs.launchpad.net/widelands/+bug/1508117 For mo

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

2015-10-18 Thread GunChleoc
Dito :) I just noticed that you didn't increase the version number for the savegame packet where you made the changes. This is needed so that Widelands will show an error message instead of crashing when a user tries to load an older game. Diff comments: > > === modified file

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

2015-10-18 Thread GunChleoc
Seems like Tibor hasn't had time to check back here, but I'm going to merge this now anyway - I need this branch to finish up one_tribe, which will then be ready for testing :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1291904/+merge/237128 Your team Widelands Developers is

<    1   2   3   4   5   6   7   8   9   10   >