Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug_1736095_improve_text_for_resources_height into lp:widelands

2017-12-19 Thread GunChleoc
@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug_1736095_improve_text_for_resources_height/+merge/335130
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug_1736095_improve_text_for_resources_height.

___
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/fh1-editorhelp into lp:widelands

2017-12-19 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/fh1-editorhelp into 
lp:widelands has been updated.

Commit Message changed to:

Started converting the in-game help to the new font renderer

- The encyclopedia can now handle both font renderers
- The new font renderer will now return empty rendered text for newline nodes 
rather than crashing
- Converted all editor help to new font renderer
- Converted "General" tab of the Tribal Encyclopedia to new font renderer
- Converted multiplayer help and "About" screens

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fh1-editorhelp/+merge/335283
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/fh1-editorhelp 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/fh1-editorhelp into lp:widelands

2017-12-19 Thread GunChleoc
Review: Resubmit

The "About Widelands" screens should be fixed now, and I have also converted 
the help in the multiplayer setup screen.

@Notablis: In the old font renderer,  tags could be stacked. In the new 
renderer, only 1 of them is allowed, wrapping the whole lot. I also didn't 
adjust the indentation level in order to make the diff smaller.
-- 
https://code.launchpad.net/~widelands-dev/widelands/fh1-editorhelp/+merge/335283
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/fh1-editorhelp.

___
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-1738641_set_resource into lp:widelands

2017-12-19 Thread GunChleoc
Review: Approve

Yep, that fixes it :)

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1738641_set_resource/+merge/335343
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1738641_set_resource.

___
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-1738641_set_resource into lp:widelands

2017-12-19 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1738641_set_resource into 
lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1738641_set_resource/+merge/335343
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1738641_set_resource.

___
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/Mission4 into lp:widelands

2017-12-19 Thread bunnybot
Continuous integration builds have changed state:

Travis build 2991. State: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/318310473.
Appveyor build 2800. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_Mission4-2800.
-- 
https://code.launchpad.net/~widelands-dev/widelands/Mission4/+merge/334279
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/Mission4.

___
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-1738641_set_resource into lp:widelands

2017-12-19 Thread kaputtnik
Nice, thanks :-)
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1738641_set_resource/+merge/335343
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1738641_set_resource.

___
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-editorhelp into lp:widelands

2017-12-19 Thread kaputtnik
The 'About Widelands' screen take 3 seconds to load here (debug build, german). 
That is very annoying.

All other things lgtm. Tested also the Multiplayer help.

-- 
https://code.launchpad.net/~widelands-dev/widelands/fh1-editorhelp/+merge/335283
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/fh1-editorhelp.

___
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-scenario-groundwork-emp1 into lp:widelands

2017-12-19 Thread kaputtnik
I guessed the issue i found also in current trunk will be fixed when converting 
to the new font renderer, but when opening the first tutorial with this branch 
i get the same messages in terminal for each message box:

Story Message Box: falling back to OLD font renderer:
[..]
Syntax error at 1:20: expected an allowed attribute, got 'font-size'. String 
continues with: '=18 font-weight=bold font-color=D1D1D1>Welcome to 
Widelands! First, I’ll left-click on the symbol where I 
want the lumberjack’s hut to be bui'

There is also one with 'image'

Is this a new bug?
-- 
https://code.launchpad.net/~widelands-dev/widelands/fh1-scenario-groundwork-emp1/+merge/335294
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/fh1-scenario-groundwork-emp1 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-1687100-reveal_fields into lp:widelands

2017-12-19 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1687100-reveal_fields 
into lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1687100-reveal_fields/+merge/323721
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1687100-reveal_fields.

___
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/reveal_hide_animations into lp:widelands

2017-12-19 Thread GunChleoc
I just had a merge conflict while merging trunk. @kaputtnik, could you please 
check if the documentation for lua_map is still OK and then merge?
-- 
https://code.launchpad.net/~widelands-dev/widelands/reveal_hide_animations/+merge/327062
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1687100-reveal_fields.

___
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/Mission4 into lp:widelands

2017-12-19 Thread GunChleoc
We need to remove concentric_reveal from the helper functions once the 
following merge request hits trunk:

https://code.launchpad.net/~widelands-dev/widelands/reveal_hide_animations/+merge/327062

-- 
https://code.launchpad.net/~widelands-dev/widelands/Mission4/+merge/334279
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/Mission4.

___
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-scenario-groundwork-emp1 into lp:widelands

2017-12-19 Thread GunChleoc
Actually, that should not happen with the first tutorial - looks like I missed 
something while converting the scenario.

For all other scenarios, that message is expected.
-- 
https://code.launchpad.net/~widelands-dev/widelands/fh1-scenario-groundwork-emp1/+merge/335294
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/fh1-scenario-groundwork-emp1 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/fh1-editorhelp into lp:widelands

2017-12-19 Thread GunChleoc
Yes, I also noticed that things are slower now. We can decide to live with it 
for now or wait with the whole project until February, because I'm on a plane 
tomorrow...
-- 
https://code.launchpad.net/~widelands-dev/widelands/fh1-editorhelp/+merge/335283
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/fh1-editorhelp.

___
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/reveal_hide_animations into lp:widelands

2017-12-19 Thread kaputtnik
Looks good :-)

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/reveal_hide_animations/+merge/327062
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1687100-reveal_fields.

___
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_1736095_improve_text_for_resources_height into lp:widelands

2017-12-19 Thread noreply
The proposal to merge 
lp:~widelands-dev/widelands/bug_1736095_improve_text_for_resources_height into 
lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug_1736095_improve_text_for_resources_height/+merge/335130
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug_1736095_improve_text_for_resources_height.

___
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-editorhelp into lp:widelands

2017-12-19 Thread GunChleoc
I just changed the markup, which is speeding things up a bit. Still not perfect 
though - those author lists are long.
-- 
https://code.launchpad.net/~widelands-dev/widelands/fh1-editorhelp/+merge/335283
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/fh1-editorhelp.

___
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-editorhelp into lp:widelands

2017-12-19 Thread kaputtnik
I didn't get the terminal messages when playing the first empire campaign "The 
Strand of Malacmore" :-)
-- 
https://code.launchpad.net/~widelands-dev/widelands/fh1-editorhelp/+merge/335283
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/fh1-editorhelp.

___
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-bug-1735980-related-problems into lp:widelands

2017-12-19 Thread Jukka Pakarinen
Jukka Pakarinen has proposed merging 
lp:~widelands-dev/widelands/fix-bug-1735980-related-problems into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1735980 in widelands: "use-after-free in editor"
  https://bugs.launchpad.net/widelands/+bug/1735980

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fix-bug-1735980-related-problems/+merge/335403

The branch includes bug fixes described on bug 1735980.

The original problem of the bug 1735980 was heap-use-after-free found when the 
game was run with asan library and undo was applied to water with fish. The 
other problem concerned an applied immovable (ruin) moved to an unexpected 
posion on the map when the origin if the map was set.

The commit messages explain shortly why it fixes the bug.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/fix-bug-1735980-related-problems into lp:widelands.
=== modified file 'src/editor/tools/set_origin_tool.cc'
--- src/editor/tools/set_origin_tool.cc	2017-08-17 15:34:45 +
+++ src/editor/tools/set_origin_tool.cc	2017-12-19 18:24:38 +
@@ -41,7 +41,14 @@
   EditorActionArgs* /* args */,
   Widelands::Map* map) {
 	Widelands::Coords nc(
-	   map->get_width() - 1 - center.node.x, map->get_height() - 1 - center.node.y);
+	   map->get_width() - center.node.x, map->get_height() - center.node.y);
+
+	// Because of the triangle design of map, y is changed by an odd number.
+	// The x must be syncronized with the y when coordinate pair is applied
+	// and also when undoing an action like here.
+	if ((nc.y % 2) != 0)
+		nc.x = nc.x - 1;
+	map->normalize_coords(nc);
 	map->set_origin(nc);
 	eia.map_changed(EditorInteractive::MapWas::kGloballyMutated);
 	eia.map_view()->scroll_to_field(Widelands::Coords(0, 0), MapView::Transition::Jump);

=== modified file 'src/logic/map.cc'
--- src/logic/map.cc	2017-12-18 10:42:40 +
+++ src/logic/map.cc	2017-12-19 18:24:38 +
@@ -359,7 +359,8 @@
 		}
 	}
 	// Now that we restructured the fields, we just overwrite the old order
-	fields_.reset(new_field_order.release());
+	for (decltype(width_) ind = 0; ind < width_*height_; ind++)
+		fields_[ind] = new_field_order[ind];
 
 	//  Inform immovables and bobs about their new coordinates.
 	for (FCoords c(Coords(0, 0), fields_.get()); c.y < height_; ++c.y)

___
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/fh1-scenario-groundwork-emp1 into lp:widelands

2017-12-19 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/fh1-scenario-groundwork-emp1 
into lp:widelands has been updated.

Commit Message changed to:

Started converting scenarios to new font renderer

- Story Message Box and Objectives now try to use the new font renderer before 
falling back to the old one.
- Added version of scenario formatting for the new renderer.
- Converted Empire Scenario 1 to new font renderer
- Atlantean campaign now uses the campaign_message_box function.

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fh1-scenario-groundwork-emp1/+merge/335294
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/fh1-scenario-groundwork-emp1 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/fh1-scenario-groundwork-emp1 into lp:widelands

2017-12-19 Thread GunChleoc
Seems like my changes for Tutorial1 didn't land in the branch, so they're lost 
now. Will have to redo those in another branch.

Is the empire scenario clean?
-- 
https://code.launchpad.net/~widelands-dev/widelands/fh1-scenario-groundwork-emp1/+merge/335294
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/fh1-scenario-groundwork-emp1 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/fh1-editorhelp into lp:widelands

2017-12-19 Thread GunChleoc
Wrong merge request, I have answered over there though.
-- 
https://code.launchpad.net/~widelands-dev/widelands/fh1-editorhelp/+merge/335283
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/fh1-editorhelp.

___
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-scenario-groundwork-emp1 into lp:widelands

2017-12-19 Thread kaputtnik
The text in the first message does not use the available width below the image. 
The text appears all on the right side. In trunk the text uses the whole width 
of the message box below the image if the text block is taller than the height 
of the image.

All other looks good, imho.

Sorry for posting in the wrong merge request :-S
-- 
https://code.launchpad.net/~widelands-dev/widelands/fh1-scenario-groundwork-emp1/+merge/335294
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/fh1-scenario-groundwork-emp1 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/Mission4 into lp:widelands

2017-12-19 Thread hessenfarmer
ok I will check for the CI build after the two related branches have been 
merged and afterwards I will do the fixes in this branch to be compatible. till 
then we shall postpone merging. Is there anything else that needs to be 
addressed?
Would love to have you doing a quick check of the newly added message as my 
english hasn't the best grammar and spelling
-- 
https://code.launchpad.net/~widelands-dev/widelands/Mission4/+merge/334279
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/Mission4.

___
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-bug-1735980-related-problems into lp:widelands

2017-12-19 Thread kaputtnik
Review: Approve testing

Very nice :-)

I have tested this and it looks good :-)

Please set a commit message for this branch, click on "Set commit message" 
above. Doing so we could use SirVer's bunnybot for merging.
-- 
https://code.launchpad.net/~widelands-dev/widelands/fix-bug-1735980-related-problems/+merge/335403
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/fix-bug-1735980-related-problems.

___
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-editorhelp into lp:widelands

2017-12-19 Thread Notabilis
Code looks good to me. Three small comments are in the diff, feel free to 
ignore them.

The speed problem is not so great. Is this a general problem of the new 
renderer? Do you have an idea why it is so much slower?
On a side note: I don't like the "speed-hack" in revision 8540, but when it 
helps...

As far as I am concerned, this can be merged. But the speed problem should be 
looked into at some point.

Diff comments:

> 
> === modified file 'data/scripting/richtext.lua'
> --- data/scripting/richtext.lua   2017-07-03 10:16:59 +
> +++ data/scripting/richtext.lua   2017-12-19 18:07:21 +
> @@ -327,21 +327,24 @@
>  end
>  
>  -- RST
> --- .. function li_image(imagepath, text)
> +-- .. function li_image(imagepath, text[, vsp])
>  --
>  --Places a paragraph of text to the right of an image
>  
>  --:arg imagepath: the full path to the image file
>  --:arg text_width_percent: the percentatge of space that the text will 
> occupy

This parameter does not seem to exists any more.

>  --:arg text: the text to be placed next to the image
> +--:arg vsp: Vertical spacing. Default is 6.
>  --
> ---:returns: the text wrapped in a paragraph and placed next to the 
> image, The outer tag is a div.
> -function li_image(imagepath, text_width_percent, text)
> -   return p("") .. div("width=100%", "") ..
> - div(p(img(imagepath))) ..
> +--:returns: the text wrapped in a paragraph and placed next to the 
> image, the outer tag is a div.
> +function li_image(imagepath, text, vsp)
> +   if vsp == nil then vsp = 6 end
> +   return
> +  div("width=100%",
> + div(p(vspace(vsp) .. img(imagepath) .. space(6))) ..
>   div(p(space(6))) ..
> - div("width="..text_width_percent.."%", p(text)) ..
> - div("width=100%", "")
> + div("width=*", p(vspace(vsp) .. text .. vspace(2 * vsp)))
> +  )
>  end
>  
>  -- RST
> 
> === modified file 'data/txts/AUTHORS.lua'
> --- data/txts/AUTHORS.lua 2016-03-14 11:37:49 +
> +++ data/txts/AUTHORS.lua 2017-12-19 18:07:21 +
> @@ -26,7 +26,7 @@
>  return {
> title = _"Developers",
> text = rt(
> -  title(_"Widelands Development Team") ..
> +  p_font("align=center", "size=28 color=2F9131", _"Widelands Development 
> Team") ..

Why no h1() or so for this? Also below.

>list_authors()
> )
>  }
> 
> === modified file 'src/ui_basic/fileview_panel.cc'
> --- src/ui_basic/fileview_panel.cc2017-08-08 17:39:40 +
> +++ src/ui_basic/fileview_panel.cc2017-12-19 18:07:21 +
> @@ -51,8 +51,18 @@
>  std::unique_ptr(new UI::Box(this, 0, 0, UI::Box::Vertical, 
> 0, 0, padding_)));
>   size_t index = boxes_.size() - 1;
>  
> - textviews_.push_back(std::unique_ptr(
> -new UI::MultilineTextarea(boxes_.at(index).get(), 0, 0, 
> Scrollbar::kSize, 0, content)));
> + UI::MultilineTextarea* textarea =
> +new UI::MultilineTextarea(boxes_.at(index).get(), 0, 0, 
> Scrollbar::kSize, 0);
> + try {
> + textarea->force_new_renderer();
> + textarea->set_text(content);
> + } catch (const std::exception& e) {
> + log("Fileview: falling back to OLD font renderer: %s\n", 
> e.what());
> + textarea->force_new_renderer(false);
> + textarea->set_text(content);
> + }
> +
> + 
> textviews_.push_back(std::unique_ptr(std::move(textarea)));

Is there a reason you are using std::move() here instead of just passing the 
pointer to the constructor?

>   add((boost::format("about_%lu") % index).str(), title, 
> boxes_.at(index).get(), "");
>  
>   assert(boxes_.size() == textviews_.size());


-- 
https://code.launchpad.net/~widelands-dev/widelands/fh1-editorhelp/+merge/335283
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/fh1-editorhelp.

___
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/reveal_hide_animations into lp:widelands

2017-12-19 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/reveal_hide_animations into 
lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/reveal_hide_animations/+merge/327062
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1687100-reveal_fields.

___
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-bug-1735980-related-problems into lp:widelands

2017-12-19 Thread bunnybot
Continuous integration builds have changed state:

Travis build 3001. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/318783825.
Appveyor build 2810. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_bug_1735980_related_problems-2810.
-- 
https://code.launchpad.net/~widelands-dev/widelands/fix-bug-1735980-related-problems/+merge/335403
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/fix-bug-1735980-related-problems.

___
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/fh1-editorhelp into lp:widelands

2017-12-19 Thread bunnybot
Continuous integration builds have changed state:

Travis build 3002. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/318785800.
Appveyor build 2811. State: failed. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fh1_editorhelp-2811.
-- 
https://code.launchpad.net/~widelands-dev/widelands/fh1-editorhelp/+merge/335283
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/fh1-editorhelp.

___
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