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

2016-02-06 Thread GunChleoc
Review: Approve OK, let's do that then :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1542238-log/+merge/285237 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1542238-log. ___ Mai

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

2016-02-06 Thread GunChleoc
Review: Approve Please have a look at my code review commit - there is a NOCOM question in there. Also pinging Tino, because some WIN32 includes have been removed. -- https://code.launchpad.net/~widelands-dev/widelands/dedicated_out_of_main/+merge/285268 Your team Widelands Developers is subscr

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

2016-02-06 Thread GunChleoc
Review: Approve Works on Ubuntu as well, code LGTM :) Still has a codecheck error though - I will fix it. -- https://code.launchpad.net/~widelands-dev/widelands/parent_directory/+merge/285276 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/parent_directory. _

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

2016-02-06 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1397500 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/284574 -- Your team Widelands Developers is subscribed to branch lp

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

2016-02-06 Thread GunChleoc
Yes, that looks much better :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/284574 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1397500. ___ Mailing list: https://l

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

2016-02-06 Thread GunChleoc
Review: Approve LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/do_not_update_size_when_minimized/+merge/285277 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/do_not_update_size_when_minimized. ___ Ma

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

2016-02-06 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: -- https://code.launchpad.net/~widelands-dev/widelands/do_not_update_size_when_minimized/+merge/285277 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/do_not_update_size_w

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

2016-02-06 Thread TiborB
For now I would merge it as it is now and proceed when we get at least one log output -- https://code.launchpad.net/~widelands-dev/widelands/bug-1542238-log/+merge/285237 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1542238-log i

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

2016-02-06 Thread SirVer
Review: Approve Looks great. I fixed a couple of small nits while testing - see last commit. If you are happy, feel free to merge. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/284574 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/wideland

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

2016-02-06 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/285088 -- Your team Widelands Developers is subscribed to branch

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

2016-02-06 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/simplify_setbobdescription into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/simplify_setbobdescription/+merge/285236 -- Your team Widelands Develope

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

2016-02-06 Thread bunnybot
Continuous integration builds have changed state: Travis build 591. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/107439111. Appveyor build 453. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1542214-

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

2016-02-06 Thread SirVer
Cleanups are always a good idea. This might affect savegame compatibility though, so we need to do if before b19. I filed: https://bugs.launchpad.net/widelands/+bug/1542705 @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/simplify_setbobdescription/+merge/285236 Your team

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

2016-02-06 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1289943 into lp:widelands has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1289943/+merge/285201 -- Your team Widelands Developers is subscribed to branch

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

2016-02-06 Thread GunChleoc
Your solution is definitely better - will test :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1289943/+merge/285201 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1289943. ___ Mailing list: https:/

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

2016-02-06 Thread SirVer
Review: Approve no, not that I know. I am just bugged by seeing fixed bugs attached to a branch. I'll get over it I guess :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/285088 Your team Widelands Developers is subscribed to branch lp:~widelands-de

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

2016-02-06 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/do_not_update_size_when_minimized into lp:widelands. Commit message: Windows should not update their size when minimized, but instead when they get restored. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #12

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

2016-02-06 Thread SirVer
Review: Disapprove I disagree with this change. It tightly couples the child to its containing window while our UI hierarchy usually goes the other way around. Instead the Window should know that it is minimized, and therefore the children should not draw themselves automatically. I found the

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

2016-02-06 Thread Tino
Review: Approve functional test Compiles and going back to parent dir works now fine on windows! -- https://code.launchpad.net/~widelands-dev/widelands/parent_directory/+merge/285276 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/parent_directory. ___

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

2016-02-06 Thread GunChleoc
This is sort of my catch-all branch for string issues - I just fix whatever gets reported on Transifex here. It would be hard to come up with a good branch name each time. Is reusing the branch a problem for the commit history? -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/

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

2016-02-06 Thread SirVer
Review: Approve You should probably use another branch name in the future. This one has all those fixed bugs attached. One tiny nit, otherwise lgtm. Diff comments: > > === modified file 'src/ui_basic/progresswindow.cc' > --- src/ui_basic/progresswindow.cc2016-01-31 21:03:15 + > +++ sr

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

2016-02-06 Thread SirVer
MapData::create_parent_dir() is the only function that changed, evreything else are just moves from .h -> .cc. -- https://code.launchpad.net/~widelands-dev/widelands/parent_directory/+merge/285276 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widel

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

2016-02-06 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/parent_directory into lp:widelands. Commit message: create_parent_directory() uses the code from FileSystem now instead of rolling its own. Also cleaned up mapdata.h and moved implementation into the new mapdata.cc. Requested reviews: W

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

2016-02-06 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: -- https://code.launchpad.net/~widelands-dev/widelands/bug-1289943/+merge/285201 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1289943 into lp:widelands. __

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

2016-02-06 Thread Klaus Halfmann
Review: Approve testing Revied the code and plyed for quit a while, all fine for me -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/beautiful_correct_lines. __

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

2016-02-06 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/dedicated_out_of_main into lp:widelands. Commit message: Remove --dedicated commandline option and associated code. Rational: --dedicated allowed people who could host a game to keep a server running that people who could not host could co

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

2016-02-06 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/different_replay_names into lp:widelands. Commit message: Give syncstreams and replays predictable names for each client instance. Before, when one two clients joined the same network game from one computer, those clients would want to wri

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

2016-02-06 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/different_replay_names into lp:widelands has been updated. Commit Message changed to: Give syncstreams and replays predictable names for each client instance. Before, when one two clients joined the same network game from one computer, those cl

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

2016-02-06 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/add_hint_to_map_info into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/add_hint_to_map_info/+merge/285228 -- Your team Widelands Developers is subscr

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

2016-02-06 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/add_hint_to_map_info/+merge/285228 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/add_hint_to_map_info. ___ Mailing list: https://launchpad.net/~

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

2016-02-06 Thread bunnybot
Continuous integration builds have changed state: Travis build 586. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/107308861. Appveyor build 448. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_add_hint_to_

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

2016-02-06 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/fix_removal_of_ports into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_removal_of_ports/+merge/285235 -- Your team Widelands Developers is subscr

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

2016-02-06 Thread bunnybot
Continuous integration builds have changed state: Travis build 589. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/107325134. Appveyor build 451. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_removal_o

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

2016-02-06 Thread bunnybot
Continuous integration builds have changed state: Travis build 588. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/107324945. Appveyor build 450. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_simplify_setb

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

2016-02-06 Thread SirVer
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fix_removal_of_ports/+merge/285235 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_removal_of_ports. ___ Mailing list: https://launchpad.net/~

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

2016-02-06 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1542214 into lp:widelands. Commit message: Consistent ordering of OK/Cancel buttons - the OK button is always on the right for LTR languages, and on the left for RTL languages. Requested reviews: Widelands Developers (widelands-de

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

2016-02-06 Thread GunChleoc
Review: Approve Tested and code LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/fix_removal_of_ports/+merge/285235 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_removal_of_ports. ___ Mailing list

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

2016-02-06 Thread GunChleoc
Review: Approve Tested and code LGTM. How about we add some more consistency in worker/production program names? e.g. we have: check_soldier playFX create_bob geologist-find The underscores are most common, so I am in favour of renaming playFX -> play_sound geologist-find -> geologist_find -

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

2016-02-06 Thread GunChleoc
LGTM, but I think we need some log output in the classes that call this function as well, in case the non-matching Immovable == nullptr. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1542238-log/+merge/285237 Your team Widelands Developers is requested to review the proposed merge of

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

2016-02-06 Thread GunChleoc
The crash doesn't sound as if it is connected to this bug. Can you run Widelands in gdb to get a stack trace, and create a new bug report? We will also need the savegame. -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers i