date:20180911

Review: Needs Fixing

I suggested some improvements for the i18n. There is also some code duplication 
that we should get rid of.

Diff comments:

> === modified file 'src/network/gamehost.cc'
> --- src/network/gamehost.cc   2018-04-07 16:59:00 +
> +++ src/network/gamehost.cc   2018-09-12 05:38:27 +
> @@ -560,6 +561,25 @@
>   ->instantiate(*d->game, p));
>  }
>  
> +void GameHost::start_ai_for(uint8_t playernumber, const std::string& ai) {

Call this function "replace_client_with_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) {
> 
> === added file 'src/wui/game_client_disconnected.cc'
> --- src/wui/game_client_disconnected.cc   1970-01-01 00:00:00 +
> +++ src/wui/game_client_disconnected.cc   2018-09-12 05:38:27 +
> @@ -0,0 +1,197 @@
> +/*
> + * Copyright (C) 2002-2018 by the Widelands Development Team
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * as published by the Free Software Foundation; either version 2
> + * of the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
> 02110-1301, USA.
> + *
> + */
> +
> +#include "wui/game_client_disconnected.h"
> +
> +#include 
> +#include 
> +
> +#include "ai/computer_player.h"
> +#include "ai/defaultai.h"
> +#include "base/i18n.h"
> +#include "network/gamehost.h"
> +#include "ui_basic/messagebox.h"
> +#include "wui/interactive_gamebase.h"
> +
> +namespace {
> +
> +const int32_t width = 256;

Make these constexpr

> +const int32_t margin = 10;
> +const int32_t vspacing = 5;
> +const uint32_t vgap = 3;
> +
> +/**
> + * Small helper class for a "Really exit game?" message box.
> + */
> +class GameClientDisconnectedExitConfirmBox : public UI::WLMessageBox {
> +public:
> + // TODO(GunChleoc): Arabic: Buttons need more height for Arabic
> + GameClientDisconnectedExitConfirmBox(GameClientDisconnected* gcd, 
> InteractiveGameBase* gb)
> +: UI::WLMessageBox(gcd->get_parent(),
> +   /** TRANSLATORS: Window label when "Exit game" 
> has been pressed */
> +   _("Exit Game Confirmation"),
> +   _("Are you sure you wish to exit this game?"),
> +   MBoxType::kOkCancel),
> +  igb_(gb), gcd_(gcd) {
> + }
> +
> + void clicked_ok() override {
> + 
> igb_->end_modal(UI::Panel::Returncodes::kBack);
> + }
> +
> + void clicked_back() override {
> + cancel();
> + die();
> + // Make parent window visible again so player can use another 
> option
> + gcd_->set_visible(true);
> + }
> +
> +private:
> + InteractiveGameBase* igb_;
> + GameClientDisconnected* gcd_;

If we tie into the cancel() signal from GameClientDisconnected, we can get rid 
of the gcd_ variable and of the code duplication with 
GameOptionsMenuExitConfirmBox and have 1 common GameExitConfirmBox for both. 
Also, the UniqueWindow class has a create and destroy hook that you could work 
with.

> +};
> +
> +} // end anonymous namespace
> +
> +GameClientDisconnected::GameClientDisconnected(InteractiveGameBase* gb,
> + UI::UniqueWindow::Registry& registry,
> + GameHost* host)
> + : UI::UniqueWindow(gb, "client_disconnected", , 2 * margin + 
> width,

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect into lp:widelands

Bug is up: https://bugs.launchpad.net/widelands/+bug/1792079

I have 1 more idea for the memory leak. I'll try to fix it and then start the 
code review.
-- 
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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/stock-amounts into lp:widelands

Now tested. I noticed that the economy options doesn't have it, but the change 
that somebody sets the target to 10k is kinda low :P

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/stock-amounts/+merge/354558
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/stock-amounts.

___
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

2018-09-11 Thread noreply

The proposal to merge lp:~widelands-dev/widelands/mines-worldsavior into 
lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
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/mines-worldsavior into lp:widelands

Continuous integration builds have changed state:

Travis build 3939. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/427302588.
Appveyor build 3737. State: failed. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3737.
-- 
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/bug-1772168-unused-key-in-luatable into lp:widelands

Continuous integration builds have changed state:

Travis build 3940. State: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/427333771.
Appveyor build 3738. State: failed. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1772168_unused_key_in_luatable-3738.
-- 
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

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ferry into lp:widelands

Continuous integration builds have changed state:

Travis build 3938. State: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/427174251.
Appveyor build 3736. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-3736.
-- 
https://code.launchpad.net/~widelands-dev/widelands/ferry/+merge/351880
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/ferry 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-1669103-no-automatic-dismantlesitewindow into lp:widelands

Review: Approve diff, testing

Code is looking good and testing works as intended.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow/+merge/354179
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow.

___
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-1791891-key-modifier-inputqueue into lp:widelands

Notabilis has proposed merging 
lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into 
lp:widelands.

Commit message:
Adding support for Ctrl and Shift keys when using the increase/decrease buttons 
of input queues.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1791891 in widelands: "Ctrl/Shift-Click InputQueue buttons to change 
capacities faster"
  https://bugs.launchpad.net/widelands/+bug/1791891

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732

Adding keyboard modifiers for faster adaption of input queue settings (see bug 
report).

Slight disadvantage of this branch: To allow a "decreasing" shift-click on an 
input queue that is already at minimum (and vice versa), the code to disable 
the buttons had to be removed. That means that the increase/decrease buttons 
will always look the same, even when a "normal" click on them won't change 
anything.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into 
lp:widelands.
=== modified file 'src/wui/inputqueuedisplay.cc'
--- src/wui/inputqueuedisplay.cc	2018-09-10 05:59:47 +
+++ src/wui/inputqueuedisplay.cc	2018-09-11 21:08:35 +
@@ -285,7 +285,7 @@
 		return;
 	}
 	if (SDL_GetModState() & KMOD_CTRL) {
-		update_siblings(state);
+		update_siblings_priority(state);
 	}
 	igb_.game().send_player_set_ware_priority(building_, type_, index_, priority);
 }
@@ -294,11 +294,11 @@
 	// Already set option has been clicked again
 	// Unimportant for this queue, but update other queues
 	if (SDL_GetModState() & KMOD_CTRL) {
-		update_siblings(priority_radiogroup_->get_state());
+		update_siblings_priority(priority_radiogroup_->get_state());
 	}
 }
 
-void InputQueueDisplay::update_siblings(int32_t state) {
+void InputQueueDisplay::update_siblings_priority(int32_t state) {
 	// "Release" the CTRL key to avoid recursion
 	const SDL_Keymod old_modifiers = SDL_GetModState();
 	SDL_SetModState(KMOD_NONE);
@@ -340,19 +340,63 @@
  * stored here has been clicked
  */
 void InputQueueDisplay::decrease_max_fill_clicked() {
-	assert(cache_max_fill_ > 0);
 	if (!igb_.can_act(building_.owner().player_number())) {
 		return;
 	}
-	igb_.game().send_player_set_input_max_fill(building_, index_, type_, cache_max_fill_ - 1);
+
+	// Update the value of this queue if required
+	if (cache_max_fill_ > 0) {
+		igb_.game().send_player_set_input_max_fill(building_, index_, type_,
+			((SDL_GetModState() & KMOD_CTRL) ? 0 : cache_max_fill_ - 1));
+	}
+
+	// Update other queues of this building
+	if (SDL_GetModState() & KMOD_SHIFT) {
+		// Using int16_t instead of int32_t on purpose to avoid over-/underflows
+		update_siblings_fill(
+			((SDL_GetModState() & KMOD_CTRL) ? std::numeric_limits::min() : -1));
+	}
 }
 
 void InputQueueDisplay::increase_max_fill_clicked() {
-	assert(cache_max_fill_ < queue_.get_max_size());
 	if (!igb_.can_act(building_.owner().player_number())) {
 		return;
 	}
-	igb_.game().send_player_set_input_max_fill(building_, index_, type_, cache_max_fill_ + 1);
+
+	if (cache_max_fill_ < cache_size_) {
+		igb_.game().send_player_set_input_max_fill(building_, index_, type_,
+			((SDL_GetModState() & KMOD_CTRL) ? cache_size_ : cache_max_fill_ + 1));
+	}
+
+	if (SDL_GetModState() & KMOD_SHIFT) {
+		update_siblings_fill(
+			((SDL_GetModState() & KMOD_CTRL) ? std::numeric_limits::max() : 1));
+	}
+}
+
+void InputQueueDisplay::update_siblings_fill(int32_t delta) {
+	Panel* sibling = get_parent()->get_first_child();
+	// Well, at least we should be a child of our parent
+	assert(sibling != nullptr);
+	do {
+		if (sibling == this) {
+			// We already have been set
+			continue;
+		}
+		InputQueueDisplay* display = dynamic_cast(sibling);
+		if (display == nullptr) {
+			// Cast failed. Sibling is no InputQueueDisplay
+			continue;
+		}
+		uint32_t new_fill = std::max(0,
+std::min(
+	static_cast(display->cache_max_fill_) + delta,
+	display->cache_size_));
+		if (new_fill != display->cache_max_fill_) {
+			igb_.game().send_player_set_input_max_fill(
+			building_, display->index_, display->type_, new_fill);
+		}
+	} while ((sibling = sibling->get_next_sibling()));
 }
 
 void InputQueueDisplay::compute_max_fill_buttons_enabled_state() {
@@ -364,11 +408,5 @@
 			increase_max_fill_->set_enabled(false);
 		if (decrease_max_fill_)
 			decrease_max_fill_->set_enabled(false);
-	} else {
-
-		if (decrease_max_fill_)
-			decrease_max_fill_->set_enabled(cache_max_fill_ > 0);
-		if (increase_max_fill_)
-			increase_max_fill_->set_enabled(cache_max_fill_ < queue_.get_max_size());
 	}
 }

=== modified file 'src/wui/inputqueuedisplay.h'
--- src/wui/inputqueuedisplay.h	2018-09-04 15:48:47 +
+++ src/wui/inputqueuedisplay.h	2018-09-11 21:08:35 +
@@ -87,7 +87,8 @@
 	void increase_max_fill_clicked();
 	void radiogroup_changed(int32_t);
 	void

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect into lp:widelands

The proposal to merge
lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect into lp:widelands
has been updated.

Description changed to:

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.
[ignore next part, not an issue of this branch]
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.
[/ignore]

For more details, see:
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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect into lp:widelands

Thanks for the explanation, it makes much more sense now. I haven't considered 
that the dropbox needs to access "higher" parents, so it was quite a strange 
effect. But I guess that means that this branch isn't to blame and can be 
reviewed and merged.

Would you mind copying your explanation to a new bug report about the memory 
leak and targeting it for build-21? The leak doesn't seem to cause any 
immediate harm so I think we can postpone fixing it until your other branches 
are in.
-- 
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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable into lp:widelands

2018-09-11 Thread hessenfarmer

appveyor failed on a reason different to the issue with glbinding.

something with throw Wexcepetion which I don't understand
-- 
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/stock-amounts into lp:widelands

Review: Approve

Code LGTM now, thanks!

Not tested yet.
-- 
https://code.launchpad.net/~widelands-dev/widelands/stock-amounts/+merge/354558
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/stock-amounts.

___
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/mines-worldsavior into lp:widelands

Review: Approve

Tested now and TODO comment added

@bunnybot merge
-- 
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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1766957-sinking-ship-animation into lp:widelands

Review: Approve

Thanks, that seems to fix it.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1766957-sinking-ship-animation/+merge/353746
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1766957-sinking-ship-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/stock-amounts into lp:widelands

Continuous integration builds have changed state:

Travis build 3935. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/427098399.
Appveyor build 3733. State: failed. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_stock_amounts-3733.
-- 
https://code.launchpad.net/~widelands-dev/widelands/stock-amounts/+merge/354558
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/stock-amounts 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-1772168-unused-key-in-luatable into lp:widelands

Continuous integration builds have changed state:

Travis build 3933. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/427067915.
Appveyor build 3731. State: failed. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1772168_unused_key_in_luatable-3731.
-- 
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/mines-worldsavior into lp:widelands

Code with the dummy program LGTM. Can you please add a TODO comment to the 
wares help in order to document that it's a hack and waiting for an engine 
redesign on the production programs?

Not tested yet.
-- 
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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1766957-sinking-ship-animation into lp:widelands

I have added the extra animation frames, but not tested yet.

We used the same hack for the tree falling animations, so it's OK for now.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1766957-sinking-ship-animation/+merge/353746
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1766957-sinking-ship-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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable into lp:widelands

2018-09-11 Thread hessenfarmer

this will fail in CI, as it does not contain any of the late fixes for them
-- 
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/stock-amounts into lp:widelands

2018-09-11 Thread hessenfarmer

this will still fail on CI environments.
please merge newest trunk with the CI fixes in
-- 
https://code.launchpad.net/~widelands-dev/widelands/stock-amounts/+merge/354558
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/stock-amounts 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/rework-resource-indicators into lp:widelands

2018-09-11 Thread Benedikt Straub

And another attempt ;)
-- 
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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect into lp:widelands