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

2019-08-28 Thread GunChleoc
Review: Approve I have tested map upload and attaching to forum. -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_attachments/+merge/370342 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/amazons-coding-changes into lp:widelands

2019-08-28 Thread GunChleoc
I have done a first round of code review, no testing yet. Diff comments: > > === modified file 'src/editor/tools/delete_critter_tool.cc' > --- src/editor/tools/delete_critter_tool.cc 2019-02-23 11:00:49 + > +++ src/editor/tools/delete_critter_tool.cc 2019-08-23 14:48:43 + > @@ -41,7

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

2019-08-28 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/balancing-201908 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/balancing-201908/+merge/371947 Test changes suggested in https://ww

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

2019-08-28 Thread kaputtnik
Can you please merge trunk? I am struggling with bug 1839740 ... which is solved in trunk. I get the same crash: /widelands-repo/new-shipping/src/economy/fleet.cc:888: void Widelands::Fleet::check_push_destination(Widelands::Game&, Widelands::Ship&, const Widelands::PortDock&, Widelands::Port

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

2019-08-28 Thread TiborB
I am also for merging into trunk to get better testing. Personally I dont like splitting the economy into two parallel economies, but if there is a consensus about this... -- https://code.launchpad.net/~widelands-dev/widelands/ferry/+merge/351880 Your team Widelands Developers is subscribed to br

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/amazons-coding-changes into lp:widelands

2019-08-28 Thread hessenfarmer
I just tested it with my first loadable(playable?) amazons data dir. However I didn't get a building menu when clicking on buildcap that already had a flg built. I got a view only menu instead. -- https://code.launchpad.net/~widelands-dev/widelands/amazons-coding-changes/+merge/371725 Your team

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-794407-soldier-stats into lp:widelands

2019-08-28 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-794407-soldier-stats into lp:widelands. Commit message: Improve soldier level graphics and chat menu code - Improve visibility of health bar graphs - Add toggle for soldier level/health bar graphics - Small refactoring for cat menu co

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-794407-soldier-stats into lp:widelands

2019-08-28 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-794407-soldier-stats into lp:widelands has been updated. Commit message changed to: Improve soldier level graphics and chat menu code - Improve visibility of health bar graphs - Add toggle for soldier level/health bar graphics - Indicate in b

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

2019-08-28 Thread kaputtnik
I get some text conflicts when merging trunk. Benedikt, can look into this and make the call for merging? -- https://code.launchpad.net/~widelands-dev/widelands/ferry/+merge/351880 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ferry.

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-794407-soldier-stats into lp:widelands

2019-08-28 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-794407-soldier-stats into lp:widelands has been updated. Commit message changed to: Improve soldier level graphics and chat menu code - Improve visibility of health bar graphs - Add toggle for soldier level/health bar graphics - Indicate in b

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

2019-08-28 Thread bunnybot
Continuous integration builds have changed state: Travis build 5352. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/577985913. Appveyor build 5122. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_balancing_

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

2019-08-28 Thread kaputtnik
Manx thanks :) I wait only for janus to approve the changes regarding python3. He will look at it next weekend. -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_attachments/+merge/370342 Your team Widelands Developers is subscribed to branch lp:widelands-website.

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-794407-soldier-stats into lp:widelands

2019-08-28 Thread bunnybot
Continuous integration builds have changed state: Travis build 5354. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/578065755. Appveyor build 5124. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_794407