[Widelands-dev] [Merge] lp:~widelands-dev/widelands/feature-test-supply-crash into lp:widelands

2017-01-06 Thread bunnybot
Continuous integration builds have changed state: Travis build 1807. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/189544298. Appveyor build 1645. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_feature_te

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

2017-01-06 Thread bunnybot
Continuous integration builds have changed state: Travis build 1801. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/189461912. Appveyor build 1639. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_casern_cam

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

2017-01-06 Thread GunChleoc
@toptopple: Your ideas are unrelated to this branch, we should create a new bug for them though - will yo do the honours? @SirVer: I'd like to hear you opinion on https://code.launchpad.net/~widelands-dev/widelands/critter_editor_categories/+merge/312967/comments/814078 -- https://code.launchpa

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/feature-test-supply-crash into lp:widelands

2017-01-06 Thread GunChleoc
Review: Approve Added some tiny nits - feel free to merge any time once you have addressed them :) Diff comments: > === modified file 'src/scripting/lua_map.cc' > --- src/scripting/lua_map.cc 2016-12-14 22:11:52 + > +++ src/scripting/lua_map.cc 2017-01-06 09:18:41 + > @@ -3974,7 +3977

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

2017-01-06 Thread GunChleoc
Review: Approve I went through the code - mostly minor nits. Feel free to merge when you have addressed them as you see fit and you are happy with the level of testing. Diff comments: > > === modified file 'data/campaigns/bar02.wmf/scripting/mission_thread.lua' > --- data/campaigns/bar02.wmf/s

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

2017-01-06 Thread GunChleoc
Review: Approve LGTM - just 1 nit as to phrasing. Not tested. Diff comments: > > === modified file 'data/campaigns/tutorial02_warfare.wmf/scripting/texts.lua' > --- data/campaigns/tutorial02_warfare.wmf/scripting/texts.lua 2016-11-30 > 09:14:27 + > +++ data/campaigns/tutorial02_warfare.wm

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

2017-01-06 Thread GunChleoc
Review: Approve One tiny nit - it's up to you if you want to change it. Not compiled or tested. Diff comments: > === modified file 'src/sound/sound_handler.cc' > --- src/sound/sound_handler.cc2016-10-22 18:19:22 + > +++ src/sound/sound_handler.cc2017-01-03 20:52:54 + > @@

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

2017-01-06 Thread GunChleoc
Review: Approve Not tested, code LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/unique_ptr_coroutine/+merge/313880 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/unique_ptr_coroutine. ___ Mailing lis

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-trainingsite-worker-display into lp:widelands

2017-01-06 Thread Notabilis
Notabilis has proposed merging lp:~widelands-dev/widelands/bug-trainingsite-worker-display into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1635808 in widelands: "Display of worker in training sites is not updated" https://bugs.launchpad.net/wid

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

2017-01-06 Thread Notabilis
Notabilis has proposed merging lp:~widelands-dev/widelands/casern_campaign into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/casern_campaign/+merge/314208 Adapted the tutorials and campaigns fo

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/feature-test-supply-crash into lp:widelands

2017-01-06 Thread Notabilis
The suggestions from the review has been dealt with. The Travis-tests are failing on purpose since the created regression test shows a bug in trunk at creation time of this branch. When merging trunk locally the tests run fine. If there are no further objections regarding this branch trunk can