[Widelands-dev] [Merge] lp:~widelands-dev/widelands/atlanteans_cornfield into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/atlanteans_cornfield into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/atlanteans_cornfield/+merge/371209 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/atlanteans_cornfield. ___ 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/new_wai_files_11082019 into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/new_wai_files_11082019 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/new_wai_files_11082019/+merge/371178 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/new_wai_files_11082019. ___ 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/new_wai_files_11082019 into lp:widelands
Review: Approve travis failure is not related to code. @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/new_wai_files_11082019/+merge/371178 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/new_wai_files_11082019. ___ 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/atlanteans_cornfield into lp:widelands
Thanks, for testing :) Updated the media branch with the blend file and fraangs license. -- https://code.launchpad.net/~widelands-dev/widelands/atlanteans_cornfield/+merge/371209 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/atlanteans_cornfield. ___ 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/economy-target-profiles into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/371251 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/economy-target-profiles. ___ 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/economy-target-profiles into lp:widelands
Continuous integration builds have changed state: Travis build 5320. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/571293137. Appveyor build 5092. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_economy_target_profiles-5092. -- https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/371251 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/economy-target-profiles. ___ 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/atlanteans_cornfield into lp:widelands
Review: Resubmit Sorry didn't applied the init.lua files sent by fraang, because they have changed in the meantime. The values are now taken from fraang, but i edited the main init.lua files from trunk. Looks good now imho. fraang had also changed the animate program for cornfield_ripe and applied a value of 45000. The result was that some ripe filed vanished without harvesting. So i leave the value from trunk and it seems to be correct. -- https://code.launchpad.net/~widelands-dev/widelands/atlanteans_cornfield/+merge/371209 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/atlanteans_cornfield. ___ 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/new-shipping into lp:widelands
Whatever you did, looks like it fixed the regression tests, too. I have about no time this weeek. But this deserves some playtesting, mmh. -- https://code.launchpad.net/~widelands-dev/widelands/new-shipping/+merge/371155 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/new-shipping. ___ 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/new-shipping into lp:widelands
Yes, with ASan. It complains about the usual memory leak when closing Widelands, nothing else. Travis is happy now, regression tests are working there. -- https://code.launchpad.net/~widelands-dev/widelands/new-shipping/+merge/371155 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/new-shipping. ___ 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/economy-target-profiles into lp:widelands
It cannot affect the game, so this isn´t necessary. But perhaps one might want to save some clever economy settings of another player for future use in own games, so why not allow it? -- https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/371251 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/economy-target-profiles 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/economy-target-profiles into lp:widelands
LGTM :) Do we want to disable the save button too? -- https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/371251 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/economy-target-profiles 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/workarea-fixes into lp:widelands
Review: Approve LGTM :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/workarea-fixes/+merge/371171 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/workarea-fixes. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands
Benedikt Straub has proposed merging
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands.
Commit message:
Forbid changing economy targets by spectators
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1827696 in widelands: "Allow users to define their own economy default
settings"
https://bugs.launchpad.net/widelands/+bug/1827696
Bug #1831196 in widelands: "Economy profile selection doesn't work"
https://bugs.launchpad.net/widelands/+bug/1831196
Bug #1839948 in widelands: "Missing can_act check in EconomyOptionsWindow"
https://bugs.launchpad.net/widelands/+bug/1839948
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/371251
Added some missing checks for can_act and got rid of an unused variable.
It is still allowed to save another player´s targets to disk though as this
does not affect the game.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands.
=== modified file 'src/wui/economy_options_window.cc'
--- src/wui/economy_options_window.cc 2019-08-10 16:38:15 +
+++ src/wui/economy_options_window.cc 2019-08-13 11:25:16 +
@@ -76,6 +76,7 @@
b->sigclicked.connect([this] { change_target(-10); });
buttons->add(b);
b->set_repeating(true);
+ b->set_enabled(can_act);
buttons->add_space(8);
b = new UI::Button(buttons, "decrease_target", 0, 0, 44, 28, UI::ButtonStyle::kWuiSecondary,
g_gr->images().get("images/ui_basic/scrollbar_down.png"),
@@ -83,6 +84,7 @@
b->sigclicked.connect([this] { change_target(-1); });
buttons->add(b);
b->set_repeating(true);
+ b->set_enabled(can_act);
buttons->add_space(24);
b = new UI::Button(buttons, "increase_target", 0, 0, 44, 28, UI::ButtonStyle::kWuiSecondary,
@@ -90,6 +92,7 @@
b->sigclicked.connect([this] { change_target(1); });
buttons->add(b);
b->set_repeating(true);
+ b->set_enabled(can_act);
buttons->add_space(8);
b = new UI::Button(buttons, "increase_target_fast", 0, 0, 44, 28, UI::ButtonStyle::kWuiSecondary,
g_gr->images().get("images/ui_basic/scrollbar_up_fast.png"),
@@ -97,11 +100,16 @@
b->sigclicked.connect([this] { change_target(10); });
buttons->add(b);
b->set_repeating(true);
+ b->set_enabled(can_act);
dropdown_.set_tooltip(_("Profile to apply to the selected items"));
dropdown_box_.set_size(40, 20); // Prevent assert failures
dropdown_box_.add(_, UI::Box::Resizing::kFullSize);
- dropdown_.selected.connect([this] { reset_target(); });
+ if (can_act) {
+ dropdown_.selected.connect([this] { reset_target(); });
+ } else {
+ dropdown_.set_enabled(false);
+ }
b = new UI::Button(_box_, "save_targets", 0, 0, 34, 34, UI::ButtonStyle::kWuiMenu,
g_gr->images().get("images/wui/menus/save_game.png"),
@@ -239,16 +247,11 @@
serial_(serial),
player_(player),
type_(type),
- can_act_(can_act),
- display_(this, 0, 0, serial_, player_, type_, can_act_),
+ display_(this, 0, 0, serial_, player_, type_, can_act),
economy_options_window_(eco_window) {
add(_, UI::Box::Resizing::kFullSize);
display_.set_hgap(AbstractWaresDisplay::calc_hgap(display_.get_extent().w, min_w));
-
- if (!can_act_) {
- return;
- }
}
void EconomyOptionsWindow::EconomyOptionsPanel::set_economy(Widelands::Serial serial) {
=== modified file 'src/wui/economy_options_window.h'
--- src/wui/economy_options_window.h 2019-05-14 18:08:22 +
+++ src/wui/economy_options_window.h 2019-08-13 11:25:16 +
@@ -117,7 +117,6 @@
Widelands::Serial serial_;
Widelands::Player* player_;
Widelands::WareWorker type_;
- bool can_act_;
TargetWaresDisplay display_;
EconomyOptionsWindow* economy_options_window_;
};
___
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/constructionsite_options into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/constructionsite_options into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/371170 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/constructionsite_options 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/new_wai_files_11082019 into lp:widelands
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 5315. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/570577164. -- https://code.launchpad.net/~widelands-dev/widelands/new_wai_files_11082019/+merge/371178 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/new_wai_files_11082019. ___ 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/constructionsite_options into lp:widelands
Code LGTM :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/371170 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/constructionsite_options 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/new_wai_files_11082019 into lp:widelands
Review: Approve Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/new_wai_files_11082019/+merge/371178 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/new_wai_files_11082019. ___ 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
