Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_osx_nightlies into lp:widelands
Review: Approve @stonerl: There is no reason to apologize - I am super excited that you picked up, undusted and improved the Mac OS X build experience and untested things break with change. I am sorry to partially undo your modernizations efforts, but I do not have time to do more major changes to the nightlies build process :( @Gun: Thanks for fixing the Linux problem. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fix_osx_nightlies/+merge/353456 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_osx_nightlies. ___ 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 3828. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/418892074. Appveyor build 3627. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3627. -- 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-1786613-10s-return-skipped into lp:widelands
I just merged the mines-worldsavior into this one and replaced the return=skipped with return=no_stats. So as soon as worldsavior's branch gets merged into trunk this one here is ready to go. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/353514 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/multiplayer-ui into lp:widelands
Continuous integration builds have changed state: Travis build 3827. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/418836717. Appveyor build 3626. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_multiplayer_ui-3626. -- https://code.launchpad.net/~widelands-dev/widelands/multiplayer-ui/+merge/353523 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/multiplayer-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/bug-1787105_tada_edited_sounds into lp:widelands
Continuous integration builds have changed state: Travis build 3826. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/418808436. Appveyor build 3625. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1787105_tada_edited_sounds-3625. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1787105_tada_edited_sounds/+merge/353216 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1787105_tada_edited_sounds 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_sleep_time into lp:~widelands-dev/widelands/mines-worldsavior
The proposal to merge lp:~widelands-dev/widelands/mines_sleep_time into lp:~widelands-dev/widelands/mines-worldsavior has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/mines_sleep_time/+merge/353450 -- 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-1786613-10s-return-skipped into lp:widelands
I branched this one from trunk. That's why this branch depends on mines-worldsavior. As soon as that one gets merged into trunk, I'm gone rebase this one here, to avoid merge conflicts. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/353514 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-1786613-10s-return-skipped into lp:widelands
Yes. Looks reasonable now. Needs to be tested though. From which branch did you split this one? If not from Mines_worldsavior we would probably run into a merge conflict, as we did some changes in productionsite.cc in this branch as well. So I will not approve this now although I'm happy with the result. Thanks for doing this. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/353514 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-1784122-singleplayer-viewport into lp:widelands
Review: Approve Code is looking good and working as intended. That definitely is one nasty bug... -- https://code.launchpad.net/~widelands-dev/widelands/bug-1784122-singleplayer-viewport/+merge/353391 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1784122-singleplayer-viewport. ___ 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/multiplayer-ui into lp:widelands
Toni Förster has proposed merging lp:~widelands-dev/widelands/multiplayer-ui
into lp:widelands.
Commit message:
multiplayer-ui fine tuning
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/multiplayer-ui/+merge/353523
Less free space and more room for the important parts. Pictures can be found in
the Forum:
https://wl.widelands.org/forum/post/25724/
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/multiplayer-ui into lp:widelands.
=== modified file 'src/ui_fsmenu/launch_mpg.cc'
--- src/ui_fsmenu/launch_mpg.cc 2018-07-08 08:19:44 +
+++ src/ui_fsmenu/launch_mpg.cc 2018-08-21 18:22:01 +
@@ -105,7 +105,7 @@
padding_(4),
indent_(10),
label_height_(20),
- right_column_x_(get_w() * 37 / 50),
+ right_column_x_(get_w() * 57 / 80),
// Buttons
change_map_or_save_(this,
@@ -130,17 +130,17 @@
// Text labels
mapname_(this, right_column_x_, get_h() * 3 / 20, std::string()),
clients_(this,
- // (get_w() * 57 / 80) is the width of the MultiPlayerSetupGroup
- get_w() / 50,
+ // the width of the MultiPlayerSetupGroup is (get_w() * 53 / 80)
+ get_w() * 3 / 80,
get_h() / 10,
- (get_w() * 57 / 80) / 3,
+ get_w() * 19 / 80,
get_h() / 10,
_("Clients"),
UI::Align::kCenter),
players_(this,
- get_w() / 50 + (get_w() * 57 / 80) * 6 / 15,
+ get_w() /4,
get_h() / 10,
- (get_w() * 57 / 80) * 9 / 15,
+ get_w() * 9 / 20,
get_h() / 10,
_("Players"),
UI::Align::kCenter),
@@ -155,13 +155,13 @@
right_column_x_,
get_h() * 2 / 10,
butw_,
- get_h() * 23 / 80 - 2 * label_height_,
+ get_h() * 23 / 80 - 1.6 * label_height_,
UI::PanelStyle::kFsMenu),
client_info_(this,
right_column_x_,
get_h() * 13 / 20 - 2 * label_height_,
butw_,
- 2 * label_height_,
+ get_h(),
UI::PanelStyle::kFsMenu),
help_(nullptr),
@@ -185,12 +185,14 @@
players_.set_color(RGBColor(0, 255, 0));
map_.set_fontsize(fs_);
map_.set_color(RGBColor(0, 255, 0));
+ wincondition_type_.set_color(RGBColor(0, 255, 0));
mapname_.set_text(_("(no map)"));
map_info_.set_text(_("The host has not yet selected a map or saved game."));
mpsg_ = new MultiPlayerSetupGroup(
- this, get_w() / 50, change_map_or_save_.get_y(), get_w() * 57 / 80, get_h(), settings, buth_);
+ this, get_w() * 3 / 80, change_map_or_save_.get_y(), get_w() * 53 / 80,
+ get_h() * 17 / 30 - change_map_or_save_.get_y(), settings, buth_);
// If we are the host, open the map or save selection menu at startup
if (settings_->settings().usernum == 0 && settings_->settings().mapname.empty()) {
@@ -205,7 +207,7 @@
suggested_teams_box_ =
new UI::SuggestedTeamsBox(this, right_column_x_, 0, UI::Box::Vertical, padding_, indent_,
get_w() - right_column_x_, 4 * label_height_);
-}
+ }
FullscreenMenuLaunchMPG::~FullscreenMenuLaunchMPG() {
delete mpsg_;
@@ -223,8 +225,9 @@
*/
void FullscreenMenuLaunchMPG::set_chat_provider(ChatProvider& chat) {
delete chat_;
- chat_ = new GameChatPanel(this, get_w() / 50, get_h() * 13 / 20, get_w() * 57 / 80,
- get_h() * 3 / 10, chat, UI::PanelStyle::kFsMenu);
+ chat_ = new GameChatPanel(this, get_w() * 3/ 80,
+ get_h() * 17 / 30 + 0.5 * label_height_, get_w() * 53 / 80,
+ get_h() * 11 / 30, chat, UI::PanelStyle::kFsMenu);
}
/**
=== modified file 'src/wui/multiplayersetupgroup.cc'
--- src/wui/multiplayersetupgroup.cc 2018-06-08 17:14:28 +
+++ src/wui/multiplayersetupgroup.cc 2018-08-21 18:22:01 +
@@ -628,16 +628,16 @@
settings_(settings),
npsb(new NetworkPlayerSettingsBackend(settings_)),
clientbox(this, 0, 0, UI::Box::Vertical),
- playerbox(this, 0, 0, UI::Box::Vertical, w * 9 / 15, h, kPadding),
+ playerbox(this, 0, 0, UI::Box::Vertical, w * 36 / 53, h, kPadding),
buth_(buth) {
- clientbox.set_size(w / 3, h);
+ clientbox.set_size(w * 16 / 53, h);
clientbox.set_scrolling(true);
add(, UI::Box::Resizing::kExpandBoth);
add();
// Playerbox
- playerbox.set_size(w * 9 / 15, h);
+ playerbox.set_size(w * 36 / 53, h);
playerbox.add_space(0);
multi_player_player_groups.resize(kMaxPlayers);
for (PlayerSlot i = 0; i < multi_player_player_groups.size(); ++i) {
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help :
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped into lp:widelands
Ok, I'm pretty sure that this is the final solution :-D Unconditional "return=skipped" need to be replaced with "return=no_stats". That's it no stats are calculated and it also handles the conditional skips. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/353514 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-1786613-10s-return-skipped into lp:widelands
Toni Förster has proposed merging
lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped into lp:widelands
with lp:~widelands-dev/widelands/mines-worldsavior as a prerequisite.
Commit message:
introduced the return value no_stats for work programs.
Requested reviews:
hessenfarmer (stephan-lutz)
Related bugs:
Bug #1786613 in widelands: "production times are 10s longer when
return=skipped"
https://bugs.launchpad.net/widelands/+bug/1786613
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/353514
When the program returns=no_stats it enters the None case. No stats are
calculated but in case it has been return=skipped before it gets removed from
the skipped_programs-stack.
--
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/mines-worldsavior.
=== modified file 'src/logic/map_objects/tribes/production_program.cc'
--- src/logic/map_objects/tribes/production_program.cc 2018-07-12 16:53:21 +
+++ src/logic/map_objects/tribes/production_program.cc 2018-08-21 16:05:14 +
@@ -467,9 +467,11 @@
result_ = Completed;
else if (match(parameters, "skipped"))
result_ = Skipped;
+ else if (match(parameters, "no_stats"))
+ result_ = None;
else
throw GameDataError(
- "expected %s but found \"%s\"", "{\"failed\"|\"completed\"|\"skipped\"}", parameters);
+ "expected %s but found \"%s\"", "{\"failed\"|\"completed\"|\"skipped\"|\"no_stats\"}", parameters);
if (skip(parameters)) {
if (match_force_skip(parameters, "when")) {
=== modified file 'src/logic/map_objects/tribes/production_program.h'
--- src/logic/map_objects/tribes/production_program.h 2018-07-12 16:53:21 +
+++ src/logic/map_objects/tribes/production_program.h 2018-08-21 16:05:14 +
@@ -107,10 +107,11 @@
///
/// Parameter syntax:
///parameters ::= return_value [condition_part]
- ///return_value ::= Failed | Completed | Skipped
+ ///return_value ::= Failed | Completed | Skipped | None
///Failed ::= "failed"
///Completed ::= "completed"
///Skipped::= "skipped"
+ ///None ::= "no_stats"
///condition_part ::= when_condition | unless_conition
///when_condition ::= "when" condition {"and" condition}
///unless_condition ::= "unless" condition {"or" condition}
@@ -126,8 +127,9 @@
/// Parameter semantics:
///return_value:
/// If return_value is Failed or Completed, the productionsite's
- /// statistics is updated accordingly. If return_value is Skipped, the
- /// statistics are not affected.
+ /// statistics is updated accordingly. If return_value is Skipped or
+ /// None, the statistics are not affected. But Skipped adds a 10s delay
+ /// before the program is executed again.
///condition:
/// A boolean condition that can be evaluated to true or false.
///condition_part:
@@ -235,11 +237,12 @@
/// Parameter syntax:
///parameters ::= program {handling_directive}
///handling_directive ::= "on" Result handling_method
- ///Result ::= "failure" | "completion" | "skip"
+ ///Result ::= "failure" | "completion" | "skip" | "no_stats"
///handling_method::= Fail | Complete | Skip | Repeat
///Fail ::= "fail"
///Ignore ::= "ignore"
///Repeat ::= "repeat"
+ ///None ::= "no_stats"
/// Parameter semantics:
///program:
/// The name of a program defined in the productionsite.
@@ -260,6 +263,9 @@
/// * If handling_method is Skip, the command skips the calling
/// program (with the same effect as executing "return=skipped").
/// * If handling_method is "repeat", the command is repeated.
+ /// * If handling_method is None the called program continues normal,
+ /// but no statistics are calculated (with the same effect as
+ /// executing "return=no_stats")
struct ActCall : public Action {
ActCall(char* parameters, const ProductionSiteDescr&);
void execute(Game&, ProductionSite&) const override;
=== modified file 'src/logic/map_objects/tribes/productionsite.cc'
--- src/logic/map_objects/tribes/productionsite.cc 2018-06-19 08:52:49 +
+++ src/logic/map_objects/tribes/productionsite.cc 2018-08-21 16:05:14 +
@@ -920,7 +920,7 @@
stack_.pop_back();
if (!stack_.empty())
top_state().phase = result;
-
+
switch (result) {
case Failed:
statistics_.erase(statistics_.begin(), statistics_.begin() + 1);
@@ -941,6 +941,7 @@
crude_percent_ = crude_percent_ * 98 / 100;
break;
case None:
+ skipped_programs_.erase(program_name);
break;
}
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe :
[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 => Superseded For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/353449 -- 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/fix_osx_nightlies into lp:widelands
Continuous integration builds have changed state: Travis build 3825. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/418587526. Appveyor build 3624. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_osx_nightlies-3624. -- https://code.launchpad.net/~widelands-dev/widelands/fix_osx_nightlies/+merge/353456 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_osx_nightlies. ___ 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-1786613-10s-return-skipped into lp:widelands
Ok I see your point about the stack. However your solution would need a lot of changes I the programs and additionally we would need to document the rule to implicitly avoid stats calculation by adding_work to the end of the program. So I was thinking why not introduce a way to explicitly state that no stats update is required / foreseen for a work program. This could probably be done by defining a new return state. Alternatively I'm asking myself if we should not try to return=None or return= to avoid stats calculation without having a skipped state. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/353449 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-1786613-10s-return-skipped into lp:widelands
New revision. We check whether the program is "work" or end with "work". This
would work with the marble mines as well. Now if a program shall not calculate
stats, only append _work at the end.
Here is the aforementioned marble-mine:
work = {
-- TRANSLATORS: Completed/Skipped/Did not start working because ...
descname = _"working",
actions = {
"call=mine_granite",
"call=mine_marble",
"return=skipped"
}
This would become:
work = {
-- TRANSLATORS: Completed/Skipped/Did not start working because ...
descname = _"working",
actions = {
"call=mine_marble_work",
"call=mine_granite_work",
}
Still the others need to be changed. But it is unified. Being "work" or ending
with "_work" would result in no stats be calculated for this program.
>Furthermore I really doubt that the desired effect is worth the pain of
>changing all programs of all productionsite buildings.
It's worth it, IMHO. The use of unconditional "return=skipped" also "overloads"
the skipped_programs stack. Usually when a program completes successfully it
gets removed from the skipped_programs stack, but with the unconditional ones
it never will.
Take the the marble-mine for example:
work, mine_granite and mine_marble have a return=skipped. So each marble mine
adds 3 programs to the stack the will never be removed.
Every single crystal-mine will add 4 programs to the stack that will not
removed. And the list goes on for all others that use this method of avoiding
stats being calculated. So in a singleplayer with just one tribe. You would end
up with some hundred programs cloaking the stack for no good reason.
Also it makes the use of conditional return=skipped useless. Here of the
crystal-mine:
descname = _"mining diamonds",
actions = {
"return=skipped unless economy needs diamond",
"sleep=4",
"consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
"call=a_mine_produce_diamond",
"call=a_mine_produce_granite",
"call=a_mine_produce_diamond",
"return=skipped"
}
The only thing it does is not calling the sub-programs. But the way it is
intended to work is: Skip the program, because we don't need the ware. Next
time we need the ware the program gets executed and returns a completed. This
then removes it from the stack. But since it ends with "return=skipped" it
always stays in the stack.
I know that it might be some tedious labor, but productions-sites that already
have sub-programs just need the return=skipped removed and a _work appended to
the sub_program if stats are not needed. The others need the sub-program added,
but I would willingly do this.
Now that I spend some time looking into this, I'm 100% sure, unconditional
skips are the wrong way. Since they do more harm (+10s; and the increasing
stack) and skips were never intended for this usage.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/353449
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/fix_osx_nightlies into lp:widelands
Review: Approve > I have now pushed a fix for Linux. Does it still work for the OSX nightlies? It does for me. -- https://code.launchpad.net/~widelands-dev/widelands/fix_osx_nightlies/+merge/353456 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_osx_nightlies. ___ 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-1784200-single-line-escaping into lp:widelands
How about "For reporting bugs, visit:"? Too keep it short. I have done some testing now and it's working, so this branch can go in once we have agreed on the string. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1784200-single-line-escaping/+merge/353446 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1784200-single-line-escaping. ___ 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_sleep_time into lp:~widelands-dev/widelands/mines-worldsavior
I would appreciate this. However I don't know what are the implications with travis that GunChleoc mentioned. So I am not sure if we have to wait for travis to do so. -- https://code.launchpad.net/~widelands-dev/widelands/mines_sleep_time/+merge/353450 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/fix_osx_nightlies into lp:widelands
I have now pushed a fix for Linux. Does it still work for the OSX nightlies? -- https://code.launchpad.net/~widelands-dev/widelands/fix_osx_nightlies/+merge/353456 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_osx_nightlies 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/mines_sleep_time into lp:~widelands-dev/widelands/mines-worldsavior
I if you want I can merge this into world-saviors branch myself. -- https://code.launchpad.net/~widelands-dev/widelands/mines_sleep_time/+merge/353450 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/mines_sleep_time into lp:~widelands-dev/widelands/mines-worldsavior
Ah good to know. I was suspecting it but didn't know. So for the future I would prefer not to have any merge requests into this branch. @Toni Förster: As I really appreciate your work probably it would be easier for the future to pull the branch do the agreed changes right in there and push a new revision afterwards. We have done this with other branches as well. And we did so with this one (it was originally uploaded by GunChleoc). Only thing is to check whether there are no parallel activities on the branch while changing it, which could be solved with a comment in the merge reviews or a PM over Launchpad as well. @Gun: could you please be so kind to merge this once travis is green? Perhaps it would be a good idea to direct Worldsavior for a final review of the branch after this one has been merged. Afterwards I would vote for merging the mines-worldsavior branch as it already got very big. In the future we should try to keep smaller changes. -- https://code.launchpad.net/~widelands-dev/widelands/mines_sleep_time/+merge/353450 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-1786613-10s-return-skipped into lp:widelands
Review: Disapprove This solution doesn't work for the atlantean Crystal mine and the empire marblemine in their new design as defined in "mines-worldsavior" branch. In principle there may be a misunderstanding about the "work" program. This is the master program of each productionsite. Meaning each of them must at least have a program called "work" from this and every other program other programs could be called. Only condition is that the called programs need to be sorted in the correct order and sorting criteria is the name of the program. Therefore it doesn't work for the named mines as they have a subprogram calling sub-subprograms. Therefore I disapprove this solution as it would limit the current flexible program design of productionsites. Furthermore I really doubt that the desired effect is worth the pain of changing all programs of all productionsite buildings. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/353449 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-1783878_editor_random_map_tribe into lp:widelands
Review: Approve
Code is looking okay and the editor no longer crashes. Two observations:
- When loading the old/broken maps, we still get the "Tribe not known" message.
Maybe only display a "note:" message and select a default tribe in that case?
Having the wrong tribe is in most cases probably preferable to not being able
to use the map at all. Unknown tribes in maps could also happen when
"backporting" maps from (newer) game versions where more/custom tribes are
available.
- When loading the "broken" map in the editor and saving again the map is still
broken. This one is actually a bit strange, shouldn't the change in
editorinteractive.cc avoid this as well?
Diff comments:
> === modified file 'src/editor/editorinteractive.cc'
> --- src/editor/editorinteractive.cc 2018-07-20 08:42:23 +
> +++ src/editor/editorinteractive.cc 2018-08-12 17:17:16 +
> @@ -180,7 +180,7 @@
> loader_ui.step(_("Creating players"));
> iterate_player_numbers(p, map->get_nrplayers()) {
> egbase().add_player(
> -p, 0, map->get_scenario_player_tribe(p),
> map->get_scenario_player_name(p));
> +p, 0, map->get_scenario_player_tribe(p).empty() ?
> Widelands::get_all_tribenames().front() : map->get_scenario_player_tribe(p),
> map->get_scenario_player_name(p));
Why no random selection here?
> }
>
> ml->load_map_complete(egbase(),
> Widelands::MapLoader::LoadType::kEditor);
--
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-1784200-single-line-escaping into lp:widelands
Thanks for the review. Interesting to know that we will move to GitHub. Since we are now only linking to instructions about how to report a bug, maybe change "Please report bugs at:" to "For instructions about how to report bugs, see:" ? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1784200-single-line-escaping/+merge/353446 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1784200-single-line-escaping. ___ 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_sleep_time into lp:~widelands-dev/widelands/mines-worldsavior
Bunnybot can only handle mergers to trunk, so we need to wait for Travis and then merge manually. -- https://code.launchpad.net/~widelands-dev/widelands/mines_sleep_time/+merge/353450 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/fix_osx_nightlies into lp:widelands
This has broken all the Linux builds on Travis: -- Found ICU: /usr/lib/x86_64-linux-gnu/libicuuc.so (found version "52.1.0") CMake Error at CMakeLists.txt:84 (if): if given arguments: "APPLE" "AND" "GREATER" "11" Unknown arguments specified -- Configuring incomplete, errors occurred! -- https://code.launchpad.net/~widelands-dev/widelands/fix_osx_nightlies/+merge/353456 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_osx_nightlies 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/mines_sleep_time into lp:~widelands-dev/widelands/mines-worldsavior
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/mines_sleep_time/+merge/353450 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/mines_sleep_time into lp:~widelands-dev/widelands/mines-worldsavior
Review: Approve thanks for doing this. Code LGTM ;-) -- https://code.launchpad.net/~widelands-dev/widelands/mines_sleep_time/+merge/353450 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-1784200-single-line-escaping into lp:widelands
Review: Approve Code LGTM, not tested yet. I have added some string fixes. Links should not be translatable, and all links need to point to our own site, because we're planning to mover to GitHub after Build 20 comes out, and the Launchpad links will become invalid. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1784200-single-line-escaping/+merge/353446 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1784200-single-line-escaping. ___ 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
