Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/coroutine-error-collectors into lp:widelands
Shouldn't that be 'popup=true'? -- https://code.launchpad.net/~widelands-dev/widelands/coroutine-error-collectors/+merge/362956 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/coroutine-error-collectors 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/coroutine-error-collectors into lp:widelands
Continuous integration builds have changed state: Travis build 4454. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/491407941. Appveyor build 4242. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_coroutine_error_collectors-4242. -- https://code.launchpad.net/~widelands-dev/widelands/coroutine-error-collectors/+merge/362956 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/coroutine-error-collectors 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/coroutine-error-collectors into lp:widelands
Toni Förster has proposed merging
lp:~widelands-dev/widelands/coroutine-error-collectors into lp:widelands.
Commit message:
add parameter to send_message() to avoid an error
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/coroutine-error-collectors/+merge/362956
I introduced this in r8973 because I forgot to set the popup parameter for the
"You won/lost messages".
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/coroutine-error-collectors into lp:widelands.
=== modified file 'data/scripting/win_conditions/collectors.lua'
--- data/scripting/win_conditions/collectors.lua 2019-02-09 16:46:36 +
+++ data/scripting/win_conditions/collectors.lua 2019-02-10 23:39:17 +
@@ -194,10 +194,10 @@
local lost_or_won = 0
if (info[2] < win_points) then
lost_or_won = 0
-send_message(player, lost_game_over.title, lost_game_over.body)
+send_message(player, lost_game_over.title, lost_game_over.body, {popup = false})
else
lost_or_won = 1
-send_message(player, won_game_over.title, won_game_over.body)
+send_message(player, won_game_over.title, won_game_over.body, {popup = false})
end
if (count_factions(plrs) > 1) then
if (player.team == 0) then
___
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-1810062-territorial-calculations into lp:widelands
Continuous integration builds have changed state: Travis build 4453. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/491252805. Appveyor build 4241. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1810062_territorial_calculations-4241. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1810062-territorial-calculations/+merge/361366 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1810062-territorial-calculations. ___ 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-memleak-net-ui into lp:widelands
Continuous integration builds have changed state: Travis build 4452. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/491252462. Appveyor build 4240. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_memleak_net_ui-4240. -- https://code.launchpad.net/~widelands-dev/widelands/bug-memleak-net-ui/+merge/362945 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-memleak-net-ui 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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 4450. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/491222019. Appveyor build 4238. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-4238. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/362944 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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-1810062-territorial-calculations into lp:widelands
Review: Needs Fixing @hessenfarmer I can't compile your changes, Travis isn't pleased as well. /src/logic/field.h:261:1: error: static_assert failed "Field is not tightly packed." static_assert(sizeof(Field) == sizeof(void*) * 2 + 10, "Field is not tightly packed."); ^ ~~~ 1 error generated. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1810062-territorial-calculations/+merge/361366 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1810062-territorial-calculations. ___ 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/campaignselect_box into lp:widelands
Continuous integration builds have changed state: Travis build 4449. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/491209077. Appveyor build 4237. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_campaignselect_box-4237. -- https://code.launchpad.net/~widelands-dev/widelands/campaignselect_box/+merge/360901 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/campaignselect_box. ___ 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/scotty_the_scout into lp:widelands
Continuous integration builds have changed state: Travis build 4448. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/491208869. Appveyor build 4236. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_scotty_the_scout-4236. -- https://code.launchpad.net/~widelands-dev/widelands/scotty_the_scout/+merge/362943 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/scotty_the_scout. ___ 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-memleak-net-ui into lp:widelands
Notabilis has proposed merging lp:~widelands-dev/widelands/bug-memleak-net-ui
into lp:widelands.
Commit message:
Fixing memory leak in network UI.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-memleak-net-ui/+merge/362945
The leak is reported to me after joining and starting a (localhost) LAN game.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-memleak-net-ui into lp:widelands.
=== modified file 'src/network/gameclient.cc'
--- src/network/gameclient.cc 2018-12-13 07:24:01 +
+++ src/network/gameclient.cc 2019-02-10 13:34:15 +
@@ -173,8 +173,8 @@
game.set_write_syncstream(g_options.pull_section("global").get_bool("write_syncstreams", true));
try {
- UI::ProgressWindow* loader_ui = new UI::ProgressWindow();
- d->modal = loader_ui;
+ std::unique_ptr loader_ui(new UI::ProgressWindow());
+ d->modal = loader_ui.get();
std::vector tipstext;
tipstext.push_back("general_game");
tipstext.push_back("multiplayer");
@@ -182,7 +182,7 @@
tipstext.push_back(get_players_tribe());
} catch (NoTribe) {
}
- GameTips tips(*loader_ui, tipstext);
+ GameTips tips(*loader_ui.get(), tipstext);
loader_ui->step(_("Preparing game"));
@@ -199,9 +199,9 @@
game.set_ibase(igb);
igb->set_chat_provider(*this);
if (!d->settings.savegame) { // new map
- game.init_newgame(loader_ui, d->settings);
+ game.init_newgame(loader_ui.get(), d->settings);
} else { // savegame
- game.init_savegame(loader_ui, d->settings);
+ game.init_savegame(loader_ui.get(), d->settings);
}
d->time.reset(game.get_gametime());
d->lasttimestamp = game.get_gametime();
@@ -209,7 +209,7 @@
d->modal = igb;
game.run(
- loader_ui,
+ loader_ui.get(),
d->settings.savegame ?
Widelands::Game::Loaded :
d->settings.scenario ? Widelands::Game::NewMPScenario : Widelands::Game::NewNonScenario,
___
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/string-fixes into lp:widelands
Review: Approve Fix is okay, but as Klaus said. The related bugs don't fit. :-) I'm going to remove them from the merge request. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/362944 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/scotty_the_scout into lp:widelands
Review: Approve listen Listend to the Sound at: https://bazaar.launchpad.net/~widelands-dev/widelands/scotty_the_scout/view/head:/data/music/ingame_27.ogg fine for me. -- https://code.launchpad.net/~widelands-dev/widelands/scotty_the_scout/+merge/362943 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/scotty_the_scout. ___ 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/string-fixes into lp:widelands
Uhm, I dont find any changes for #1421942, #1487887, #1530240, #1547909 , #1530398 Bu only soem pluar in the wincondition. Can we get the relations correct? The actual fix is ok :-) -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/362944 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-fixes 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/string-fixes into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into
lp:widelands.
Commit message:
Fix pluralization error.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
https://bugs.launchpad.net/widelands/+bug/1421942
Bug #1487887 in widelands: "Translation missing in editor and in replay
tooltip"
https://bugs.launchpad.net/widelands/+bug/1487887
Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the
battle ax"
https://bugs.launchpad.net/widelands/+bug/1530240
Bug #1530398 in widelands: "Wrong text above marble mine"
https://bugs.launchpad.net/widelands/+bug/1530398
Bug #1547909 in widelands: "Some strings in the editor cannot be translated"
https://bugs.launchpad.net/widelands/+bug/1547909
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/362944
Not tested yet.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'data/scripting/win_conditions/win_condition_functions.lua'
--- data/scripting/win_conditions/win_condition_functions.lua 2019-02-09 15:38:59 +
+++ data/scripting/win_conditions/win_condition_functions.lua 2019-02-10 11:37:22 +
@@ -258,7 +258,9 @@
if ((h > 0) and (m > 0)) then
-- TRANSLATORS: Context: 'The game will end in 2 hours and 30 minutes.'
- time = (ngettext("%1% hour and %2% minutes", "%1% hours and %2% minutes", h, m)):bformat(h, m)
+ time = (ngettext("%i minute", "%i minutes", h, m)):bformat(m)
+ -- TRANSLATORS: Context: 'The game will end in 2 hours and 30 minutes.'
+ time = (ngettext("%1% hour and %2%", "%1% hours and %2%", h, m)):bformat(h, time)
elseif m > 0 then
-- TRANSLATORS: Context: 'The game will end in 30 minutes.'
time = (ngettext("%i minute", "%i minutes", m)):format(m)
___
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/campaignselect_box into lp:widelands
Thanks for the reviews! This is for Build 21, so let's not merge it yet. -- https://code.launchpad.net/~widelands-dev/widelands/campaignselect_box/+merge/360901 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/campaignselect_box. ___ 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/scotty_the_scout into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/scotty_the_scout into lp:widelands. Commit message: New music track "Scotty the Scout" by Stuart Marshall Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/scotty_the_scout/+merge/362943 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/scotty_the_scout into lp:widelands. === modified file 'data/music/LICENSE.txt' --- data/music/LICENSE.txt 2017-03-29 12:21:41 + +++ data/music/LICENSE.txt 2019-02-10 10:16:01 + @@ -2,3 +2,4 @@ ingame_24.ogg (Hypathia's Theme) (c) Stuart Marshall, license CC-BY-SA v3.00 ingame_25.ogg (We Work in the Vineyards) (c) Stuart Marshall, license CC-BY-SA v3.00 +ingame_27.ogg (Scotty the Scout) (c) Stuart Marshall, license CC-BY-SA v3.00 === added file 'data/music/ingame_27.ogg' Binary files data/music/ingame_27.ogg 1970-01-01 00:00:00 + and data/music/ingame_27.ogg 2019-02-10 10:16:01 + differ ___ 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-1805325-joining-lan-games into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1805325-joining-lan-games into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1805325-joining-lan-games/+merge/359789 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1805325-joining-lan-games. ___ 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-better-syncstreams into lp:widelands
I have done some similar testing. I'd like to see a few changes: 1. WLApplication:cleanup_replays() does not clean up old wse files 2. There are no instructions in the Python script. I'd like to at least see a usage hint when it's called without parameters. -- https://code.launchpad.net/~widelands-dev/widelands/bug-better-syncstreams/+merge/361922 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-better-syncstreams. ___ 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-better-syncstreams into lp:widelands
I tested(?) it by enforcing a desync (modifying player.cc and using std::rand() as ID for new economies, then changing economy targets ingame). The new *.wse files were created and could be parsed by the python script. No idea what else can be tested. -- https://code.launchpad.net/~widelands-dev/widelands/bug-better-syncstreams/+merge/361922 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-better-syncstreams. ___ 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-1805325-joining-lan-games into lp:widelands
This fixes a crash, so let's have it. Clang install failure on Travis @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/bug-1805325-joining-lan-games/+merge/359789 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1805325-joining-lan-games. ___ 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
