[Widelands-dev] [Merge] lp:~widelands-dev/widelands/split_up_liblogic_3_some_circular into lp:widelands
Continuous integration builds have changed state: Travis build 4903. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/528687213. Appveyor build 4684. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_split_up_liblogic_3_some_circular-4684. -- https://code.launchpad.net/~widelands-dev/widelands/split_up_liblogic_3_some_circular/+merge/366960 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/split_up_liblogic_3_some_circular 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
The proposal to merge lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands has been updated. Status: Work in progress => Superseded For more details, see: 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/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. WaresDisplays and will relayout themselves dynamically on fullscreen switch. 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/366987 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" pseudo-profile that resets items to the default settings. To apply a profile, select the items you wish to change and choose the profile from the dropdown. 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 file 'data/images/ui_basic/scrollbar_down_fast.png' Binary files data/images/ui_basic/scrollbar_down_fast.png 1970-01-01 00:00:00 + and data/images/ui_basic/scrollbar_down_fast.png 2019-05-06 13:53:16 + differ === added file 'data/images/ui_basic/scrollbar_up_fast.png' Binary files data/images/ui_basic/scrollbar_up_fast.png 1970-01-01 00:00:00 + and data/images/ui_basic/scrollbar_up_fast.png 2019-05-06 13:53:16 + differ === added directory 'data/tribes/economy_profiles' === added file 'data/tribes/economy_profiles/atlanteans' --- data/tribes/economy_profiles/atlanteans 1970-01-01 00:00:00 + +++ data/tribes/economy_profiles/atlanteans 2019-05-06 13:53:16 + @@ -0,0 +1,89 @@ +# Automatically created by Widelands bzr9094[economy-target-profiles] (Debug) + +[Default] +0=_"Efficiency" +1=_"Stockpile" + +[0] +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" + +[1] +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/tribes/economy_profiles/barbarians' --- data/tribes/economy_profiles/barbarians 1970-01-01 00:00:00 + +++ data/tribes/economy_profiles/barbarians 2019-05-06 13:53:16 + @@ -0,0 +1,81 @@ +# Automatically created by Widelands bzr9094[economy-target-profiles] (Debug) + +[Default] +0=_"Efficiency" +1=_"Stockpile" + +[0] +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" + +[1] +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/tribes/economy_profiles/empire' --- data/tribes/economy_profiles/empire 1970-01-01 00:00:00 + +++ data/tribes/economy_profiles/empire
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands
Continuous integration builds have changed state: Travis build 4904. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/528827570. Appveyor build 4685. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_economy_target_profiles-4685. -- https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
Found a solution. When the hostname is already taken, a red border is drawn. The colours are inverted to make it pop out. This boarder can be used for other edit fields as well. Please give it a try and tell me what you think. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1825932-open-games/+merge/366860 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1825932-open-games 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-1825932-open-games into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands has been updated. Commit message changed to: only display games for the same version and when they are open * The list in the lobby has been renamed to "List if open Games" * only games a user can join will be listet * when a game is running it gets removed from the list * development builds are not displayed for normal builds * no message is posted to the chat when the game can't be joined * when host name is already taken show tooltip and draw red border For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1825932-open-games/+merge/366860 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1825932-open-games 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-1825932-open-games into lp:widelands
Continuous integration builds have changed state: Travis build 4907. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/528943625. Appveyor build 4688. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1825932_open_games-4688. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1825932-open-games/+merge/366860 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1825932-open-games 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
