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

2015-05-12 Thread GunChleoc
Do you remember where you were when that happened? What was the last help entry you clicked at? These errors can be triggered when a Lua variable isn't declared as local, but I can't find any. This particular error seems to be a malformed bformat string - bformat is our Lua wrapper for boost::

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

2015-05-12 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1418050 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1418050 in widelands: "Secondary and Third Alternative Tool no longer reset to the first tool if you let go of the b

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

2015-05-12 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1418050 into lp:widelands has been updated. Description changed to: Added handling of SDL_KEYUP event. This fixes that the editor did not return to the first tool when SHIFT or ALT etc. was released. DO NOT set the bug to "Fix Committed", w

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

2015-05-12 Thread GunChleoc
Review: Approve LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1451147/+merge/258812 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1451147. ___ Mailing list: https://launchpad.net/~widelands

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

2015-05-12 Thread GunChleoc
Review: Approve LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1442869/+merge/258203 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1442869. ___ Mailing list: https://launchpad.net/~widelands

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

2015-05-12 Thread GunChleoc
OK, I will merge this then. Thanks for the review :) -- https://code.launchpad.net/~widelands-dev/widelands/building_encyclopedia/+merge/258719 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/building_encyclopedia. __

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

2015-05-14 Thread GunChleoc
Thanks for the review :) The extra checks were indeed nonsense, to I have removed them. I also added some space between rows, does this look OK now? I can't highlight only part of a string, because buttons don't allow richtext. Making only part of the string a button would make the click target

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

2015-05-14 Thread GunChleoc
We still have a reviewer saying "Needs fixing", which is why I didn't merge it yet. Let's wait for SirVer to get back. -- 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

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

2015-05-14 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1399621 into lp:widelands has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1399621/+merge/258843 -- Your team Widelands Developers is requested to r

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

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

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

2015-05-15 Thread GunChleoc
I am having problems with savegames in trunk now when the encyclopedia has been opened. So, my guess is that the bug is there and not in this branch. It has probably sometjhing to do with my changes in lua_coroutine. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1291904/+merge/23712

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

2015-05-16 Thread GunChleoc
I can't reproduce my crash now :( Can you please attach your savegame to one of the linked bugs? -- 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. _

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

2015-05-17 Thread GunChleoc
I tried the savegame you uploaded. It gives me an error message with "Unhandled version error" like it should. It is a single player game though and not a multiplayer game though, and you write above that the crash happened with a multiplayer game? Can you please double-check that this is the co

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

2015-05-17 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1455732 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1455732 in widelands: "New building encyclopedia causes crash with saveloading" https://bugs.launchpad.net/wide

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

2015-05-17 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/food_icons into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/food_icons/+merge/259327 New bread/snack/ration/meal icons for

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

2015-05-18 Thread GunChleoc
It positions the center of an animation. In this case, when the ware is lying at a flag or is being carried. -- https://code.launchpad.net/~widelands-dev/widelands/food_icons/+merge/259327 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/foo

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

2015-05-18 Thread GunChleoc
Since there are no changes in C++, you could just copy the tribes directory into trunk for testing. -- https://code.launchpad.net/~widelands-dev/widelands/food_icons/+merge/259327 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/food_icons i

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

2015-05-18 Thread GunChleoc
Review: Needs Information Thanks. Now I need some input on how to handle the license before we merge this. -- https://code.launchpad.net/~widelands-dev/widelands/food_icons/+merge/259327 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/food_icons. _

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

2015-05-19 Thread GunChleoc
Good catch, the culprit is actually the mine, not the construction site. -- 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. __

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

2015-05-21 Thread GunChleoc
Review: Resubmit Found the other bug - a global variable in Lua. The bug has been there for a while, ever since we added the automated building help. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1455732/+merge/259326 Your team Widelands Developers is subscribed to branch lp:~widel

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

2015-05-23 Thread GunChleoc
How about: The encyclopedia currently contains some errors. Please use the in-game help for correct and up to date information. "Information" doesn't have a plural in English ;) -- https://code.launchpad.net/~franku/widelands-website/faulty_encyclopedia/+merge/259967 Your team Widelands Develop

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

2015-05-24 Thread GunChleoc
Review: Approve Thanks. I can't test this, but code LGTM :) -- https://code.launchpad.net/~franku/widelands-website/faulty_encyclopedia/+merge/259967 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https:/

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: https://launch

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

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

2015-05-27 Thread GunChleoc
Thanks, fraang! I will merge this now so we can use the new icons. -- https://code.launchpad.net/~widelands-dev/widelands/food_icons/+merge/259327 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/food_icons. ___ Maili

[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

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

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

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

2015-06-01 Thread GunChleoc
It's sufficient to run it when a change in the json files has taken place. My plan is to add it to merge_and_push_translations.py, this will make it frequent enough. No need to add it to the compile script. -- https://code.launchpad.net/~widelands-dev/widelands/authors/+merge/250513 Your team Wi

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

2015-06-01 Thread GunChleoc
> The unfortunate problem is that I don't think we can legally relicense the > existing graphics without getting permission from the creators yes, this is what everybody says, and it makes sense too > which means one set of graphics would be covered by one license and another set under a differ

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

2015-06-01 Thread GunChleoc
Review: Needs Fixing I have added some suggestions for the strings, and 1 for the code. I haven't tested anything yet. Diff comments: > === modified file 'campaigns/emp01.wmf/scripting/init.lua' > --- campaigns/emp01.wmf/scripting/init.lua2014-10-02 17:05:38 + > +++ campaigns/emp01.wmf/

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

2015-06-02 Thread GunChleoc
Review: Approve Please go ahead and merge :) -- https://code.launchpad.net/~widelands-dev/widelands/tutorial-improvements/+merge/260656 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/tutorial-improvements into lp:widelands. __

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

2015-06-02 Thread GunChleoc
Since the changes are small and current, there is no need to merge trunk into the branch first. So, this will do: $ cd ~/widelands-repo/trunk $ bzr pull (to get any recent changes to the main trunk) $ bzr merge ../bug-xxx $ bzr commit -m "Bug xxx fixed" $ bzr push lp:wideland

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

2015-06-03 Thread GunChleoc
I can reproduce this now. It also doesn't happen in trunk, so the bug is in this branch. -- 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. _

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

2015-06-03 Thread GunChleoc
> you are removing a lot of translator_credits/*.po files but there are only 2 > translators/*.json files, why? Because I don't want to have to keep comparing the data while this branch is waiting for merging. I will copy the data over in Transifex when we've merged this. Transifex will then auto

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

2015-06-03 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1399621 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #849705 in widelands: "Add a column for "stopped" buildings in building statistics" https://bugs.launchpa

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

2015-06-03 Thread GunChleoc
I had overlooked the diff question. The checks only check for the exact object type without inheritance, so I have to teat for all 3 types explicitly. Diff comments: > === modified file 'src/wui/building_statistics_menu.cc' > --- src/wui/building_statistics_menu.cc 2014-11-30 18:49:38 +000

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

2015-06-06 Thread GunChleoc
Fixed :) The bug was already in trunk, it just didn't get triggered. -- 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. ___ M

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

2015-06-06 Thread GunChleoc
Transifex is where we keep the translations. I have now updated and tested the Transifex config file, so we're good to go as soon as somebody can update the website part of this. -- https://code.launchpad.net/~widelands-dev/widelands/authors/+merge/250513 Your team Widelands Developers is subscr

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

2015-06-08 Thread GunChleoc
GunChleoc has proposed merging lp:~gunchleoc/widelands/bug-1454371 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1454371 in widelands: ""Out of resources" messages should be triggered by productivity" https://bugs.lau

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

2015-06-08 Thread GunChleoc
Yay! Will merge :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1399621/+merge/258843 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1399621. ___ Mailing list: https://launchpad.net/~widelands-dev P

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/building-statistics-window-tut04 into lp:widelands

2015-06-10 Thread GunChleoc
I proofread the strings :) Diff comments: > === modified file > 'campaigns/tutorial04_economy.wmf/scripting/mission_thread.lua' > --- campaigns/tutorial04_economy.wmf/scripting/mission_thread.lua > 2015-05-31 13:45:13 + > +++ campaigns/tutorial04_economy.wmf/scripting/mission_thread.lua

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/building-statistics-window-tut04 into lp:widelands

2015-06-15 Thread GunChleoc
We are using an en dash with spaces, which is the European tradition rather than the American one. I'm fine with leaving it, because I don't want to break the strings again over this. I added 1 comment to the code - please double-check that it works. As soon as somebody has tested everything, t

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

2015-06-15 Thread GunChleoc
7 @@ > [out_of_resource_notification] > title=_Out of Fields > message=_The farmer working at this farm has no cleared soil to plant his > seeds. > -delay_attempts=10 > +productivity_threshold=30 > > [idle] > pics=farm_i_??.png # ??? > > === modified file 'tribes/empire/hu

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/building-statistics-window-tut04 into lp:widelands

2015-06-17 Thread GunChleoc
Review: Approve Thanks. Please go ahead and merge :) Diff comments: > === modified file > 'campaigns/tutorial04_economy.wmf/scripting/mission_thread.lua' > --- campaigns/tutorial04_economy.wmf/scripting/mission_thread.lua > 2015-05-31 13:45:13 + > +++ campaigns/tutorial04_economy.wmf/s

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

2015-06-18 Thread GunChleoc
Sorry, I had forgotten to set the branch owner to widelands-dev. Please try again. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1454371/+merge/261375 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1454371 into lp:wideland

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

2015-06-24 Thread GunChleoc
LGTM - if you're happy with the code, could you please fix the conflicts and merge for me? For the text conflicts, we need the following format: trend_ = Trend::kRising; color = UI_FONT_CLR_GOOD.hex_value(); -- https://code.launchpad.net/~widelands-dev/widelands/bug-1454371/+merge/261375 Your

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

2015-06-24 Thread GunChleoc
Thanks :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1454371/+merge/261375 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1454371 into lp:widelands. ___ Mailing list: https://

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

2015-06-25 Thread GunChleoc
The error sounds familiar - I seem to remember fixing it someplace before, but not where. Since I don't have access to my development machine right now, I can't track this down. For testing purposes, you can get rid of the latest merge by: bzr revert -r7478 Then recompile & run the test suite.

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

2015-06-25 Thread GunChleoc
I have set the bug back to "In progress" so we won't forget. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1454371/+merge/261375 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1454371 into lp:widelands. ___

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

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

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

2015-07-12 Thread GunChleoc
I'm not familiar with the battle code, but code LGTM. To improve code style, I would like to see a blank space after the last // comment. Also, it would be good to have "roundFighted" renamed to "roundFought" - I know this was already there, so leave it if it's too much work. I am also not on m

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

2015-07-12 Thread GunChleoc
I have recently done the same in a branch that isn't quite ready yet: http://bazaar.launchpad.net/~widelands-dev/widelands/bug-1390793/revision/7415 Your function is a lot better. I have delete_tag instead of remove_tag, which has an additional check in it: void Map::delete_tag(const std::strin

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. Th

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 rath

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/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

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

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 por

[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/+b

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. __

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

2015-07-26 Thread GunChleoc
I have added a comment to your comment ;) The regression tests now also will go through in trunk (SirVer fixed it) but not here - maybe merging trunk will fix this. Diff comments: > > === modified file 'src/ai/defaultai.cc' > --- src/ai/defaultai.cc 2015-05-07 20:46:32 + > +++ src/ai

[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/+b

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 on

[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.lau

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 lp:~widelands-dev/widelands/bug

[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

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

2015-07-27 Thread GunChleoc
I don't know why a delete was necessary - maybe it was just old code? 2 of the methods now return unique_ptr. add_text is trickier and was giving me segfaults (probably because it is being used directly as well as for the member object), so I just added a todo comment for it. We should run clan

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

2015-07-27 Thread GunChleoc
Added a small change in the JSON files to make things easier for the website side of things. -- 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. _

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

2015-07-27 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 2015-0

[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

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

2015-07-28 Thread GunChleoc
Review: Approve Python code LGTM -- https://code.launchpad.net/~widelands-dev/widelands/bug-1357510/+merge/265949 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1357510. ___ Mailing list: https://launchpad.net/~

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:~franku/widelands-website/devs_and_locales_list into lp:widelands-website

2015-07-28 Thread GunChleoc
I don't know what usual Python code style says about ' vs. ". Does Python have a break statement or something like that? You could stop the loop when a KeyError is found. -- https://code.launchpad.net/~franku/widelands-website/devs_and_locales_list/+merge/266025 Your team Widelands Developers is

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

2015-07-28 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.launchpa

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

2015-07-29 Thread GunChleoc
Yes, it took me too long to find the time for a review :( -- https://code.launchpad.net/~widelands-dev/widelands/trainingsites_and_teams/+merge/260517 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/trainingsites_and_teams. _

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

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 Wi

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

2015-07-30 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/economy_tutorial_fix into lp:widelands

2015-07-30 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/string-fixes into lp:widelands

2015-07-30 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 on

[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: https://code.launchpad.net/~widelands-dev/wide

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: https://launchpad.n

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/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: https:

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: https://launchpad.net/~widela

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

2015-07-31 Thread GunChleoc
I see. Now I'm wondering if we would have a use for the real speed as well though, because it makes a difference in multiplayer. Of course, for this branch, it doesn't matter. -- https://code.launchpad.net/~widelands-dev/widelands/economy_tutorial_fix/+merge/266519 Your team Widelands Developers

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

2015-08-01 Thread GunChleoc
real_speed is read-only, and it's the speed that the game is actually using. Desired speed is set by each user (read/write). In single player games, they are identical, but in multiplayer games, the real_speed is some form of arithmetic mean of the desired speeds of each player. -- https://code

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: https:

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

2015-08-03 Thread GunChleoc
Review: Approve Code LGTM - Just one question in the diff comments. Diff comments: > === modified file 'src/ai/defaultai.cc' > --- src/ai/defaultai.cc 2015-07-27 20:25:32 + > +++ src/ai/defaultai.cc 2015-08-03 20:07:16 + > @@ -4907,7 +4911,7 @@ >

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

2015-08-03 Thread GunChleoc
BTW there is another one: Wh->can_attack() && is_visible Sorry, I was being lazy. -- https://code.launchpad.net/~widelands-dev/widelands/attack_fix/+merge/266796 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/attack_fix. __

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

2015-08-03 Thread GunChleoc
Since the branch is already pushed and it's a small change, I'd say you can do the change directly on trunk - just make sure that you don't break anything. Or you can do it in this branch and merge it again. -- https://code.launchpad.net/~widelands-dev/widelands/attack_fix/+merge/266796 Your tea

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. _

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: https://launchpad.net/~widelands-de

[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/14

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

2015-08-07 Thread GunChleoc
>> If you set it's status to "merged" it will no longer be listed in most >> listings. > > That's my problem: It is not merged. Merged are the new branches related to > this issue. > > But i will leave it as is, because of the history. > > Thanks for your answer :-) > If you want it to disap

[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

[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

[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 F

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

2015-08-10 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: https://l

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