[Widelands-dev] [Merge] lp:~widelands-dev/widelands/windows-logging into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/windows-logging into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/windows-logging/+merge/354397 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/windows-logging. ___ 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-1772168-unused-key-in-luatable into lp:widelands
Review: Approve code Code LGTM. Nice catch :) The problem was that the WorkerDescr fetched the table, then took only value [1], then discarded the table, so [2] was unused. Then it fetched the table anew, used only key [2], and discarded the table, so value [1] was unused. A table always prints warnings about unused keys when being deleted. get_vector() is a very elegant workaround for this :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1772168-unused-key-in-luatable/+merge/354202 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable. ___ 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/windows-logging into lp:widelands
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/windows-logging/+merge/354397 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/windows-logging. ___ 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/const_portdock_fleet_and_ship_functions into lp:widelands
Thanks! Change is trivial, so that should be sufficient. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/const_portdock_fleet_and_ship_functions/+merge/354301 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/const_portdock_fleet_and_ship_functions. ___ 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/scout-compatibility into lp:widelands
I have tested with an older savegame that had a scout on the road. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/scout-compatibility/+merge/354345 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/scout-compatibility. ___ 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/appveyor_fix into lp:widelands
Review: Approve Compiler warnings are gone now. I also tested that it still compiles with older glbinding version and with glew on my machine. Thanks for figuring this one out! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/appveyor_fix/+merge/354160 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/appveyor_fix. ___ 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-1434875-net-client-disconnect into lp:widelands
Continuous integration builds have changed state: Travis build 3921. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/426390888. Appveyor build 3719. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1434875_net_client_disconnect-3719. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1434875-net-client-disconnect/+merge/354531 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect 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/mines-worldsavior into lp:widelands
Error merging this proposal: Output: stdout: stderr: M data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua M data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua M data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua M data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua M data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua M data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua M data/tribes/buildings/productionsites/atlanteans/smokery/init.lua M data/tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua M data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua M data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua M data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua M data/tribes/buildings/productionsites/barbarians/big_inn/init.lua M data/tribes/buildings/productionsites/barbarians/coalmine/init.lua M data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua M data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua M data/tribes/buildings/productionsites/barbarians/goldmine/init.lua M data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua M data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua M data/tribes/buildings/productionsites/barbarians/granitemine/init.lua M data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua M data/tribes/buildings/productionsites/barbarians/inn/init.lua M data/tribes/buildings/productionsites/barbarians/ironmine/init.lua M data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua M data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua M data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua M data/tribes/buildings/productionsites/barbarians/tavern/init.lua M data/tribes/buildings/productionsites/barbarians/warmill/init.lua M data/tribes/buildings/productionsites/empire/armorsmithy/init.lua M data/tribes/buildings/productionsites/empire/coalmine/init.lua M data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua M data/tribes/buildings/productionsites/empire/goldmine/init.lua M data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua M data/tribes/buildings/productionsites/empire/inn/init.lua M data/tribes/buildings/productionsites/empire/ironmine/init.lua M data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua M data/tribes/buildings/productionsites/empire/marblemine/init.lua M data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua M data/tribes/buildings/productionsites/empire/smelting_works/init.lua M data/tribes/buildings/productionsites/empire/tavern/init.lua M data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua M data/tribes/buildings/productionsites/frisians/armor_smithy_large/init.lua M data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua M data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua M data/tribes/buildings/productionsites/frisians/coalmine/init.lua M data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua M data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua M data/tribes/buildings/productionsites/frisians/furnace/init.lua M data/tribes/buildings/productionsites/frisians/goldmine/init.lua M data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua M data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua M data/tribes/buildings/productionsites/frisians/ironmine/init.lua M data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua M data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua M data/tribes/buildings/productionsites/frisians/recycling_center/init.lua M data/tribes/buildings/productionsites/frisians/rockmine/init.lua M data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua M data/tribes/buildings/productionsites/frisians/sewing_room/init.lua M data/tribes/buildings/productionsites/frisians/smokery/init.lua M data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua M data/tribes/buildings/productionsites/frisians/tavern/init.lua M data/tribes/buildings/trainingsites/atlanteans/dungeon/init.lua M data/tribes/buildings/trainingsites/barbarians/battlearena/init.lua M data/tribes/buildings/trainingsites/empire/arena/init.lua M data/tribes/buildings/trainingsites/empire/colosseum/init.lua M data/tribes/buildings/trainingsites/frisians/training_arena/init.lua M data/tribes/scripting/help/ware_help.lua M data/txts/developers.json M src/logic/map_objects/tribes/production_program.cc M src/logic/map_objects/tribes/worker.cc Text conflict in data/tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua Text
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/mines-worldsavior into lp:widelands
Continuous integration builds have changed state: Travis build 3918. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/426311064. Appveyor build 3716. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3716. -- https://code.launchpad.net/~widelands-dev/widelands/mines-worldsavior/+merge/350716 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___ 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/appveyor_fix into lp:widelands
Continuous integration builds have changed state: Travis build 3917. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/426307714. Appveyor build 3715. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_fix-3715. -- https://code.launchpad.net/~widelands-dev/widelands/appveyor_fix/+merge/354160 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/appveyor_fix 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/gdpr_1 into lp:widelands-website
> I am thinking about giving SirVer some memorial, or other thing which notice > him as the generous donor of the online-server. A way to say 'Thank you!' and > also a hint for other users on widelands.org. Please do not. Giving money is a small contribution compared to giving time and eneregy for the project, I do not want this to be called out. -- https://code.launchpad.net/~widelands-dev/widelands-website/gdpr_1/+merge/354355 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/empire04_bug_fix_enhance into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/empire04_bug_fix_enhance into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/empire04_bug_fix_enhance/+merge/353742 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/empire04_bug_fix_enhance. ___ 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/empire04_bug_fix_enhance into lp:widelands
Continuous integration builds have changed state: Travis build 3913. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/426199953. Appveyor build 3711. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_empire04_bug_fix_enhance-3711. -- https://code.launchpad.net/~widelands-dev/widelands/empire04_bug_fix_enhance/+merge/353742 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/empire04_bug_fix_enhance. ___ 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-1434875-net-client-disconnect into lp:widelands
Notabilis has proposed merging
lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect into lp:widelands.
Commit message:
Adding a dialog for the host when the connection to a client is lost. Allows
the host to select whether to replace the client with an AI or to exit.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1434875 in widelands: "Multiplayer network problems go unnoticed"
https://bugs.launchpad.net/widelands/+bug/1434875
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1434875-net-client-disconnect/+merge/354531
This is not ready for merge yet!
When a client disconnects (either on purpose or due to network errors), the
game is paused, saved, and a dialog is displayed to the host. There, the host
can select whether to replace the client with a Normal/Weak/Very Weak/Empty AI
or to exit the game.
No dialog is shown, if the leaving player ...
- is only an observer
- has already lost. In that case the player is replaced by the Empty AI
- has won the game. In that case the player is replaced by the Normal AI
So far, this branch seems to work fine in my testcases and could be merged.
However, ASAN is complaining about access to already freed memory when the host
closes the game with Alt+F4 while the dialog is shown. Strangely, there is no
complain if the "really exit game" confirmation dialog has been shown but
aborted.
I wasn't able to figure out what is happening there. So if someone has an idea
what is causing the problem, please tell me or fix it yourself. Apart from this
memory bug, the branch is ready for review and testing.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect into lp:widelands.
=== modified file 'src/network/gamehost.cc'
--- src/network/gamehost.cc 2018-04-07 16:59:00 +
+++ src/network/gamehost.cc 2018-09-09 17:19:05 +
@@ -31,6 +31,7 @@
#endif
#include "ai/computer_player.h"
+#include "ai/defaultai.h"
#include "base/i18n.h"
#include "base/md5.h"
#include "base/warning.h"
@@ -62,6 +63,7 @@
#include "ui_basic/progresswindow.h"
#include "ui_fsmenu/launch_mpg.h"
#include "wlapplication.h"
+#include "wui/game_client_disconnected.h"
#include "wui/game_tips.h"
#include "wui/interactive_player.h"
#include "wui/interactive_spectator.h"
@@ -560,6 +562,25 @@
->instantiate(*d->game, p));
}
+void GameHost::start_ai_for(uint8_t playernumber, const std::string& ai) {
+ assert(d->game->get_player(playernumber + 1)->get_ai().empty());
+ assert(d->game->get_player(playernumber + 1)->get_ai()
+ == d->settings.players.at(playernumber).ai);
+ // Inform all players about the change
+ // Has to be done at first in this method since the calls later on overwrite players[].name
+ send_system_message_code(
+ "CLIENT_X_REPLACED_WITH",
+ d->settings.players.at(playernumber).name,
+ ComputerPlayer::get_implementation(ai)->descname);
+ set_player_ai(playernumber, ai, false);
+ d->game->get_player(playernumber + 1)->set_ai(ai);
+ // Activate the ai
+ init_computer_player(playernumber + 1);
+ set_player_state(playernumber, PlayerSettings::State::kComputer);
+ assert(d->game->get_player(playernumber + 1)->get_ai()
+ == d->settings.players.at(playernumber).ai);
+}
+
void GameHost::init_computer_players() {
const Widelands::PlayerNumber nr_players = d->game->map().get_nrplayers();
iterate_players_existing_novar(p, nr_players, *d->game) {
@@ -2254,8 +2275,7 @@
}
set_player_state(number, PlayerSettings::State::kOpen);
- if (d->game)
- init_computer_player(number + 1);
+ // Don't replace player with AI, let host choose what to do
}
void GameHost::disconnect_client(uint32_t const number,
@@ -2266,6 +2286,37 @@
Client& client = d->clients.at(number);
+ // If the client is linked to a player and it is the client that closes the connection
+ // and the game has already started ...
+ if (client.playernum != UserSettings::none() && reason != "SERVER_LEFT" && d->game != nullptr) {
+ // And the client hasn't lost/won yet ...
+ if (d->settings.users.at(client.usernum).result == Widelands::PlayerEndResult::kUndefined) {
+ // And the window isn't visible yet ...
+ if (!client_disconnected_.window) {
+// Show a window and ask the host player what to do with the tribe of the leaving client
+
+if (!forced_pause()) {
+ force_pause();
+}
+
+WLApplication::emergency_save(*d->game);
+
+new GameClientDisconnected(d->game->get_ipl(), client_disconnected_, this);
+ }
+ // Client was active but is a winner of the game: Replace with normal AI
+ } else if (d->settings.users.at(client.usernum).result
+ == Widelands::PlayerEndResult::kWon) {
+ start_ai_for(client.playernum, DefaultAI::normal_impl.name);
+ // Client was active but has lost or gave up: Replace with empty AI
+ } else {
+ assert(d->settings.users.at(client.usernum).result
+
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/gdpr_1 into lp:widelands-website
I am thinking about giving SirVer some memorial, or other thing which notice him as the generous donor of the online-server. A way to say 'Thank you!' and also a hint for other users on widelands.org. Maybe a Link the footer, or a special header in the Developers page https://wl.widelands.org/developers/ ? -- https://code.launchpad.net/~widelands-dev/widelands-website/gdpr_1/+merge/354355 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-1772168-unused-key-in-luatable into lp:widelands
Diff is looking okay and the error messages are gone. [Disclaimer: I don't know much about the lua interface.] Basically the error message are avoided by not using get_int() anymore but using array_entries(). Is there a reason against fixing (?) get_int() (and others) so the usage of the table key is stored in the set accessed_keys_ as well, as is done inside array_entries() ? From the code it seems as if using any method except array_entries() will lead to the error message, which seems strange to me. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1772168-unused-key-in-luatable/+merge/354202 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable 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/scout-compatibility into lp:widelands
Review: Approve diff, short testing Diff looks good and a newly started game with this branch using a scout didn't showed any apparent problems. -- https://code.launchpad.net/~widelands-dev/widelands/scout-compatibility/+merge/354345 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/scout-compatibility. ___ 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/const_portdock_fleet_and_ship_functions into lp:widelands
Review: Approve diff Diff is looking good. I haven't bothered compiling or testing myself, but Travis seems to be fine. -- https://code.launchpad.net/~widelands-dev/widelands/const_portdock_fleet_and_ship_functions/+merge/354301 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/const_portdock_fleet_and_ship_functions. ___ 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/rework-resource-indicators into lp:widelands
Continuous integration builds have changed state: Travis build 3912. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/426196539. Appveyor build 3710. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_rework_resource_indicators-3710. -- https://code.launchpad.net/~widelands-dev/widelands/rework-resource-indicators/+merge/353996 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/rework-resource-indicators. ___ 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/shipyard_statistics into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/shipyard_statistics into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/shipyard_statistics/+merge/354208 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped. ___ 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/windows-logging into lp:widelands
Review: Approve tested the appveyor build as well. OS win 10. Install dir on drive D:/ stdout.txt in user/.widelands. seems to be good to go -- https://code.launchpad.net/~widelands-dev/widelands/windows-logging/+merge/354397 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/windows-logging. ___ 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/shipyard_statistics into lp:widelands
The prerequisite got merged. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/shipyard_statistics/+merge/354208 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped. ___ 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/shipyard_statistics into lp:widelands
Continuous integration builds have changed state: Travis build 3910. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/426191241. Appveyor build 3708. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_shipyard_statistics-3708. -- https://code.launchpad.net/~widelands-dev/widelands/shipyard_statistics/+merge/354208 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped. ___ 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-1786613-10s-return-skipped into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/354381 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped. ___ 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-1786613-10s-return-skipped into lp:widelands
Continuous integration builds have changed state: Travis build 3909. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/426188606. Appveyor build 3707. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1786613_10s_return_skipped-3707. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/354381 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped. ___ 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/windows-logging into lp:widelands
Continuous integration builds have changed state: Travis build 3908. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/426088550. Appveyor build 3706. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_windows_logging-3706. -- https://code.launchpad.net/~widelands-dev/widelands/windows-logging/+merge/354397 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/windows-logging 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/animation_woodhardener into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/animation_woodhardener into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/animation_woodhardener/+merge/354465 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/animation_woodhardener. ___ 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/animation_woodhardener into lp:widelands
Continuous integration builds have changed state: Travis build 3907. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/426088111. Appveyor build 3705. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_animation_woodhardener-3705. -- https://code.launchpad.net/~widelands-dev/widelands/animation_woodhardener/+merge/354465 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/animation_woodhardener. ___ 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/big_inn_missing_animation into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/big_inn_missing_animation into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/big_inn_missing_animation/+merge/354466 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/big_inn_missing_animation. ___ 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/big_inn_missing_animation into lp:widelands
Continuous integration builds have changed state: Travis build 3906. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/426087649. Appveyor build 3704. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_big_inn_missing_animation-3704. -- https://code.launchpad.net/~widelands-dev/widelands/big_inn_missing_animation/+merge/354466 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/big_inn_missing_animation. ___ 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/macos_build_app_ICU into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/macos_build_app_ICU into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/macos_build_app_ICU/+merge/354490 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/macos_build_app_ICU. ___ 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/macos_build_app_ICU into lp:widelands
Continuous integration builds have changed state: Travis build 3905. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/426087272. Appveyor build 3703. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_macos_build_app_ICU-3703. -- https://code.launchpad.net/~widelands-dev/widelands/macos_build_app_ICU/+merge/354490 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/macos_build_app_ICU. ___ 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] Deleted branches on merge requests will knock out bunnybot
Took me a while to figure out what got bunnybot confused, but it should be running fine now again. Sorry that it is so fragile… but it depends on really outdated abandonware, like bzr itself and bzr-to-git converters. They have bugs, but they will never get fixed. And bunnybot of course has bugs too, but I have too little time to working on fixing it :(. > On 8. Sep 2018, at 19:19, Fòram na Gàidhlig wrote: > > Yes, that counts as well, the bunnboty can choke on forced overwrites. > > It is up and running again, so you don't need to do anything at this point. > > > Sgrìobh Toni Förster na leanas 08/09/2018 aig 13:22: >> Hi all, >> >> I'm not sure if it could be one of my branches. Although I didn't delete my >> branches, I overwrote one because I removed 2 commits. Does this count as >> deleting as well? If so, are there any actions required or do we just have >> to wait for the bot to be up und running, again? >> >> Best >> >> stonerl >> >> On September 8, 2018 9:55:33 AM GMT+02:00, "Fòram na Gàidhlig" >> wrote: >>> Hi all, >>> >>> some of you have recently deleted branches with merge requests, created >>> a new branch with the same name and started a new merge request on it. >>> >>> This will knock out our bunnybot that is running our build system, >>> because that bot is one giant ugly hack that we'll have to live with >>> until our planned move to GitHub after Build 20. >>> >>> @Sirver: Can you start the bot again for us? >>> >>> Thanks >>> >>> GunChleoc >>> >>> ___ >>> 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 >> >> ___ >> 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 >> > > -- > -BEGIN PGP PUBLIC KEY BLOCK- > Version: GnuPG v2.0.22 (MingW32) > > mQINBFNbSyEBEADh+uhohycnZgPPnyMs5pZQG6pKyLzFZoIKbVjY31ZoPZ2SdltB > elrwn6kFZkQiDx4K6nkZFHsPh8RMvWoFWg1rGiWkdsZessLFawraC8YEZDwtlaU5 > SFXbE4+QnMfbPhe9tmC8Nbhec3dfV9zcXAhxc+zkIUsKFhSkpJ2Syvo9FCA/5adW > UZgWWKFwlSg4+/lrhJ6QJnldPlXfWcuEasKF7fjdafDIdS5hdKu8Lv+CiPQWvgsi > J2BDlZLzEZf3PD+NMujUbJa0nilD2ltu3/qRvR2f86YV6wRwt4E2OD8JJQOau4X2 > Pg7vqkIbnB9rMiQ6T17rQ4rc80eesGCxQ6XOba9oa1eRRZDwY7HJtYwvPdw9HZaN > Lq2RRbGDGO0q7fxrzbp1WuNN+UXOA/pmVzWWczPfPHVcNIehGf3wQI+Vgh/qa+IZ > jLJ25I1Tv85cDzvv5gdtI8PR4JTfK6Db+gUJmsuIg2fmsljxA7OmeTgSPR7nEVq5 > VlHYfx1T0uKlthWw/eDwlS44vTgm6HZzIdYqdPMPa/PU1U+WVuDejyDJTn/1TY78 > oJMT/IixFR+N+smohhKASprewcsO2ClWGptSG0sRTiCrVHFD3Mt6SCVaxsQLHvek > KuNAUXhR2KSvYuqGT0Nv3bplN6svCp4CuAGZ3lyOIt/Sb7OFUwzcx2sOdwARAQAB > tC5Gw7JyYW0gbmEgR8OgaWRobGlnIDxmaW9zQGZvcmFtbmFnYWlkaGxpZy5uZXQ+ > iQI5BBMBAgAjBQJTW0shAhsPBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AACgkQ > UHP09XBr75NHNBAAxv2C/G13Z1kCFOSOnbPpzqcIDcMuP7RK1Mv5XfOZLfqSw4le > gdDmZggX2/EBH6xFTXFPLSE6rVUKTkHLA7IY8D43GBtDWjcIyyuLnIjtR+LhRKCP > 3/Sm8MyZMQvUH1CBpUXFNnP/HCR6xjm1Mog5kXxFeCR9PMjeEiobKXIVuMfuNlBD > WzoR2Nh+oroXLjZw3VMFewiCyhu4Pe7F3sLpVldiI3PBOyPQOBZ3HEIM490D/Lrh > rl3Wwmoug8j8rqkh/Fr+kKaToRJik4PkcxsfepzhMdNfCpr7I3jE5XQHzib5Ubv8 > wsSaVNBG92NTnGKoAntWXBUaiDN84St9l+Zm/BgedRk+7wdESHBuOuFXoRc0yEjF > 4tLOhyO9u5bYGQWHyJiwhbw51R8G+Kh3OPq/tr4KmsuueEI2v5cLkoDzwCpYyMnu > BfU8d0mt5eULbQCWcy7LYeQs6E+CEB+tPL3Qz2zaAAvwt7N2PLMjHf5Fcqj5LqrV > mzQfcB9zQFq9Rtld/IIIDkE1y/q/SNFYsFNW/u/bxWsu+lMOYtBco++O5DJhAq6t > 7rJXUBirju50hhogHfBL2v6RG1b8/uiWm0m8713ZhiSvpr4Dd+V+DU9nPli5nTmU > En6gP7TTYJKETMf7O9i873Z8yG6zd0/fBzFyruS2KRTPV2GiVT6CI37gUtw= > =fcOW > -END PGP PUBLIC KEY BLOCK- > > ___ > 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 ___ 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
