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

2018-09-19 Thread bunnybot
Continuous integration builds have changed state: Travis build 4007. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/430731458. Appveyor build 3804. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_frisian_ba

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

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

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

2018-09-19 Thread hessenfarmer
As everything is green @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/appveyor_tuning/+merge/355335 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/appveyor_tuning. ___ Mailing list: https://l

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

2018-09-19 Thread hessenfarmer
The proposal to merge lp:~widelands-dev/widelands/frisian_balancing_2 into lp:widelands has been updated. Commit message changed to: Some balancing fixes: - Fixed the bug that barbarian trading outposts, villages and fortified villages start with zero master-miners instead of 4 (like the headq

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

2018-09-19 Thread hessenfarmer
hessenfarmer has proposed merging lp:~widelands-dev/widelands/frisian_balancing_2 into lp:widelands. Commit message: Some balancing fixes: - Fixed the bug that barbarian trading outposts, villages and fortified villages start with zero master-miners instead of 4 (like the headquarter does) - R

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

2018-09-19 Thread hessenfarmer
The proposal to merge lp:~widelands-dev/widelands/frisian_balancing_2 into lp:widelands has been updated. Commit message changed to: Some balancing fixes: - Fixed the bug that barbarian trading outposts, villages and fortified villages start with zero master-miners instead of 4 (like the headq

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

2018-09-19 Thread hessenfarmer
The proposal to merge lp:~widelands-dev/widelands/balancing-worldsavior into lp:widelands has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~widelands-dev/widelands/balancing-worldsavior/+merge/355158 -- Your team Widelands Developers is

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

2018-09-19 Thread hessenfarmer
Just added a new version. Could not resist to insert a heading for the additional working places delivering the information. If you don't want to have it now, please just comment the 2 relevant lines out so we could probably reactivate them for b21 -- https://code.launchpad.net/~widelands-dev/wi

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

2018-09-19 Thread bunnybot
Continuous integration builds have changed state: Travis build 4005. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/430516868. Appveyor build 3802. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_t

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

2018-09-19 Thread kaputtnik
Merged and deployed, sorry for the server errors... had forgotten to run the migrate command :-D -- https://code.launchpad.net/~widelands-dev/widelands-website/delete_user/+merge/354978 Your team Widelands Developers is subscribed to branch lp:widelands-website. _

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

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

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

2018-09-19 Thread hessenfarmer
@ Nordfriese: to test the message box I need to wait for anppveyor or build myself. Will report back later. Although I believe that the swap of the images will be very good for visibility and readability og the message box, because the non quadratic images will ever be porrly visible in the mess

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

2018-09-19 Thread Benedikt Straub
The editor icons were already being used in the message body… -- https://code.launchpad.net/~widelands-dev/widelands/geologist-messages/+merge/355267 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/geologist-messages. ___

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

2018-09-19 Thread GunChleoc
Thanks! If you'd still like to offer more explanation at that point in the encyclopedia, please open a new bug and target it to Build 21. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the

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

2018-09-19 Thread GunChleoc
Review: Approve LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/appveyor_tuning/+merge/355335 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/appveyor_tuning. ___ Mailing list: https://launchpad.net/~w

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

2018-09-19 Thread GunChleoc
I still do not like having the editor resource images as message icons. I'd prefer to keep it as it is, or have the resource indicator for both. -- https://code.launchpad.net/~widelands-dev/widelands/geologist-messages/+merge/355267 Your team Widelands Developers is subscribed to branch lp:~wide

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

2018-09-19 Thread Benedikt Straub
@hessenfarmer: Uploaded improved graphics for the frisian resis to this branch, how about these? -- https://code.launchpad.net/~widelands-dev/widelands/geologist-messages/+merge/355267 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/geologist-messages. ___

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

2018-09-19 Thread hessenfarmer
Ok I'll just add the possible working places without any further comment then. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_wor

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

2018-09-19 Thread Benedikt Straub
@hessenfarmer: I think the bug is caused by that that the old resis were squarish while some of the new ones are much taller than wide, so the title is not indented as far as for other messages @GunChleoc: I now put the resi image in the message body, so the two images are now swapped compared

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

2018-09-19 Thread hessenfarmer
According to how it looks in the message box it might be that the bug is hidden in the format rather than the image I would suspect the hardcoded padding value. https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/view/head:/src/logic/map_objects/tribes/worker.cc#L972 -- https://code.la

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

2018-09-19 Thread GunChleoc
Review: Needs Fixing I am against this change - it replaces a symbol that the player knows with a symbol that is never, ever seen on the map except in the editor. How about trying it the other way around, to see how that looks? -- https://code.launchpad.net/~widelands-dev/widelands/geologist-me

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

2018-09-19 Thread GunChleoc
I actually think that we should not add any strings at this point if we can avoid it, because we're in feature freeze. The information is also available at each building's help, so I don't think that the "instead of" addition is urgent enough to have it now. We can think of a good phrasing late

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

2018-09-19 Thread Tino
Tino has proposed merging lp:~widelands-dev/widelands/appveyor_tuning into lp:widelands. Commit message: Finetuning of Appveyor CI: - explicitely request GCE image with 7,5GB RAM (vs. Hyper-V with 4GB) - Set job pools for ninja via cmake Requested reviews: Widelands Developers (widelands-dev)

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

2018-09-19 Thread GunChleoc
Let's go with Ex-Member, that's good enough for me. I think removing the warning is fine - the warning is shown in Build 19, and will become obsolete in Build 20. So, warning people in-game should suffice. -- https://code.launchpad.net/~widelands-dev/widelands-website/delete_user/+merge/354978 Y

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

2018-09-19 Thread GunChleoc
I think the priority buttons make a really tiny click target anyway, so making them bigger is a good idea. I'm also OK with minimizing by clicking on the window title only. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732 Your team Wideland

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

2018-09-19 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/geologist-messages into lp:widelands has been updated. Commit message changed to: Geologist messages use the resource's image as icon instead of the resource indicator's For more details, see: https://code.launchpad.net/~widelands-dev/widelands

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

2018-09-19 Thread hessenfarmer
Hm, perhaps the problem really only arises for the priority buttons. What about having them displayed bigger and horizontally instaead of vertically behind the inputs that would allow for better precision in clicking them. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-mod