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

2019-04-30 Thread GunChleoc
Review: Approve Yes, that's looking good now! Not tested yet. -- https://code.launchpad.net/~widelands-dev/widelands/overlapping_workareas/+merge/366623 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/overlapping_workareas. ___

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1489295-mine-is-exhausted into lp:widelands

2019-04-30 Thread bunnybot
Continuous integration builds have changed state: Travis build 4843. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/526562024. Appveyor build 4624. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_148929

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1489295-mine-is-exhausted into lp:widelands

2019-04-30 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/bug-1489295-mine-is-exhausted into lp:widelands. Commit message: when main vein is exhausted, don't show tooltip for missing food Requested reviews: hessenfarmer (stephan-lutz) Related bugs: Bug #1489295 in widelands: "ware x is m

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

2019-04-30 Thread bunnybot
Continuous integration builds have changed state: Travis build 4841. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/526398829. Appveyor build 4622. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bridges-46

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bugfix-buildings-tooltips into lp:widelands

2019-04-30 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bugfix-buildings-tooltips into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bugfix-buildings-tooltips/+merge/366607 -- Your team Widelands Developers

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bugfix-buildings-tooltips into lp:widelands

2019-04-30 Thread hessenfarmer
the inputqueues test again (gcc4.8 debug this time) @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/bugfix-buildings-tooltips/+merge/366607 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bugfix-buildings-tooltips. ___

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bugfix-buildings-tooltips into lp:widelands

2019-04-30 Thread bunnybot
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 4829. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/525646461. -- https://code.launchpad.net/~widelands-dev/widelands/bugfix-buildings-tooltips/+merge/366607 You

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bugfix-buildings-tooltips into lp:widelands

2019-04-30 Thread hessenfarmer
As the fix for the mines messages is more complex I'd like to have this one first. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bugfix-buildings-tooltips/+merge/366607 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bugfix-buildings-t

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bugfix-buildings-tooltips into lp:widelands

2019-04-30 Thread hessenfarmer
I think I have seen already an old bugreport for this (the mines) lately. So you could search the bugs and promote this old one for b21 instead. -- https://code.launchpad.net/~widelands-dev/widelands/bugfix-buildings-tooltips/+merge/366607 Your team Widelands Developers is subscribed to branch l

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bugfix-buildings-tooltips into lp:widelands

2019-04-30 Thread Toni Förster
Review: Approve played Can confirm that it is working. Just one addition. In case of the Mines, the message "Main coal/gold/iron vein exhausted" should have the highest priority. If the vein is exhausted and no ration/snack/meal is available. The message for exhausted veins should not be repla

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bugfix-buildings-tooltips into lp:widelands

2019-04-30 Thread hessenfarmer
Thanks for the review. I would wait for an independent test review, unless you decide to already have it relying on my own testing -- https://code.launchpad.net/~widelands-dev/widelands/bugfix-buildings-tooltips/+merge/366607 Your team Widelands Developers is subscribed to branch lp:~widelands-d

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

2019-04-30 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/bug_1826669_MapDownloandChange into lp:widelands/build20 has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug_1826669_MapDownloandChange/+merge/366616 -- Your team

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

2019-04-30 Thread Toni Förster
Set to rejected since we already have merged Gun's branch. -- https://code.launchpad.net/~widelands-dev/widelands/bug_1826669_MapDownloandChange/+merge/366616 Your team Widelands Developers is subscribed to branch lp:widelands/build20. ___ Mailing list:

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

2019-04-30 Thread hessenfarmer
Shouldn't this merge request being dropped an th branch abandoned since it was fixed by another branch? -- https://code.launchpad.net/~widelands-dev/widelands/bug_1826669_MapDownloandChange/+merge/366616 Your team Widelands Developers is subscribed to branch lp:widelands/build20. ___