[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1789023-fix-icon-for-software-center into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1789023-fix-icon-for-software-center into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1789023-fix-icon-for-software-center/+merge/353752 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1789023-fix-icon-for-software-center 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-1789023-fix-icon-for-software-center into lp:widelands
Continuous integration builds have changed state: Travis build 3837. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/420887783. Appveyor build 3635. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1789023_fix_icon_for_software_center-3635. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1789023-fix-icon-for-software-center/+merge/353752 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1789023-fix-icon-for-software-center 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-1746270-rolling-autosave-file-permissions into lp:widelands
Continuous integration builds have changed state: Travis build 3836. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/420887444. Appveyor build 3634. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1746270_rolling_autosave_file_permissions-3634. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1746270-rolling-autosave-file-permissions/+merge/353758 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1746270-rolling-autosave-file-permissions 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/empire04_bug_fix_enhance into lp:widelands
military route tested as well. no anomalies found. -- https://code.launchpad.net/~widelands-dev/widelands/empire04_bug_fix_enhance/+merge/353742 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/empire04_bug_fix_enhance 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-1783878_editor_random_map_tribe into lp:widelands
@ypopezios: Good idea, but not as easy as it sounds - when set to "random", the
tribe is already sneakily assigned in the background so that the user can
choose an initialization ("Headquarters") etc. So, removing that extra variable
has a lot of other implications in the code as well and is not trivial at all.
So, definitely not for Build 20 ;)
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1783878_editor_random_map_tribe/+merge/352943
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1783878_editor_random_map_tribe.
___
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-1783878_editor_random_map_tribe into lp:widelands
Review: Approve compile, review, test, Works for me, I cannot judge mutch abouthe the code. ypopezios: you are correct, but lets get rid of the bug first and do the improvement in some second step. Gun: will we need a resubmit before wer can merge this? @bonnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1783878_editor_random_map_tribe/+merge/352943 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1783878_editor_random_map_tribe. ___ 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-1783878_editor_random_map_tribe into lp:widelands
Added inline comment.
Diff comments:
>
> === modified file 'src/ui_fsmenu/launch_spg.cc'
> --- src/ui_fsmenu/launch_spg.cc 2018-07-07 20:22:12 +
> +++ src/ui_fsmenu/launch_spg.cc 2018-08-26 11:35:09 +
> @@ -283,7 +283,14 @@
> Widelands::PlayerNumber const nrplayers = map.get_nrplayers();
> for (uint8_t i = 0; i < nrplayers; ++i) {
> settings_->set_player_name(i, map.get_scenario_player_name(i +
> 1));
> - settings_->set_player_tribe(i, map.get_scenario_player_tribe(i
> + 1));
> + const std::string playertribe = map.get_scenario_player_tribe(i
> + 1);
> + if (playertribe.empty()) {
> + // Set tribe selection to random
> + settings_->set_player_tribe(i, "", true);
I would clean-up the interface of set_player_tribe() through-out the codebase
to remove the flag for random_tribe and use the empty-string convention
instead, then check for the string's emptiness inside set_player_tribe() .
> + } else {
> + // Set tribe selection from map
> + settings_->set_player_tribe(i, playertribe);
> + }
> }
> }
>
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1783878_editor_random_map_tribe/+merge/352943
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1783878_editor_random_map_tribe.
___
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-1783878_editor_random_map_tribe into lp:widelands
Changes are done. Could you please retest to make sure that I haven't missed anything? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1783878_editor_random_map_tribe/+merge/352943 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1783878_editor_random_map_tribe. ___ 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-1789023-fix-icon-for-software-center into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1789023-fix-icon-for-software-center into lp:widelands has been updated. Commit message changed to: Fixes for Debian-based software centers - Add stock icon to appdata.xml (c.f. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=857644) - Change icon definition in .desktop to be a generic one - Content ratings are now accepted by the validator, so we've activated them For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1789023-fix-icon-for-software-center/+merge/353752 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1789023-fix-icon-for-software-center 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-1789023-fix-icon-for-software-center into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1789023-fix-icon-for-software-center into lp:widelands. Commit message: Fixes for Debian-based software centers - Add stock icon to appdata.xml (c.f. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=857644) - Change icon definition in .desktop to be a generic one Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1789023 in widelands: "Widelands package from Universe is not in the Software Center" https://bugs.launchpad.net/widelands/+bug/1789023 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1789023-fix-icon-for-software-center/+merge/353752 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1789023-fix-icon-for-software-center into lp:widelands. === modified file 'debian/org.widelands.widelands.desktop' --- debian/org.widelands.widelands.desktop 2018-07-28 11:03:59 + +++ debian/org.widelands.widelands.desktop 2018-08-26 10:37:15 + @@ -43,14 +43,14 @@ Comment=A real-time build-up strategy game Comment[ar]=لعبة بناء إستراتيجية في الوقت الحقيقي Comment[bg]=Стратегическа игра за изграждане на цивилизация в реално време -Comment[ca]=Un joc d'estratègia i construcció a temps real +Comment[ca]=Un joc d'estratègia i construcció a temps real Comment[cs]=Real-time budovatelská strategická hra Comment[da]=Et realtids opbygningsstrategispil Comment[de]=Echtzeitbasiertes Aufbau-Strategiespiel Comment[es]=Un juego de estrategia y construcción en tiempo real Comment[eu]=Denbora errealeko eraikuntza eta estrategia jokoa Comment[fi]=Reaaliaikainen strategiapeli -Comment[fr]=Un jeu de stratégie et de construction en temps réel +Comment[fr]=Un jeu de stratégie et de construction en temps réel Comment[fy]=In strategysk bouwspultsje mei rinnende tiid Comment[gd]=Geama ro-innleachd togail fìor-ama Comment[hu]=Egy valós idejű, építkezős stratégiai játék @@ -71,7 +71,7 @@ Comment[sv]=Ett uppbyggnadsstrategispel i realtid Comment[uk]=Стратегічна гра у режимі реального часу Comment[zh_TW]=一款即時演變的策略遊戲 -Icon=/usr/share/games/widelands/data/images/logos/wl-ico-64.png +Icon=widelands TryExec=widelands Exec=widelands Categories=Game;StrategyGame; === modified file 'debian/org.widelands.widelands.desktop.stub' --- debian/org.widelands.widelands.desktop.stub 2018-07-28 11:03:59 + +++ debian/org.widelands.widelands.desktop.stub 2018-08-26 10:37:15 + @@ -3,7 +3,7 @@ Type=Application Name=Widelands GENERIC_NAME_COMMENT_HOOK -Icon=/usr/share/games/widelands/data/images/logos/wl-ico-64.png +Icon=widelands TryExec=widelands Exec=widelands Categories=Game;StrategyGame; === modified file 'debian/widelands.appdata.xml' --- debian/widelands.appdata.xml 2018-07-06 14:23:53 + +++ debian/widelands.appdata.xml 2018-08-26 10:37:15 + @@ -5,6 +5,7 @@ CC0-1.0 GPL-2.0 Widelands + widelands A real-time build-up strategy game لعبة بناء إستراتيجية في الوقت الحقيقي Стратегическа игра за изграждане на цивилизация в реално време === modified file 'debian/widelands.appdata.xml.stub' --- debian/widelands.appdata.xml.stub 2017-08-26 09:24:28 + +++ debian/widelands.appdata.xml.stub 2018-08-26 10:37:15 + @@ -5,6 +5,7 @@ CC0-1.0 GPL-2.0 Widelands + widelands SUMMARY_DESCRIPTION_HOOK ___ 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-1789023-fix-icon-for-software-center into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1789023-fix-icon-for-software-center/+merge/353752 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1789023-fix-icon-for-software-center 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
