Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into lp:widelands

2018-09-11 Thread GunChleoc
There is also some NOCOM log output for testing that we need to delete before merging. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine/+merge/354747 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into lp:widelands

2018-09-11 Thread GunChleoc
For testing, hack the player_names packet and change the tribes there. You can also replace some players with empty AI if you don't want to run 4 instances of Widelands. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine/+merge/354747 Your team W

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into lp:widelands

2018-09-11 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into lp:widelands. Commit message: Fixed desync in the Smugglers scenario by using a single coroutine and selecting the wares round robin. The scenario can now be played with any tribe comb

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into lp:widelands

2018-09-11 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into lp:widelands has been updated. Commit message changed to: Fixed desync in the Smugglers scenario by using a single coroutine and selecting the wares round robin. The scenario can now be played

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow into lp:widelands

2018-09-11 Thread GunChleoc
Thanks for the review :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow/+merge/354179 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow. ___

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable into lp:widelands

2018-09-11 Thread GunChleoc
That's a missing include. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1772168-unused-key-in-luatable/+merge/354202 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable. ___

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

2018-09-11 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/stock-amounts into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/stock-amounts/+merge/354558 -- Your team Widelands Developers is subscribed to branch

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect into lp:widelands

2018-09-11 Thread GunChleoc
Review: Needs Fixing I suggested some improvements for the i18n. There is also some code duplication that we should get rid of. Diff comments: > === modified file 'src/network/gamehost.cc' > --- src/network/gamehost.cc 2018-04-07 16:59:00 + > +++ src/network/gamehost.cc 2018-09-12 05:38

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect into lp:widelands

2018-09-11 Thread GunChleoc
Bug is up: https://bugs.launchpad.net/widelands/+bug/1792079 I have 1 more idea for the memory leak. I'll try to fix it and then start the code review. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1434875-net-client-disconnect/+merge/354531 Your team Widelands Developers is request

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

2018-09-11 Thread GunChleoc
Now tested. I noticed that the economy options doesn't have it, but the change that somebody sets the target to 10k is kinda low :P @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/stock-amounts/+merge/354558 Your team Widelands Developers is subscribed to branch lp:~widel

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

2018-09-11 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/mines-worldsavior into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/mines-worldsavior/+merge/350716 -- Your team Widelands Developers is subscribed t

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

2018-09-11 Thread bunnybot
Continuous integration builds have changed state: Travis build 3939. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/427302588. Appveyor build 3737. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_world

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable into lp:widelands

2018-09-11 Thread bunnybot
Continuous integration builds have changed state: Travis build 3940. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/427333771. Appveyor build 3738. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1772168

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

2018-09-11 Thread bunnybot
Continuous integration builds have changed state: Travis build 3938. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/427174251. Appveyor build 3736. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-3736

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow into lp:widelands

2018-09-11 Thread Notabilis
Review: Approve diff, testing Code is looking good and testing works as intended. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow/+merge/354179 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1669103-no-au

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands

2018-09-11 Thread Notabilis
Notabilis has proposed merging lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands. Commit message: Adding support for Ctrl and Shift keys when using the increase/decrease buttons of input queues. Requested reviews: Widelands Developers (widelands-dev) Related b

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect into lp:widelands

2018-09-11 Thread Notabilis
The proposal to merge lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect into lp:widelands has been updated. Description changed to: When a client disconnects (either on purpose or due to network errors), the game is paused, saved, and a dialog is displayed to the host. There, the h

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect into lp:widelands

2018-09-11 Thread Notabilis
Thanks for the explanation, it makes much more sense now. I haven't considered that the dropbox needs to access "higher" parents, so it was quite a strange effect. But I guess that means that this branch isn't to blame and can be reviewed and merged. Would you mind copying your explanation to a

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable into lp:widelands

2018-09-11 Thread hessenfarmer
appveyor failed on a reason different to the issue with glbinding. something with throw Wexcepetion which I don't understand -- https://code.launchpad.net/~widelands-dev/widelands/bug-1772168-unused-key-in-luatable/+merge/354202 Your team Widelands Developers is subscribed to branch lp:~wideland

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

2018-09-11 Thread GunChleoc
Review: Approve Code LGTM now, thanks! Not tested yet. -- https://code.launchpad.net/~widelands-dev/widelands/stock-amounts/+merge/354558 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/stock-amounts. ___ Mailing li

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

2018-09-11 Thread GunChleoc
Review: Approve Tested now and TODO comment added @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/mines-worldsavior/+merge/350716 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1766957-sinking-ship-animation into lp:widelands

2018-09-11 Thread Notabilis
Review: Approve Thanks, that seems to fix it. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1766957-sinking-ship-animation/+merge/353746 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1766957-sinking-ship-animation. __

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

2018-09-11 Thread bunnybot
Continuous integration builds have changed state: Travis build 3935. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/427098399. Appveyor build 3733. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_stock_amoun

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable into lp:widelands

2018-09-11 Thread bunnybot
Continuous integration builds have changed state: Travis build 3933. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/427067915. Appveyor build 3731. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1772168

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

2018-09-11 Thread GunChleoc
Code with the dummy program LGTM. Can you please add a TODO comment to the wares help in order to document that it's a hack and waiting for an engine redesign on the production programs? Not tested yet. -- https://code.launchpad.net/~widelands-dev/widelands/mines-worldsavior/+merge/350716 Your

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1766957-sinking-ship-animation into lp:widelands

2018-09-11 Thread GunChleoc
I have added the extra animation frames, but not tested yet. We used the same hack for the tree falling animations, so it's OK for now. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1766957-sinking-ship-animation/+merge/353746 Your team Widelands Developers is subscribed to branch l

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable into lp:widelands

2018-09-11 Thread hessenfarmer
this will fail in CI, as it does not contain any of the late fixes for them -- https://code.launchpad.net/~widelands-dev/widelands/bug-1772168-unused-key-in-luatable/+merge/354202 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable

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

2018-09-11 Thread hessenfarmer
this will still fail on CI environments. please merge newest trunk with the CI fixes in -- https://code.launchpad.net/~widelands-dev/widelands/stock-amounts/+merge/354558 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/stock-amounts into lp:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/rework-resource-indicators into lp:widelands

2018-09-11 Thread Benedikt Straub
And another attempt ;) -- https://code.launchpad.net/~widelands-dev/widelands/rework-resource-indicators/+merge/353996 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/rework-resource-indicators. ___ Mailing list: http

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect into lp:widelands

2018-09-11 Thread GunChleoc
I have not been able to fix the memory leak. The heart of the problem is that dropdowns break the expected tree hierarchy for panels by necessity - otherwise, we would not be able to show the list outside of the enclosing box. We have continually been struggling with this. It's also weir that t

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

2018-09-11 Thread Benedikt Straub
OK, implemented your comment -- https://code.launchpad.net/~widelands-dev/widelands/stock-amounts/+merge/354558 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/stock-amounts into lp:widelands. ___