Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fs-tile-background into lp:widelands
> Oh, placeholder? Thats looks definitely better than just "placeholder" ;). > > I really like this change! dito :-) -- https://code.launchpad.net/~widelands-dev/widelands/fs-tile-background/+merge/309673 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fs-tile-background. ___ 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/fs-tile-background into lp:widelands
Review: Approve Oh, placeholder? Thats looks definitely better than just "placeholder" ;). I really like this change! -- https://code.launchpad.net/~widelands-dev/widelands/fs-tile-background/+merge/309673 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fs-tile-background. ___ 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:~7010622-q/widelands/topple-production-logic-4 into lp:widelands
Continuous integration builds have changed state: Travis build 1543. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/171917046. Appveyor build 1384. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_7010622_q_widelands_topple_production_logic_4-1384. -- https://code.launchpad.net/~7010622-q/widelands/topple-production-logic-4/+merge/309656 Your team Widelands Developers is requested to review the proposed merge of lp:~7010622-q/widelands/topple-production-logic-4 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/fs-tile-background into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/fs-tile-background into lp:widelands. Commit message: Fullscreen background images are now tiled rather than stretched. - New class FullscreenWindow in ui_basic handles the overlays. - There is a tiled background, plus a centered overlay - Subclasses can add overlays and align them with UI::Align - On top of the subclasses' overlays, the 4 edges blit a tiled image, and there is 1 image in each corner of the screen. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fs-tile-background/+merge/309673 When showing the fullscreen menu at any resolution bigger than 800x600, the background images get fuzzy. This branch fixes that and uses some placeholder images for adornments - we will need some graphics contributions to make this look really good. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fs-tile-background into lp:widelands. === modified file 'data/images/loadscreens/progress.png' Binary files data/images/loadscreens/progress.png 2014-12-03 14:26:52 + and data/images/loadscreens/progress.png 2016-10-31 12:10:16 + differ === renamed file 'data/images/ui_fsmenu/ui_fsmenu.jpg' => 'data/images/ui_fsmenu/background.png' Binary files data/images/ui_fsmenu/ui_fsmenu.jpg 2014-12-03 13:06:42 + and data/images/ui_fsmenu/background.png 2016-10-31 12:10:16 + differ === added file 'data/images/ui_fsmenu/bottom.png' Binary files data/images/ui_fsmenu/bottom.png 1970-01-01 00:00:00 + and data/images/ui_fsmenu/bottom.png 2016-10-31 12:10:16 + differ === added file 'data/images/ui_fsmenu/bottom_left.png' Binary files data/images/ui_fsmenu/bottom_left.png 1970-01-01 00:00:00 + and data/images/ui_fsmenu/bottom_left.png 2016-10-31 12:10:16 + differ === added file 'data/images/ui_fsmenu/bottom_right.png' Binary files data/images/ui_fsmenu/bottom_right.png 1970-01-01 00:00:00 + and data/images/ui_fsmenu/bottom_right.png 2016-10-31 12:10:16 + differ === added file 'data/images/ui_fsmenu/center.png' Binary files data/images/ui_fsmenu/center.png 1970-01-01 00:00:00 + and data/images/ui_fsmenu/center.png 2016-10-31 12:10:16 + differ === removed file 'data/images/ui_fsmenu/choosemapmenu.jpg' Binary files data/images/ui_fsmenu/choosemapmenu.jpg 2014-12-03 13:06:42 + and data/images/ui_fsmenu/choosemapmenu.jpg 1970-01-01 00:00:00 + differ === removed file 'data/images/ui_fsmenu/internetmenu.jpg' Binary files data/images/ui_fsmenu/internetmenu.jpg 2014-12-03 13:06:42 + and data/images/ui_fsmenu/internetmenu.jpg 1970-01-01 00:00:00 + differ === removed file 'data/images/ui_fsmenu/launch_mpg_menu.jpg' Binary files data/images/ui_fsmenu/launch_mpg_menu.jpg 2014-12-03 13:06:42 + and data/images/ui_fsmenu/launch_mpg_menu.jpg 1970-01-01 00:00:00 + differ === added file 'data/images/ui_fsmenu/left.png' Binary files data/images/ui_fsmenu/left.png 1970-01-01 00:00:00 + and data/images/ui_fsmenu/left.png 2016-10-31 12:10:16 + differ === added file 'data/images/ui_fsmenu/main_title.png' Binary files data/images/ui_fsmenu/main_title.png 1970-01-01 00:00:00 + and data/images/ui_fsmenu/main_title.png 2016-10-31 12:10:16 + differ === removed file 'data/images/ui_fsmenu/mainmenu.jpg' Binary files data/images/ui_fsmenu/mainmenu.jpg 2014-12-03 13:06:42 + and data/images/ui_fsmenu/mainmenu.jpg 1970-01-01 00:00:00 + differ === added file 'data/images/ui_fsmenu/right.png' Binary files data/images/ui_fsmenu/right.png 1970-01-01 00:00:00 + and data/images/ui_fsmenu/right.png 2016-10-31 12:10:16 + differ === added file 'data/images/ui_fsmenu/top.png' Binary files data/images/ui_fsmenu/top.png 1970-01-01 00:00:00 + and data/images/ui_fsmenu/top.png 2016-10-31 12:10:16 + differ === added file 'data/images/ui_fsmenu/top_left.png' Binary files data/images/ui_fsmenu/top_left.png 1970-01-01 00:00:00 + and data/images/ui_fsmenu/top_left.png 2016-10-31 12:10:16 + differ === added file 'data/images/ui_fsmenu/top_right.png' Binary files data/images/ui_fsmenu/top_right.png 1970-01-01 00:00:00 + and data/images/ui_fsmenu/top_right.png 2016-10-31 12:10:16 + differ === modified file 'src/ui_basic/CMakeLists.txt' --- src/ui_basic/CMakeLists.txt 2016-09-06 18:43:55 + +++ src/ui_basic/CMakeLists.txt 2016-10-31 12:10:16 + @@ -12,6 +12,8 @@ editbox.h fileview_panel.cc fileview_panel.h +fullscreen_window.cc +fullscreen_window.h icon.cc icon.h icongrid.cc === added file 'src/ui_basic/fullscreen_window.cc' --- src/ui_basic/fullscreen_window.cc 1970-01-01 00:00:00 + +++ src/ui_basic/fullscreen_window.cc 2016-10-31 12:10:16 + @@ -0,0 +1,153 @@ +/* + * Copyright (C) 2002, 2007-2010 by the Widelands Development Team + * + * This program is free software; you can redistribute it and/or + * modify
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/scrollbar_beautification into lp:widelands
Continuous integration builds have changed state: Travis build 1541. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/171903635. Appveyor build 1382. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_scrollbar_beautification-1382. -- https://code.launchpad.net/~widelands-dev/widelands/scrollbar_beautification/+merge/309635 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/scrollbar_beautification. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/anti_spam_4 into lp:widelands-website
Looks good to this Django agnostic. -- https://code.launchpad.net/~widelands-dev/widelands-website/anti_spam_4/+merge/309642 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/anti_spam_4 into 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/fsmenu_fullscreen_1_main_menus into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/fsmenu_fullscreen_1_main_menus into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fsmenu_fullscreen_1_main_menus/+merge/309655 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fsmenu_fullscreen_1_main_menus. ___ 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/fsmenu_fullscreen_1_main_menus into lp:widelands
Thanks for the review :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fsmenu_fullscreen_1_main_menus/+merge/309655 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fsmenu_fullscreen_1_main_menus. ___ 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/fsmenu_fullscreen_1_main_menus into lp:widelands
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/fsmenu_fullscreen_1_main_menus/+merge/309655 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fsmenu_fullscreen_1_main_menus. ___ 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:~7010622-q/widelands/topple-production-logic-4 into lp:widelands
toptopple has proposed merging
lp:~7010622-q/widelands/topple-production-logic-4 into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~7010622-q/widelands/topple-production-logic-4/+merge/309656
These are the adjustment time values for weapon and armour production sites
(all races) which were changed recently for more efficient use of their
schemes. The new values are required to compensate increased production speed
in the "mixed resources" cases, which must be considered standard. Mixed
resources means there are not all resources supplied for the entire set of
products the economy needs.
Though these changes may appear voluminous to some, actually they are still
rather weak. I test-played them all and they render nicely. With only 2 houses
"weapon-smith" (and 2 for armour) you receive a constant flow of equipment and
can run your training camp at 100% if all raw resources are supplied.
The effects are two-fold:
1) production time values are lifted (e.g.t o allow for resupplies of raw
material)
2) times of products are diversified according to their value. That means for a
higher product more time is invested than for a lower. Values in seconds.
Site : Product OldNew Change Factor
--
BA AxeWo : Axe 57 73 16 0.28
BA AxeWo : Axe-Sharp57 76 19 0.33
BA AxeWo : Axe-Broad57 79 22 0.38
BA Warmill : Axe57 73 16 0.28
BA Warmill : Axe-Sharp 57 76 19 0.33
BA Warmill : Axe-Broad 57 79 22 0.38
BA Warmill : Axe-Bronze 57 82 25 0.44
BA Warmill : Axe-Battle 57 87 30 0.53
BA Warmill : Axe-Warrio 57 92 35 0.61
BA Helms : Helmet 67 80 13 0.19
BA Helms : Mask 77 90 15 0.18
BA Helms : Warhelm 87 100 17 0.15
EM Weapons : Wood Spear 50 64 14 0.28
EM Weapons : Spear 77 102 25 0.32
EM Weapons : Adv. Spear 77 110 33 0.43
EM Weapons : Hv. Spear 77 115 38 0.49
EM Weapons : War-Spear 77 120 43 0.56
EM Armors : Helmet 67 80 13 0.19
EM Armors : Armor 77 90 13 0.17
EM Armors : Chain Armor 77 108 31 0.40
EM Armors : Guild Armor 77 115 38 0.49
AT Weapons : Tri Light 50 64 14 0.28
AT Weapons : Tri Long 77 102 25 0.32
AT Weapons : Tri Steel 77 110 33 0.43
AT Weapons : Tri Double 77 115 38 0.49
AT Weapons : Tri H-D77 120 43 0.56
AT Armors : Shld Steel 67 90 23 0.34
AT Armors : Shld Adv. 77 110 33 0.43
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~7010622-q/widelands/topple-production-logic-4 into lp:widelands.
=== modified file 'data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua 2016-10-24 10:09:01 +
+++ data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua 2016-10-31 07:27:05 +
@@ -132,10 +132,11 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a steel shield because ...
descname = _"forging a steel shield",
actions = {
+-- time total: 90
"return=skipped unless economy needs shield_steel",
-"sleep=32000",
+"sleep=45000", -- +13 enlarge
"consume=iron:2 coal:2",
-"animate=working 35000",
+"animate=working 45000", -- +10 enlarge
"produce=shield_steel"
}
},
@@ -143,10 +144,11 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging an advanced shield because ...
descname = _"forging an advanced shield",
actions = {
+-- time total: 110
"return=skipped unless economy needs shield_advanced",
"consume=iron:2 coal:2 gold",
-"sleep=32000",
-"animate=working 45000",
+"sleep=5", -- +18 enlarge
+"animate=working 6", -- +15 enlarge
"produce=shield_advanced"
}
},
=== modified file 'data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua 2016-10-24 10:09:01 +
+++ data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua 2016-10-31 07:27:05 +
@@ -72,11 +72,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a light trident because ...
descname = _"forging
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fsmenu_fullscreen_1_main_menus into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/fsmenu_fullscreen_1_main_menus into lp:widelands.
Commit message:
The main, multiplayer and single player menus now relayout themselves when
fullscreen mode is toggled.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1398733 in widelands: "Fullscreen Menus cannot relayout themselves"
https://bugs.launchpad.net/widelands/+bug/1398733
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fsmenu_fullscreen_1_main_menus/+merge/309655
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/fsmenu_fullscreen_1_main_menus into lp:widelands.
=== modified file 'src/ui_basic/box.cc'
--- src/ui_basic/box.cc 2016-10-16 09:31:42 +
+++ src/ui_basic/box.cc 2016-10-31 07:01:05 +
@@ -81,6 +81,14 @@
}
/**
+ * Sets the value for the inner spacing.
+ * \note This does not relayout the box.
+ */
+void Box::set_inner_spacing(uint32_t size) {
+ inner_spacing_ = size;
+}
+
+/**
* Compute the desired size based on our children. This assumes that the
* infinite space is zero, and is later on also re-used to calculate the
* space assigned to an infinite space.
@@ -198,7 +206,7 @@
infspace_count--;
}
- // Forth pass: Update positions of all other items
+ // Fourth pass: Update positions of all other items
update_positions();
}
=== modified file 'src/ui_basic/box.h'
--- src/ui_basic/box.h 2016-08-04 15:49:05 +
+++ src/ui_basic/box.h 2016-10-31 07:01:05 +
@@ -62,6 +62,7 @@
}
void set_min_desired_breadth(uint32_t min);
+ void set_inner_spacing(uint32_t size);
protected:
void layout() override;
=== modified file 'src/ui_fsmenu/base.cc'
--- src/ui_fsmenu/base.cc 2016-10-16 20:35:47 +
+++ src/ui_fsmenu/base.cc 2016-10-31 07:01:05 +
@@ -48,6 +48,11 @@
*/
FullscreenMenuBase::FullscreenMenuBase(const std::string& bgpic)
: UI::Panel(nullptr, 0, 0, g_gr->get_xres(), g_gr->get_yres()), background_image_(bgpic) {
+ graphic_resolution_changed_subscriber_ = Notifications::subscribe(
+ [this](const GraphicResolutionChanged& message) {
+ set_size(message.width, message.height);
+ layout();
+ });
}
FullscreenMenuBase::~FullscreenMenuBase() {
=== modified file 'src/ui_fsmenu/base.h'
--- src/ui_fsmenu/base.h 2016-08-04 15:49:05 +
+++ src/ui_fsmenu/base.h 2016-10-31 07:01:05 +
@@ -20,8 +20,11 @@
#ifndef WL_UI_FSMENU_BASE_H
#define WL_UI_FSMENU_BASE_H
+#include
#include
+#include "graphic/graphic.h"
+#include "notifications/notifications.h"
#include "ui_basic/panel.h"
/**
@@ -86,6 +89,8 @@
private:
std::string background_image_;
+ std::unique_ptr
+ graphic_resolution_changed_subscriber_;
};
#endif // end of include guard: WL_UI_FSMENU_BASE_H
=== modified file 'src/ui_fsmenu/main.cc'
--- src/ui_fsmenu/main.cc 2016-09-25 10:42:26 +
+++ src/ui_fsmenu/main.cc 2016-10-31 07:01:05 +
@@ -29,14 +29,6 @@
: FullscreenMenuMainMenu("images/ui_fsmenu/mainmenu.jpg"),
// Buttons
- // This box needs to be a bit higher than in the other menus, because we have a lot of buttons
- vbox(this,
- box_x_,
- box_y_ - buth_,
- UI::Box::Vertical,
- butw_,
- get_h() - (box_y_ - buth_),
- padding_),
playtutorial(,
"play_tutorial",
0,
@@ -93,14 +85,14 @@
// Textlabels
version(
this,
-get_w(),
-get_h(),
+0,
+0,
/** TRANSLATORS: %1$s = version string, %2%s = "Debug" or "Release" */
(boost::format(_("Version %1$s (%2$s)")) % build_id().c_str() % build_type().c_str()).str(),
UI::Align::kBottomRight),
copyright(this,
0,
- get_h() - 0.5 * buth_,
+ 0,
/** TRANSLATORS: Placeholders are the copyright years */
(boost::format(_("(C) %1%-%2% by the Widelands Development Team")) %
kWidelandsCopyrightStart % kWidelandsCopyrightEnd)
@@ -108,7 +100,7 @@
UI::Align::kBottomLeft),
gpl(this,
0,
- get_h(),
+ 0,
_("Licensed under the GNU General Public License V2.0"),
UI::Align::kBottomLeft) {
playtutorial.sigclicked.connect(
@@ -136,33 +128,46 @@
boost::bind(::end_modal, boost::ref(*this),
FullscreenMenuBase::MenuTarget::kExit));
- vbox.add(, UI::Align::kHCenter);
- vbox.add(, UI::Align::kHCenter);
- vbox.add(, UI::Align::kHCenter);
-
- vbox.add_space(2 * padding_);
-
- vbox.add(, UI::Align::kHCenter);
-
- vbox.add_space(2 * padding_);
-
- vbox.add(, UI::Align::kHCenter);
-
- vbox.add_space(2 * padding_);
-
- vbox.add(, UI::Align::kHCenter);
-
- vbox.add_space(2 * padding_);
-
- vbox.add(, UI::Align::kHCenter);
-
- vbox.add_space(5 * padding_);
-
- vbox.add(, UI::Align::kHCenter);
-
-
