[Widelands-dev] [Merge] lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands
Continuous integration builds have changed state: Travis build 4886. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/528245915. Appveyor build 4667. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_economy_target_profiles-4667. -- https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366952 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/economy-target-profiles 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/split_up_liblogic_2_mapobjectdescr into lp:widelands
Continuous integration builds have changed state: Travis build 4885. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/528202612. Appveyor build 4666. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_split_up_liblogic_2_mapobjectdescr-4666. -- https://code.launchpad.net/~widelands-dev/widelands/split_up_liblogic_2_mapobjectdescr/+merge/366332 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/split_up_liblogic_2_mapobjectdescr 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/bug-1827182-sort-client-list into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1827182-sort-client-list into lp:widelands has been updated. Commit message changed to: sort the lobby client list by client type admin->irc The admin users will be on top of the list, followed by registered and unregistered. IRC user are at the bottom as they are already. IRC user's join/part messages will also be displayed Set focus to chat input in lobby & mp by default. Clicking on the chatbox gives focus to input field. Clicking on any other UI element removes focus. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1827182-sort-client-list/+merge/366843 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1827182-sort-client-list. ___ 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-1827182-sort-client-list into lp:widelands
Sorry I turned this into a lobby/chat cleanup merge request. Gun would you be so kind and have another look, please? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827182-sort-client-list/+merge/366843 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1827182-sort-client-list. ___ 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/bug-1827182-sort-client-list into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1827182-sort-client-list into lp:widelands has been updated. Commit message changed to: sort the lobby client list by client type admin->irc The admin users will be on top of the list, followed by registered and unregistered. IRC user are at the bottom as they are already. IRC user's join/part messages will also be displayed Set focus to chat input in lobby & mp For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1827182-sort-client-list/+merge/366843 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1827182-sort-client-list. ___ 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/font_size-lua into lp:widelands
Continuous integration builds have changed state: Travis build 4882. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/528138938. Appveyor build 4663. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_font_size_lua-4663. -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/font_size-lua 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/economy-target-profiles into lp:widelands
Benedikt Straub has proposed merging lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands. Commit message: Users can define and save their own profiles of economy target quantities. Redesigned the economy options menu. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1827696 in widelands: "Allow users to define their own economy default settings" https://bugs.launchpad.net/widelands/+bug/1827696 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366952 For each tribe, I added two profiles: "Efficiency" is equal to the changes proposed previously, and "Stockpile" is for people who, well, like to stockpile stuff. Additionally there is an unchangeable "Default" profile that resets stuff to the default settings. To apply a profile, select the profile and the wares you wish to change and click Apply (replaces Reset). Use "Save" to save your current settings as a profile. The save window also allows you to delete profiles. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands. === added directory 'data/economy_profiles' === added file 'data/economy_profiles/atlanteans' --- data/economy_profiles/atlanteans 1970-01-01 00:00:00 + +++ data/economy_profiles/atlanteans 2019-05-04 19:31:09 + @@ -0,0 +1,85 @@ +# Automatically created by Widelands bzr9094[economy-target-profiles] (Debug) + +[Efficiency] +blackroot_flour="1" +atlanteans_bread="20" +bread_paddle="0" +buckets="0" +coal="5" +cornmeal="3" +diamond="3" +fire_tongs="1" +fishing_net="2" +gold="1" +gold_ore="1" +gold_thread="0" +granite="10" +hammer="0" +hook_pole="0" +hunting_bow="1" +iron="5" +iron_ore="1" +milking_tongs="0" +pick="1" +planks="1" +quartz="3" +saw="0" +scythe="0" +shield_advanced="0" +shield_steel="0" +shovel="0" +smoked_fish="5" +smoked_meat="3" +spidercloth="5" +spider_silk="5" +tabard="1" +tabard_golden="0" +trident_double="0" +trident_heavy_double="0" +trident_light="1" +trident_long="0" +trident_steel="0" +atlanteans_horse="1" +atlanteans_soldier="10" + +[Stockpile] +blackroot_flour="20" +atlanteans_bread="30" +bread_paddle="1" +buckets="2" +coal="25" +cornmeal="20" +diamond="10" +fire_tongs="1" +fishing_net="2" +gold="20" +gold_ore="15" +gold_thread="5" +granite="30" +hammer="2" +hook_pole="1" +hunting_bow="1" +iron="25" +iron_ore="20" +milking_tongs="1" +pick="3" +planks="40" +quartz="10" +saw="2" +scythe="1" +shield_advanced="1" +shield_steel="1" +shovel="2" +smoked_fish="40" +smoked_meat="25" +spidercloth="20" +spider_silk="15" +tabard="30" +tabard_golden="1" +trident_double="1" +trident_heavy_double="1" +trident_light="30" +trident_long="1" +trident_steel="1" +atlanteans_horse="20" +atlanteans_soldier="20" === added file 'data/economy_profiles/barbarians' --- data/economy_profiles/barbarians 1970-01-01 00:00:00 + +++ data/economy_profiles/barbarians 2019-05-04 19:31:09 + @@ -0,0 +1,77 @@ +# Automatically created by Widelands bzr9094[economy-target-profiles] (Debug) + +[Efficiency] +ax="1" +ax_battle="0" +ax_broad="0" +ax_bronze="0" +ax_sharp="0" +ax_warriors="0" +beer="0" +beer_strong="1" +blackwood="40" +barbarians_bread="5" +bread_paddle="0" +cloth="10" +coal="20" +felling_ax="0" +fire_tongs="1" +fishing_rod="0" +gold="1" +gold_ore="1" +granite="10" +grout="1" +hammer="1" +helmet="0" +helmet_mask="0" +helmet_warhelm="0" +hunting_spear="0" +iron="5" +iron_ore="5" +kitchen_tools="0" +meal="5" +pick="1" +ration="20" +scythe="0" +shovel="0" +snack="0" +barbarians_ox="1" +barbarians_soldier="10" + +[Stockpile] +ax="30" +ax_battle="1" +ax_broad="1" +ax_bronze="1" +ax_sharp="1" +ax_warriors="1" +beer="15" +beer_strong="20" +blackwood="45" +barbarians_bread="25" +bread_paddle="1" +cloth="10" +coal="25" +felling_ax="5" +fire_tongs="1" +fishing_rod="1" +gold="20" +gold_ore="15" +granite="30" +grout="20" +hammer="2" +helmet="1" +helmet_mask="1" +helmet_warhelm="1" +hunting_spear="1" +iron="25" +iron_ore="20" +kitchen_tools="1" +meal="15" +pick="2" +ration="30" +scythe="1" +shovel="1" +snack="20" +barbarians_ox="20" +barbarians_soldier="20" === added file 'data/economy_profiles/empire' --- data/economy_profiles/empire 1970-01-01 00:00:00 + +++ data/economy_profiles/empire 2019-05-04 19:31:09 + @@ -0,0 +1,85 @@ +# Automatically created by Widelands bzr9094[economy-target-profiles] (Debug) + +[Efficiency] +armor="1" +armor_chain="1" +armor_gilded="1" +armor_helmet="30" +basket="1" +beer="1" +empire_bread="20" +bread_paddle="0" +cloth="15" +coal="5" +felling_ax="0" +fire_tongs="1" +fishing_rod="0" +flour="20" +gold="1" +gold_ore="1" +granite="10" +hammer="0" +hunting_spear="0" +iron="5" +iron_ore="3" +kitchen_tools="0" +marble="30" +marble_column="10" +meal="5" +meat="20" +pick="1" +planks="1" +ration="20" +saw="0" +scythe="0" +shovel="0" +spear="1" +spear_advanced="1" +spear_heavy="1" +spear_war="1"
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/refactor_gameclient into lp:widelands
Using unique_ptr is unneeded, this is only a helper class neede to as long as some progress dialog is open, so using normal scope is ok. (We should actually cleanup that usage, some other time) The Problem is the owenership of UI::ProgressWindow* loader The disconnect code try to close the last 'modal' window. In case of the loader this is incorrect. Not sure how to cleanup tis messs by now -- https://code.launchpad.net/~widelands-dev/widelands/refactor_gameclient/+merge/366743 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/refactor_gameclient 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/representative_image_in_font_renderer into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/representative_image_in_font_renderer into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/representative_image_in_font_renderer/+merge/363781 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/representative_image_in_font_renderer. ___ 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/representative_image_in_font_renderer into lp:widelands
The inputqueues again @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/representative_image_in_font_renderer/+merge/363781 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/representative_image_in_font_renderer. ___ 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/tribe-economy-settings into lp:widelands
OK. I have linked this branch to the bug, so you can find it more easily for reference. -- https://code.launchpad.net/~widelands-dev/widelands/tribe-economy-settings/+merge/366878 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/tribe-economy-settings. ___ 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/tribe-economy-settings into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/tribe-economy-settings into lp:widelands has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/tribe-economy-settings/+merge/366878 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/tribe-economy-settings. ___ 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/tribe-economy-settings into lp:widelands
I propose setting this merge request to Rejected, and I could implement bug 1827696 soon. Then we can add the settings proposed here (or on the forum) as a predefined alternative set of target settings. -- https://code.launchpad.net/~widelands-dev/widelands/tribe-economy-settings/+merge/366878 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/tribe-economy-settings. ___ 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
