Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/storages_garrisons into lp:widelands
Yep Ill push my code as soons as I have this last bug gone with the editbox. On Mon, Jul 21, 2014 at 6:53 AM, SirVer wrote: > Cool. I am working on getting rid of the old font renderer too in > https://code.launchpad.net/~widelands-dev/widelands/text_area_richtext . > Maybe we can join forces. > > -- > > https://code.launchpad.net/~widelands-dev/widelands/storages_garrisons/+merge/178704 > You proposed lp:~widelands-dev/widelands/storages_garrisons for merging. > -- https://code.launchpad.net/~widelands-dev/widelands/storages_garrisons/+merge/178704 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/storages_garrisons. ___ 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/map-upload into lp:widelands-website
> Any idea why this is not showing a diff? I got this mail form launchpad: > Launchpad encountered an internal error during the following operation: > generating the diff for a merge proposal. It was logged with id > OOPS-3da48092fc23f6e12528857791597bea. Sorry for the inconvenience. Does not really help though. Maybe we get a diff when the next revision is pushed. -- https://code.launchpad.net/~widelands-dev/widelands-website/map-upload/+merge/227458 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-999262_part2 into lp:widelands
OK, all done and ready for merging :) The delay parameters might need some more tweaking, we'll just have to see how it behaves in a real game. Buildings with message delay are hunters, lumberjacks and wells. -- https://code.launchpad.net/~widelands-dev/widelands/bug-999262_part2/+merge/227348 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-999262_part2. ___ 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/map-upload into lp:widelands-website
When Widelands is installed from the daily PPA the executables are also added to PATH so it is not necessary to provide the exact directory. This means it works without changes. -- https://code.launchpad.net/~widelands-dev/widelands-website/map-upload/+merge/227458 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1341081 into lp:widelands
Thanks for the info. I am looking forward to Ninja :D -- https://code.launchpad.net/~widelands-dev/widelands/bug-1341081/+merge/227107 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1341081. ___ 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/fh1 into lp:widelands
This is what i get after merging trunk. I made a test ui you can launch with ./widelands --testui There are still some layout issues I need to fix. -- https://code.launchpad.net/~widelands-dev/widelands/fh1/+merge/177228 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1. ___ 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/string_fix_headquarters into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/string_fix_headquarters into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string_fix_headquarters/+merge/227543
Small string fix
--
https://code.launchpad.net/~widelands-dev/widelands/string_fix_headquarters/+merge/227543
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/string_fix_headquarters into lp:widelands.
=== modified file 'tribes/atlanteans/headquarters/help.lua'
--- tribes/atlanteans/headquarters/help.lua 2014-05-27 14:14:14 +
+++ tribes/atlanteans/headquarters/help.lua 2014-07-21 12:39:15 +
@@ -13,7 +13,7 @@
building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
--General Section
building_help_general_string("atlanteans", building_description, "carrier",
- _"Accomodation for your people. Also stores your wares and tools.",
+ _"Accommodation for your people. Also stores your wares and tools.",
_"The headquarters is your main building." .. "" .. _[[Text needed]]) ..
--Building Section
=== modified file 'tribes/barbarians/headquarters/help.lua'
--- tribes/barbarians/headquarters/help.lua 2014-04-18 10:08:08 +
+++ tribes/barbarians/headquarters/help.lua 2014-07-21 12:39:15 +
@@ -13,7 +13,7 @@
building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
--General Section
building_help_general_string("barbarians", building_description, "carrier",
- _"Accomodation for your people. Also stores your wares and tools.",
+ _"Accommodation for your people. Also stores your wares and tools.",
_"The headquarters is your main building." .. "" .. _[[Text needed]]) ..
--Building Section
=== modified file 'tribes/barbarians/headquarters_interim/help.lua'
--- tribes/barbarians/headquarters_interim/help.lua 2014-04-18 10:08:08 +
+++ tribes/barbarians/headquarters_interim/help.lua 2014-07-21 12:39:15 +
@@ -13,7 +13,7 @@
building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
--General Section
building_help_general_string("barbarians", building_description, "carrier",
- _"Accomodation for your people. Also stores your wares and tools.",
+ _"Accommodation for your people. Also stores your wares and tools.",
_"The headquarters is your main building." .. "" .. _[[Text needed]]) ..
--Building Section
=== modified file 'tribes/empire/headquarters/help.lua'
--- tribes/empire/headquarters/help.lua 2014-05-26 20:36:01 +
+++ tribes/empire/headquarters/help.lua 2014-07-21 12:39:15 +
@@ -13,7 +13,7 @@
building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
--General Section
building_help_general_string("empire", building_description, "carrier",
- _"Accomodation for your people. Also stores your wares and tools.",
+ _"Accommodation for your people. Also stores your wares and tools.",
_"The headquarters is your main building." .. "" .. _[[Text needed]]) ..
--Building Section
=== modified file 'tribes/empire/headquarters_shipwreck/help.lua'
--- tribes/empire/headquarters_shipwreck/help.lua 2014-05-26 20:36:01 +
+++ tribes/empire/headquarters_shipwreck/help.lua 2014-07-21 12:39:15 +
@@ -13,7 +13,7 @@
building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
--General Section
building_help_general_string("empire", building_description, "carrier",
- _"Although this ship ran aground, it still serves as accomodation for your people. It also stores your wares and tools.",
+ _"Although this ship ran aground, it still serves as accommodation for your people. It also stores your wares and tools.",
_"The headquarters shipwreck is your main building." .. "" .. _[[Text needed]]) ..
--Building Section
___
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/map-upload into lp:widelands-website
I don't really know how to deal with the map file being saved twice without putting a lot of effort into it. I think it is not worth to investigate further. From my side this is ready for review and merge. -- https://code.launchpad.net/~widelands-dev/widelands-website/map-upload/+merge/227458 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-website/map-upload into lp:widelands-website
The proposal to merge lp:~widelands-dev/widelands-website/map-upload into lp:widelands-website has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/map-upload/+merge/227458 -- https://code.launchpad.net/~widelands-dev/widelands-website/map-upload/+merge/227458 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/map-upload into lp:widelands-website
Review: Approve Looks good to me. I went ahead and merged. I'll probably tweak a bit while deploying... Thanks for taking care of that Shevonar! -- https://code.launchpad.net/~widelands-dev/widelands-website/map-upload/+merge/227458 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/bug-1322741 into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1322741 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1322741 in widelands: "text issue: fps statistics overlaps with xz
coordinates"
https://bugs.launchpad.net/widelands/+bug/1322741
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1322741/+merge/227626
Debug overlay: Made FPS string smaller and moved coordinate information to
bottom right.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1322741/+merge/227626
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1322741 into lp:widelands.
=== modified file 'src/wui/interactive_base.cc'
--- src/wui/interactive_base.cc 2014-07-16 06:41:27 +
+++ src/wui/interactive_base.cc 2014-07-21 19:59:45 +
@@ -401,12 +401,12 @@
===
*/
void Interactive_Base::draw_overlay(RenderTarget& dst) {
- // Blit node information when in debug mode.
- if (get_display_flag(dfDebug) or not dynamic_cast(&egbase())) {
- static format node_format("%3i %3i");
+ // Blit node information when in debug mode or if the chat window is on.
+ if (get_display_flag(dfDebug) || !dynamic_cast(&egbase())) {
+ static format node_format("(%i, %i)");
const std::string node_text = as_uifont
- ((node_format % m_sel.pos.node.x % m_sel.pos.node.y).str(), UI_FONT_SIZE_BIG);
- dst.blit(Point(5, 5), UI::g_fh1->render(node_text), CM_Normal, UI::Align_Left);
+ ((node_format % m_sel.pos.node.x % m_sel.pos.node.y).str(), UI_FONT_SIZE_SMALL);
+ dst.blit(Point(get_w() - 5, get_h() - 5), UI::g_fh1->render(node_text), CM_Normal, UI::Align_BottomRight);
}
// Blit FPS when in debug mode.
@@ -415,8 +415,8 @@
const std::string fps_text = as_uifont
((fps_format %
(1000.0 / m_frametime) % (1000.0 / (m_avg_usframetime / 1000)))
- .str(), UI_FONT_SIZE_BIG);
- dst.blit(Point(90, 5), UI::g_fh1->render(fps_text), CM_Normal, UI::Align_Left);
+ .str(), UI_FONT_SIZE_SMALL);
+ dst.blit(Point(5, 5), UI::g_fh1->render(fps_text), CM_Normal, UI::Align_Left);
}
}
___
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/fh1 into lp:widelands
Concerning the widgets, there are 2 minor issues left : Consecutive line breaks and RTL auto-wrapping. Other than that, all use new font renderer and (multiline) editboxes work great. Sirver, I will try to check the changes in your branch. -- https://code.launchpad.net/~widelands-dev/widelands/fh1/+merge/177228 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1. ___ 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-1322741 into lp:widelands
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/bug-1322741/+merge/227626 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1322741. ___ 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-1322741 into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1322741 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1322741/+merge/227626 -- https://code.launchpad.net/~widelands-dev/widelands/bug-1322741/+merge/227626 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1322741. ___ 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-999262_part2 into lp:widelands
Review: Needs Fixing I changed a couple of nits: - I moved the documentation of your new methods to the header (documentation in .cc files makes less sense. I know that we did that in the past, but for the future, documentation goes into the header). - Added a disallow_copy_and_assign() to Productionsite. - One more refactoring suggestion. -- https://code.launchpad.net/~widelands-dev/widelands/bug-999262_part2/+merge/227348 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-999262_part2. ___ 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/string_fix_headquarters into lp:widelands
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/string_fix_headquarters/+merge/227543 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string_fix_headquarters. ___ 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/string_fix_headquarters into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string_fix_headquarters into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string_fix_headquarters/+merge/227543 -- https://code.launchpad.net/~widelands-dev/widelands/string_fix_headquarters/+merge/227543 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string_fix_headquarters. ___ 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/fh1 into lp:widelands
That's a lot of code. I need to make a chunk of time to review this. My branch is about removing the legacy richtext renderer and using the new one everywhere (i.e. especially in scenario texts). -- https://code.launchpad.net/~widelands-dev/widelands/fh1/+merge/177228 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1. ___ 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
