@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.
___
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 render
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
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.
_
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 i
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-2
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://launch
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 bra
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
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
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:~
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 D
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 Develop
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
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:
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/
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-editorh
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.
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
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
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 request
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 l
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 post
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 add
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-p
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
help
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 su
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_17
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_editorh
29 matches
Mail list logo