[Widelands-dev] [Merge] lp:~widelands-dev/widelands/delete_new_font_renderer_messages into lp:widelands
Continuous integration builds have changed state: Travis build 3383. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/367059078. Appveyor build 3189. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_delete_new_font_renderer_messages-3189. -- https://code.launchpad.net/~widelands-dev/widelands/delete_new_font_renderer_messages/+merge/343294 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/delete_new_font_renderer_messages 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-1623375-multiplayer-starting-view into lp:widelands
Continuous integration builds have changed state: Travis build 3382. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/367035337. Appveyor build 3188. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1623375_multiplayer_starting_view-3188. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1623375-multiplayer-starting-view/+merge/343287 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1623375-multiplayer-starting-view 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/ships_optr into lp:widelands
Continuous integration builds have changed state: Travis build 3385. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/367063651. Appveyor build 3191. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ships_optr-3191. -- https://code.launchpad.net/~widelands-dev/widelands/ships_optr/+merge/343292 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ships_optr 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/fri-02-fix into lp:widelands
Review: Approve Code LGTM. Have you ever played the scenario to its end in both forks? You should always test yourself before starting a merge request. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fri-02-fix/+merge/343280 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fri-02-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-website/django1_11 into lp:widelands-website
The proposal to merge lp:~widelands-dev/widelands-website/django1_11 into lp:widelands-website has been updated. Description changed to: Major update of the website code to Django 1.11.12. I have gone through all release notes form Django 1.8 until Django 1.11. - Added migrations for wlscreens - Fixed creation of noticetypes by converting signals post_syncdb to post_migrate. This is done by applying some files called 'apps.py'. This makes it also possible to have our own notification types for django_messages. - Replaced linaro-django-pagination (outdated, not maintained) with dj-pagination - Removed using of context_instance (deprecated since Django 1.8) - Added 'options' for setting DATABASES when using mysql version > 5.6 - updated third party app django-registration - Replaced setting MIDDLE_CLASSES with MIDDLEWARE - Added setting PASSWORD_HASHERS which is needed because some old password hashers are removed. Doing so old password stored with an old hasher will be converted automatically. - removed some unused code - moved mainpage urls from urls.py to mainpage/urls.py - Removed app 'tracking' and replaced it with a single middleware, including some own modifications - Fixes getting a list of usernames for JavaScript. This may need a review from a security perspective. How to get this in: 1. activate the virtualenvironment 2. shut down the website (and activate the maintenance view) 3. make a backup of the database 4. run 'pip install -U pip setuptools' 5. merge this branch 6. There will be a conflict: Delete the folder 'tracking' and 'resolve --all' 7. delete remaining '*.pyc' files 8. run 'pip install -R pip_requirements.txt' 9. Modify local_settings.py and add the DATABASE 'options:' like in local_settings.py.sample 10. run './manage.py migrate --fake-initial' (faking initial because of wlscreens) 11. deactivate maintenance view and start the website again 12. pray If all is working: 13. Commit the changes and push 14. optionally drop the database tables related to tracking called: tracking_bannedip, tracking_untrackeduseragent, tracking_visitor For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/django1_11/+merge/343065 -- 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/delete_new_font_renderer_messages into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/delete_new_font_renderer_messages into lp:widelands.
Commit message:
Removed 'using NEW font renderer' log messages.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/delete_new_font_renderer_messages/+merge/343294
Just removing some noise. I have tested it.
@bunnybot merge
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/delete_new_font_renderer_messages into lp:widelands.
=== modified file 'src/wui/game_objectives_menu.cc'
--- src/wui/game_objectives_menu.cc 2018-04-07 16:59:00 +
+++ src/wui/game_objectives_menu.cc 2018-04-16 08:28:38 +
@@ -92,9 +92,8 @@
try {
objectivetext.force_new_renderer();
objectivetext.set_text(text);
- log("Objectives: using NEW font renderer.\n");
} catch (const std::exception& e) {
- log("Objectives: falling back to OLD font renderer:\n%s\n%s\n", text.c_str(), e.what());
+ log("Objectives: falling back to old font renderer:\n%s\n%s\n", text.c_str(), e.what());
objectivetext.force_new_renderer(false);
objectivetext.set_text(text);
}
=== modified file 'src/wui/story_message_box.cc'
--- src/wui/story_message_box.cc 2018-04-07 16:59:00 +
+++ src/wui/story_message_box.cc 2018-04-16 08:28:38 +
@@ -62,10 +62,9 @@
try {
textarea_.force_new_renderer();
textarea_.set_text(body);
- log("Story Message Box: using NEW font renderer.\n");
} catch (const std::exception& e) {
log(
- "Story Message Box: falling back to OLD font renderer:\n%s\n%s\n", body.c_str(), e.what());
+ "Story Message Box: falling back to old font renderer:\n%s\n%s\n", body.c_str(), e.what());
textarea_.force_new_renderer(false);
textarea_.set_text(body);
}
___
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-1623375-multiplayer-starting-view into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1623375-multiplayer-starting-view into
lp:widelands.
Commit message:
In multiplayer games, scroll to starting position when a game is loaded.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1623375 in widelands: "Map viewpoint and location markers not read in
multiplayer mode"
https://bugs.launchpad.net/widelands/+bug/1623375
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1623375-multiplayer-starting-view/+merge/343287
Gets rid of starting loaded multiplayer games with the map view at position
0,0, which is often unexplored.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1623375-multiplayer-starting-view into
lp:widelands.
=== modified file 'src/logic/game.cc'
--- src/logic/game.cc 2018-04-07 16:59:00 +
+++ src/logic/game.cc 2018-04-16 07:18:48 +
@@ -452,6 +452,8 @@
}
if (get_ipl()) {
+ // Scroll map to startng position for new games.
+ // Loaded games are handled in GameInteractivePlayerPacket for single player, and in InteractiveGameBase::start() for multiplayer.
get_ipl()->map_view()->scroll_to_field(
map().get_starting_pos(get_ipl()->player_number()), MapView::Transition::Jump);
}
=== modified file 'src/wui/interactive_gamebase.cc'
--- src/wui/interactive_gamebase.cc 2018-04-07 16:59:00 +
+++ src/wui/interactive_gamebase.cc 2018-04-16 07:18:48 +
@@ -148,6 +148,27 @@
hide_minimap();
}
+void InteractiveGameBase::start() {
+ InteractiveBase::start();
+ // Multiplayer games don't save the view position, so we go to the starting position instead
+ if (is_multiplayer()) {
+ Widelands::PlayerNumber pln = player_number();
+ const Widelands::PlayerNumber max = game().map().get_nrplayers();
+ if (pln == 0) {
+ // Spectator, use the view of the first viable player
+ for (pln = 1; pln <= max; ++pln) {
+if (game().get_player(pln)) {
+ break;
+}
+ }
+ }
+ // Adding a check, just in case there was no viable player found for spectator
+ if (game().get_player(pln)) {
+ map_view()->scroll_to_field(game().map().get_starting_pos(pln), MapView::Transition::Jump);
+ }
+ }
+}
+
void InteractiveGameBase::on_buildhelp_changed(const bool value) {
toggle_buildhelp_->set_perm_pressed(value);
}
=== modified file 'src/wui/interactive_gamebase.h'
--- src/wui/interactive_gamebase.h 2018-04-07 16:59:00 +
+++ src/wui/interactive_gamebase.h 2018-04-16 07:18:48 +
@@ -92,8 +92,7 @@
void show_game_summary();
void postload() override;
- void start() override {
- }
+ void start() override;
protected:
void draw_overlay(RenderTarget&) override;
___
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/ships_optr into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/ships_optr into
lp:widelands.
Commit message:
The ShipWindow now tracks the existence of ships via OPtr, analogous to the
BuildingWindow code.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/ships_optr/+merge/343292
This is a prerequisite for the ship statistics window to fix some memory issues
- I decide to split off this bit to make the diffs smaller.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/ships_optr into lp:widelands.
=== modified file 'src/wui/interactive_gamebase.cc'
--- src/wui/interactive_gamebase.cc 2018-04-07 16:59:00 +
+++ src/wui/interactive_gamebase.cc 2018-04-16 08:10:15 +
@@ -236,7 +236,7 @@
UI::UniqueWindow::Registry& registry =
unique_windows().get_registry((boost::format("ship_%d") % ship->serial()).str());
registry.open_window = [this, , ship] {
- new ShipWindow(*this, registry, *ship);
+ new ShipWindow(*this, registry, ship);
};
registry.create();
return true;
=== modified file 'src/wui/shipwindow.cc'
--- src/wui/shipwindow.cc 2018-04-07 16:59:00 +
+++ src/wui/shipwindow.cc 2018-04-16 08:10:15 +
@@ -53,18 +53,18 @@
using namespace Widelands;
-ShipWindow::ShipWindow(InteractiveGameBase& igb, UniqueWindow::Registry& reg, Ship& ship)
- : UniqueWindow(, "shipwindow", , 0, 0, ship.get_shipname()),
+ShipWindow::ShipWindow(InteractiveGameBase& igb, UniqueWindow::Registry& reg, Ship* ship)
+ : UniqueWindow(, "shipwindow", , 0, 0, ship->get_shipname()),
igbase_(igb),
ship_(ship),
vbox_(this, 0, 0, UI::Box::Vertical),
navigation_box_(_, 0, 0, UI::Box::Vertical),
navigation_box_height_(0) {
vbox_.set_inner_spacing(kPadding);
- assert(ship_.get_owner());
+ assert(ship->get_owner());
- display_ = new ItemWaresDisplay(_, *ship_.get_owner());
- display_->set_capacity(ship_.descr().get_capacity());
+ display_ = new ItemWaresDisplay(_, ship->owner());
+ display_->set_capacity(ship->descr().get_capacity());
vbox_.add(display_, UI::Box::Resizing::kAlign, UI::Align::kCenter);
// Expedition buttons
@@ -163,9 +163,13 @@
if (note.serial == ship_.serial()) {
switch (note.action) {
// Unable to cancel the expedition
- case Widelands::NoteShipWindow::Action::kNoPortLeft:
-if (upcast(InteractiveGameBase, igamebase, ship_.get_owner()->egbase().get_ibase())) {
- if (igamebase->can_act(ship_.get_owner()->player_number())) {
+ case Widelands::NoteShipWindow::Action::kNoPortLeft: {
+Widelands::Ship* note_ship = ship_.get(igbase_.egbase());
+if (note_ship == nullptr) {
+ return;
+}
+if (upcast(InteractiveGameBase, igamebase, note_ship->get_owner()->egbase().get_ibase())) {
+ if (igamebase->can_act(note_ship->get_owner()->player_number())) {
UI::WLMessageBox messagebox(
get_parent(),
/** TRANSLATORS: Window label when an expedition can't be canceled */
@@ -175,7 +179,7 @@
messagebox.run();
}
}
-break;
+ } break;
// The ship is no more
case Widelands::NoteShipWindow::Action::kClose:
// Stop this from thinking to avoid segfaults
@@ -195,10 +199,14 @@
}
void ShipWindow::set_button_visibility() {
- if (navigation_box_.is_visible() != ship_.state_is_expedition()) {
- navigation_box_.set_visible(ship_.state_is_expedition());
+ Widelands::Ship* ship = ship_.get(igbase_.egbase());
+ if (ship == nullptr) {
+ return;
+ }
+ if (navigation_box_.is_visible() != ship->state_is_expedition()) {
+ navigation_box_.set_visible(ship->state_is_expedition());
navigation_box_.set_desired_size(
- navigation_box_.get_w(), ship_.state_is_expedition() ? navigation_box_height_ : 0);
+ navigation_box_.get_w(), ship->state_is_expedition() ? navigation_box_height_ : 0);
layout();
}
if (btn_cancel_expedition_->is_visible() != btn_cancel_expedition_->enabled()) {
@@ -208,17 +216,21 @@
void ShipWindow::think() {
UI::Window::think();
- InteractiveBase* ib = ship_.get_owner()->egbase().get_ibase();
+ Widelands::Ship* ship = ship_.get(igbase_.egbase());
+ if (ship == nullptr) {
+ return;
+ }
+ InteractiveBase* ib = ship->get_owner()->egbase().get_ibase();
bool can_act = false;
if (upcast(InteractiveGameBase, igb, ib))
- can_act = igb->can_act(ship_.get_owner()->player_number());
+ can_act = igb->can_act(ship->owner().player_number());
- btn_destination_->set_enabled(ship_.get_destination(igbase_.egbase()));
+ btn_destination_->set_enabled(ship->get_destination(igbase_.egbase()));
btn_sink_->set_enabled(can_act);
display_->clear();
- for (uint32_t idx = 0; idx < ship_.get_nritems(); ++idx) {
- Widelands::ShippingItem item = ship_.get_item(idx);
+ for (uint32_t idx = 0; idx < ship->get_nritems(); ++idx) {
+ Widelands::ShippingItem item = ship->get_item(idx);
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1358880-ship-statistics into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1358880-ship-statistics into lp:widelands with
lp:~widelands-dev/widelands/ships_optr as a prerequisite.
Commit message:
Adds a new Ship Statistics window.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1358880 in widelands: "List of ships"
https://bugs.launchpad.net/widelands/+bug/1358880
Bug #1618617 in widelands: "Idle ships shows "Shipping" in statistic mode =
"s"-key"
https://bugs.launchpad.net/widelands/+bug/1618617
Bug #1749567 in widelands: "heap-use-after-free when sinking a ship"
https://bugs.launchpad.net/widelands/+bug/1749567
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1358880-ship-statistics/+merge/343293
Finally, ths ship list.
lp:~widelands-dev/widelands/ships_optr needs to go in first.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1358880-ship-statistics into lp:widelands.
=== added file 'data/images/wui/editor/fsel_editor_set_port_space.png'
Binary files data/images/wui/editor/fsel_editor_set_port_space.png 1970-01-01 00:00:00 + and data/images/wui/editor/fsel_editor_set_port_space.png 2018-04-16 08:14:47 + differ
=== removed file 'data/images/wui/editor/fsel_editor_set_port_space.png'
Binary files data/images/wui/editor/fsel_editor_set_port_space.png 2018-01-05 12:07:27 + and data/images/wui/editor/fsel_editor_set_port_space.png 1970-01-01 00:00:00 + differ
=== added file 'data/images/wui/editor/fsel_editor_unset_port_space.png'
Binary files data/images/wui/editor/fsel_editor_unset_port_space.png 1970-01-01 00:00:00 + and data/images/wui/editor/fsel_editor_unset_port_space.png 2018-04-16 08:14:47 + differ
=== removed file 'data/images/wui/editor/fsel_editor_unset_port_space.png'
Binary files data/images/wui/editor/fsel_editor_unset_port_space.png 2018-01-05 12:07:27 + and data/images/wui/editor/fsel_editor_unset_port_space.png 1970-01-01 00:00:00 + differ
=== added file 'data/images/wui/ship/ship_construct_port_space.png'
Binary files data/images/wui/ship/ship_construct_port_space.png 1970-01-01 00:00:00 + and data/images/wui/ship/ship_construct_port_space.png 2018-04-16 08:14:47 + differ
=== added file 'data/images/wui/stats/ship_stats_idle.png'
Binary files data/images/wui/stats/ship_stats_idle.png 1970-01-01 00:00:00 + and data/images/wui/stats/ship_stats_idle.png 2018-04-16 08:14:47 + differ
=== added file 'data/images/wui/stats/ship_stats_shipping.png'
Binary files data/images/wui/stats/ship_stats_shipping.png 1970-01-01 00:00:00 + and data/images/wui/stats/ship_stats_shipping.png 2018-04-16 08:14:47 + differ
=== modified file 'data/tribes/scripting/help/controls.lua'
--- data/tribes/scripting/help/controls.lua 2017-12-06 08:16:46 +
+++ data/tribes/scripting/help/controls.lua 2018-04-16 08:14:47 +
@@ -21,6 +21,16 @@
-- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
dl(help_format_hotkey(pgettext("hotkey", "Ctrl + Left-click on Button")), _"Skip confirmation dialog")) ..
+ h2(_"Table Control") ..
+ h3(_"In tables that allow the selection of multiple entries, the following key combinations are available:") ..
+ p(
+ -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
+ dl(help_format_hotkey(pgettext("hotkey", "Ctrl + Click")), pgettext("table_control", "Select multiple entries")) ..
+ -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
+ dl(help_format_hotkey(pgettext("hotkey", "Shift + Click")), pgettext("table_control", "Select a range of entries")) ..
+ -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
+ dl(help_format_hotkey(pgettext("hotkey", "Ctrl + A")), pgettext("table_control", "Select all entries"))) ..
+
h2(_"Road Control") ..
p(
-- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
@@ -52,6 +62,8 @@
dl(help_format_hotkey("I"), _"Toggle stock inventory") ..
-- TRANSLATORS: This is an access key combination. The hotkey is 'b'
dl(help_format_hotkey("B"), _"Toggle building statistics") ..
+ -- TRANSLATORS: This is an access key combination. The hotkey is 'p'
+ dl(help_format_hotkey("E"), _"Toggle seafaring statistics") ..
-- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
dl(help_format_hotkey(pgettext("hotkey", "Home")), _"Center main mapview on starting location") ..
-- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
@@ -72,18 +84,8 @@
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/delete_new_font_renderer_messages into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/delete_new_font_renderer_messages into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/delete_new_font_renderer_messages/+merge/343294 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/delete_new_font_renderer_messages 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-1358880-ship-statistics into lp:widelands
Continuous integration builds have changed state: Travis build 3386. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/367231513. Appveyor build 3192. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1358880_ship_statistics-3192. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1358880-ship-statistics/+merge/343293 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1358880-ship-statistics 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/delete_new_font_renderer_messages into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/delete_new_font_renderer_messages/+merge/343294 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/delete_new_font_renderer_messages 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
