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

2018-09-17 Thread bunnybot
Continuous integration builds have changed state: Travis build 3993. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/429723572. Appveyor build 3790. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug1792297_

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

2018-09-17 Thread bunnybot
Continuous integration builds have changed state: Travis build 3992. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/429683077. Appveyor build 3789. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_balancing_

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

2018-09-17 Thread hessenfarmer
fixed the first comments. I don't understand what you mean with your last comment. I just wanted to make clear that they are not required by these buildings but rather substitute a lower level worker. Perhaps we can have a (required) behind the normal working places and an optional behind the

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

2018-09-17 Thread kaputtnik
Review: Resubmit -- https://code.launchpad.net/~widelands-dev/widelands-website/delete_user/+merge/354978 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to :

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

2018-09-17 Thread GunChleoc
I just did some testing - I'd replace the "instead of" variations with the usual experience on the bottom. -- 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

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

2018-09-17 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/balancing-worldsavior 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) - Re

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

2018-09-17 Thread kaputtnik
Thanks for your suggestions, all changed :) > How about calling the deleted user "Anonymous"? Not sure... reading "Anonymous" as a username may lead into the conclusion that anonymous writing is possible. My first idea for such a username was "Deleted_User" or "User_deleted" but i found it too

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

2018-09-17 Thread GunChleoc
Can you merge trunk please, so that we can get this in and call the feature freeze? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1791891-key-modifier

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

2018-09-17 Thread Benedikt Straub
Well the capacity buttons are larger and somewhat harder to miss than the priority buttons… But Alt-click should be fine since it´s just an alternative to a middleclick (without modifiers) anyway. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/3

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

2018-09-17 Thread GunChleoc
Shift-Click will gain us nothing, because we'll get the same misclick conflict as we have with Ctrl-Click. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/b

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

2018-09-17 Thread GunChleoc
Diff comments: > > === added file 'templates/wlprofile/delete_me.html' > --- templates/wlprofile/delete_me.html1970-01-01 00:00:00 + > +++ templates/wlprofile/delete_me.html2018-09-15 07:44:50 + > @@ -0,0 +1,39 @@ > +{% extends "wlprofile/base.html" %} > + > +{% load i1

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

2018-09-17 Thread GunChleoc
How about calling the deleted user "Anonymous"? -- https://code.launchpad.net/~widelands-dev/widelands-website/delete_user/+merge/354978 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/soldier-capacity-ctrl into lp:widelands

2018-09-17 Thread GunChleoc
Code LGTM now, not tested. -- https://code.launchpad.net/~widelands-dev/widelands/soldier-capacity-ctrl/+merge/355002 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/soldier-capacity-ctrl into lp:widelands. _

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

2018-09-17 Thread Benedikt Straub
Alt-Click often doesn´t work on my linux, as it´s a system key combination. Shift-Click for minimizing would be good imho. Super-Click would be better, but that wouldn´t work on Windows. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732 Your

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

2018-09-17 Thread GunChleoc
What is the usual Mac keyboard combination for Middle-click? If that's not CTRL-click, it might be better to change the window minimize shortcut. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732 Your team Widelands Developers is subscribed t

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/soldier-capacity-ctrl into lp:widelands

2018-09-17 Thread Benedikt Straub
OK implemented it like this. -- https://code.launchpad.net/~widelands-dev/widelands/soldier-capacity-ctrl/+merge/355002 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/soldier-capacity-ctrl into lp:widelands. ___

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

2018-09-17 Thread GunChleoc
Some small nits. Not tested. Diff comments: > > === modified file 'data/tribes/scripting/help/worker_help.lua' > --- data/tribes/scripting/help/worker_help.lua2017-12-07 08:17:40 > + > +++ data/tribes/scripting/help/worker_help.lua2018-09-15 19:34:05 > + > @@ -97,15 +97

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/soldier-capacity-ctrl into lp:widelands

2018-09-17 Thread GunChleoc
I comment with an idea. Diff comments: > === modified file 'src/wui/soldiercapacitycontrol.cc' > --- src/wui/soldiercapacitycontrol.cc 2018-04-27 06:11:05 + > +++ src/wui/soldiercapacitycontrol.cc 2018-09-16 09:39:05 + > @@ -112,11 +112,12 @@ > } > > void SoldierCapacityControl::click

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

2018-09-17 Thread hessenfarmer
Perhaps it might be good to notice Bug #1792774 before merging -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue. ___

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

2018-09-17 Thread GunChleoc
Since there is now a complication with this feature (see https://bugs.launchpad.net/widelands/+bug/1792774), let's postpone this - I'm calling the feature freeze now. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732 Your team Widelands Deve

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

2018-09-17 Thread hessenfarmer
Using a different key might be a solution to have this quickly. Don't know whether ALT is currently used. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug