Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands
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 Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands
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-1791891-key-modifier-inputqueue. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands
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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/soldier-capacity-ctrl into lp:widelands
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_decrease() { > - change_soldier_capacity(-1); > + // using int16_t because int32_t could cause over-/underflows How about reading the current capacity and calculating it exactly it from there? That way, no need to worry bout over- or underflows. > + change_soldier_capacity((SDL_GetModState() & KMOD_CTRL) ? > std::numeric_limits::min() : -1); > } > > void SoldierCapacityControl::click_increase() { > - change_soldier_capacity(1); > + change_soldier_capacity((SDL_GetModState() & KMOD_CTRL) ? > std::numeric_limits::max() : 1); > } > > UI::Panel* create_soldier_capacity_control(UI::Panel& parent, -- 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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
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,37 @@ > -- > function worker_help_employers_string(worker_description) > local result = "" > - local employers = worker_description.employers; > > - if (#employers > 0) then > + if (#worker_description.employers > 0) then >-- TRANSLATORS: Worker Encyclopedia: A list of buildings where a > worker can work >-- TRANSLATORS: You can also translate this as 'workplace(s)' > - result = result .. h2(ngettext("Works at", "Works at", #employers)) > + result = result .. h2(ngettext("Works at", "Works at", > #worker_description.employers)) >for i, building in ipairs(worker_description.employers) do > result = result .. dependencies({worker_description, building}, > building.descname) >end > + building = worker_description.employers[1] > + if #building.working_positions > 1 and worker_description.descname > == building.working_positions[2].descname and worker_description.descname ~= > building.working_positions[1].descname then Compare name rather than descname - names are guaranteed to be unique, descnames are translatable and not under our control regarding uniqueness. > +for i, build in ipairs(building.working_positions[1].employers) > do > + if not build.working_positions[2] then > + -- TRANSLATORS: this text should describe that a more > expereinced worker can be a substitute for a less experienced worker > + result = result .. dependencies({worker_description, > build}, build.descname .. _" (instead of " .. > build.working_positions[1].descname .. ")") > + end > +end > + elseif #building.working_positions > 2 and > worker_description.descname == building.working_positions[3].descname then > +for i, build in ipairs(building.working_positions[1].employers) > do > + if #build.working_positions > 1 and not > build.working_positions[3] then > + -- TRANSLATORS: This text should describe that a level 3 > worker can be a substitute for a level 2 worker or a level 1 worker > + result = result .. dependencies({worker_description, > build}, build.descname .. _" (instead of " .. > build.working_positions[2].descname .. " or " .. > build.working_positions[1].descname .. ")") > + end > +end > +for i, build in ipairs(building.working_positions[1].employers) > do > + if not build.working_positions[2] then > + -- TRANSLATORS: this text should describe that a more > expereinced worker can be a substitute for a less experienced worker typo: experienced > + result = result .. dependencies({worker_description, > build}, build.descname .. _" (instead of " .. > build.working_positions[1].descname .. ")") > + end > +end > + end > + -- end > end > return result > end -- 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_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/soldier-capacity-ctrl into lp:widelands
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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands
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 to branch lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands
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 team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/soldier-capacity-ctrl into lp:widelands
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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/delete_user into lp:widelands-website
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/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/delete_user into lp:widelands-website
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 i18n %} > +{% load wlprofile_extras %} > + > +{% block title %} > +{% trans "Delete me" %} - {{ block.super }} > +{% endblock %} > + > +{% block content %} > +{% trans "Delete your account" %} > + > + > + Hi {{ user }}, > + we are sorry that you want to leave our community src="/wlmedia/img/smileys/face-sad.png" alt="Sad smiley"> > + What deleting yourself means: > + > + Your account will be deactivated. This means: > + > + You will immediately logged out and can't > log in anymore. You will be immediately logged out and unable to log in again > + The Username "{{ user }}" is preserved and > can't be used anymore. The Username "{{ user }}" will continue to be reserved, so registering again with that username will not be possible. > + > + > + Your profile will be > deleted and your currently used image of the avatar will be deleted. currently used avatar image > + All your private > messages will be moved into the trash. > + They stay there until the sender or recipient has also deleted > them. They will stay there until such time that the sender or recipient will also delete them. > + All your subscriptions will be removed. > + Your email address will be anonymized, so you will not > receive any notification mails anymore. anonymized -> removed? > + Everything you posted (forum posts, comments and uploaded > maps) will not be deleted. Instead of your users name the string "{{ > DELETED_USERNAME }}" will be shown. Nothing that you have posted (forum posts, comments and uploaded maps) will be deleted. Instead of your user name, the string "{{ DELETED_USERNAME }}" will be shown. > + Your online gaming password will be reset. > + All dates given in the Playtime scheduler will be deleted > + > + This step can't be undone! > + > + I am sure, please delete > me > + Cancel > + > + > +{% endblock %} > > === modified file 'templates/wlprofile/view_profile.html' > --- templates/wlprofile/view_profile.html 2017-07-27 06:01:32 + > +++ templates/wlprofile/view_profile.html 2018-09-15 07:44:50 + > @@ -4,7 +4,13 @@ > {% load custom_date %} > > {% block title %} > -{{ profile.user.username }}'s Profile - {{ block.super }} > + {% if not profile.deleted %} > + {{ profile.user.username }}'s > + {% else %} > + Deleted Users Profile Users -> User for singular Users' for plural > + {% endif %} > + - Profile > + {{ block.super }} > {% endblock %} > > {% block content %} -- 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 : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands
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/bug-1791891-key-modifier-inputqueue. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands
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/354732 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands
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-inputqueue. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/delete_user into lp:widelands-website
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 long. Ideally it should be some name which describes the action and that makes clear that a user did it by himself (and not a forum moderator or admin -> censor alarm). "Self_removed" or so... Regarding my comment on 2018-09-15: I wasn't able to find a solution to prevent writing PMs to such a user. It is a flaw of django-messages, so i filed a bugreport to the project -> https://github.com/arneb/django-messages/issues/118 I did everything to prevent sending such messages: The reply buttons for messages are not shown, the profile page isn't shown and the autosearch for users when writing a string in the Recipient box will not show inactive users. The only solution i can think of is some javascript. But i don't think it is worth the work. So from my side this can go in if we have agreed on a username to show for deleted users (plural ;) ). But we can change it also anytime later on. -- 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 : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/balancing-worldsavior into lp:widelands
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) - Removed superfluous economy settings of imperial wine - Fixed the bug that Frisian clay pits ignore economy settings. They do so now only if the economy needs fish, because Fish-producing aqua farms can stop working if the clay pits do so - Reduced the problem that Frisian scrap metal tends to pile up: Recycling centers will not skipping anymore if the economy doesn't need coal. (If they would never skip there would be cases in which they use precious coal which is currently needed elsewhere - which could be bad even though recycling saves coal after a while) Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/balancing-worldsavior/+merge/355158 Some balancing fixes from Worldsavior. Note: Unfortunately there is a little problem: If the recycling center skips and you mouse over it it says something like "skipped because economy doesn't need iron and" instead of "skipped because economy doesn't need iron and economy needs coal". I don't know how to solve that, but I guess that the problem is that a building normally doesn't skip if a ware is needed instead of being not needed. When we merge this branch, we need to record that problem in a bug, because it needs an engine fix. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/balancing-worldsavior into lp:widelands. === modified file 'data/tribes/buildings/productionsites/frisians/clay_pit/init.lua' --- data/tribes/buildings/productionsites/frisians/clay_pit/init.lua 2018-07-17 10:13:49 + +++ data/tribes/buildings/productionsites/frisians/clay_pit/init.lua 2018-09-17 16:38:22 + @@ -59,7 +59,7 @@ descname = _"making clay", actions = { "sleep=2", -"return=skipped unless economy needs clay or site has water", +"return=skipped unless economy needs clay or economy needs fish", -- Fish-producing aqua farms can stop working if the clay pits do so "return=failed unless site has water", "callworker=dig", "consume=water", === modified file 'data/tribes/buildings/productionsites/frisians/recycling_center/init.lua' --- data/tribes/buildings/productionsites/frisians/recycling_center/init.lua 2018-09-10 12:32:56 + +++ data/tribes/buildings/productionsites/frisians/recycling_center/init.lua 2018-09-17 16:38:22 + @@ -95,7 +95,7 @@ -- TRANSLATORS: Completed/Skipped/Did not start recycling iron because ... descname = pgettext("frisians_building", "recycling iron"), actions = { -"return=skipped unless economy needs iron", +"return=skipped unless economy needs iron or not economy needs coal", -- if the economy doesn't need coal the situation gets even improved because recycling saves coal "consume=scrap_iron:2 coal", "animate=working_metal 4", "sleep=4", @@ -106,7 +106,7 @@ -- TRANSLATORS: Completed/Skipped/Did not start recycling iron and gold because ... descname = pgettext("frisians_building", "recycling iron and gold"), actions = { -"return=skipped unless economy needs iron or economy needs gold", +"return=skipped unless economy needs iron or economy needs gold or not economy needs coal", -- if the economy doesn't need coal the situation gets even improved because recycling saves coal "consume=scrap_metal_mixed:2 coal", "animate=working_metal 4", "sleep=4", === modified file 'data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua' --- data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua 2018-07-15 10:32:12 + +++ data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua 2018-09-17 16:38:22 + @@ -58,6 +58,7 @@ barbarians_geologist = 4, barbarians_lumberjack = 2, barbarians_miner = 4, +barbarians_miner_master = 4, barbarians_ranger = 1, barbarians_stonemason = 2, barbarians_trainer = 3, === modified file 'data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua' --- data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua 2018-07-15 10:32:12 + +++ data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua 2018-09-17 16:38:22 + @@ -63,6 +63,7 @@ barbarians_lime_burner = 1, barbarians_l
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
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-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/delete_user into lp:widelands-website
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 : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
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 substitute places. -- 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_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/balancing-worldsavior into lp:widelands
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_worldsavior-3789. -- https://code.launchpad.net/~widelands-dev/widelands/balancing-worldsavior/+merge/355158 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/balancing-worldsavior into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
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_worker_encyclopedia-3790. -- 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_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp