The proposal to merge lp:~widelands-dev/widelands/bugfix-empire-campaign into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074
--
Your team Widelands Develop
Continuous integration builds have changed state:
Travis build 3120. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/335693023.
Appveyor build 2927. State: success. Details:
Thanks a lot for testing while I am somewhat short in time. Fixing the thing in
another branch is a good idea as it will give me more time and I have to do
some reviews in transifex too.
--
https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074
Your team
I'll merge the other branch first then, then take care of this branch.
You can then do your additional fixing in a new branch, since this one is
already tested, and it's a new problem.
--
https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074
Your team
No I Just copied the relevant changes from your branch ;-) as I did not know
how to do it myself with the new renderer. After that I included the textual
improvements for Mission 3.
I started playtesting Mission 4 yesterday evening and the message boxes looked
fine. Unfortunately the
I have finished testing scenario 4, so this can go in once we decide on how to
handle the merge.
--
https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bugfix-empire-campaign.
Did you base this branch off my branch? The holy_shrine function looks familiar.
--
https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bugfix-empire-campaign.
We could do so. But I had a look on the diffs of your branch against trunk. As
there are only changes in texts.lua they will be overwritten anyhow by my
branch. So it is your decision whether to merge your branch first or to skip it.
--
Maybe we should merge my branch first, to make sure that we won't miss any of
the textual changes? I'll get it ready.
--
https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074
Your team Widelands Developers is subscribed to branch
So I'll leave the text as it is. Will try to test scenario 4 this evening.
Sorry but I couldn't spare any time over the weekend yet.
@GunChleoc there were some C# code changes in your original branch for
introducing the new font renderer to empire 3 which are not part of this
branch. So either
I have tested Scenario 3, all OK.
--
https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bugfix-empire-campaign.
___
Mailing list:
I completely misunderstood his comment, I thought he meant the repetition of
"we".
"sparingly" is wrong grammar. You can change it to "frugal" if you want.
--
https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074
Your team Widelands Developers is subscribed to
rev8563 had been tested by me. Will do another quick test on sunday.
Kaputtnik's comment #1 could be implemented anyhow as translation is already
broken due to the fixes to be in line with the other scenarios of the empire
campaign.
Just give me a short comment whether to do so and if sparingly
The proposal to merge lp:~widelands-dev/widelands/bugfix-empire-campaign into
lp:widelands has been updated.
Commit Message changed to:
Textual and map fixes for empire Missions 3 and 4, with conversion to new font
renderer.
For more details, see:
https://code.launchpad.net/~widelands-dev
Review: Approve
Can go in as it is when it has been tested.
Diff comments:
>
> === modified file 'data/campaigns/emp03.wmf/scripting/texts.lua'
> --- data/campaigns/emp03.wmf/scripting/texts.lua 2017-06-25 07:08:38
> +
> +++ data/campaigns/emp03.wmf/scripting/texts.lua
The second comment about the post_spaces is superfluous, just messed up line
inserts and remove with code. Sorry ...
--
https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074
Your team Widelands Developers is subscribed to branch
.. we should be sparing? would be correct English but careful does fit
better.
On 26/01/18 10:16, kaputtnik wrote:
.. we should be very sparingly?
___
Mailing list: https://launchpad.net/~widelands-dev
Post to :
.. we should be sparing? would be correct English but careful does fit
better.
On 26/01/18 10:16, kaputtnik wrote:
.. we should be very sparingly?
--
___
Mailing list: https://launchpad.net/~widelands-dev
Post to :
Review: Approve
Beside two small nits looks good to me :-)
Not tested.
Diff comments:
>
> === modified file 'data/campaigns/emp03.wmf/scripting/texts.lua'
> --- data/campaigns/emp03.wmf/scripting/texts.lua 2017-06-25 07:08:38
> +
> +++ data/campaigns/emp03.wmf/scripting/texts.lua
/_widelands_dev_widelands_bugfix_empire_campaign-2898.
--
https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bugfix-empire-campaign into lp:widelands
/_widelands_dev_widelands_bugfix_empire_campaign-2873.
--
https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bugfix-empire-campaign into lp:widelands
/_widelands_dev_widelands_bugfix_empire_campaign-2862.
--
https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bugfix-empire-campaign into lp:widelands
merge of
lp:~widelands-dev/widelands/bugfix-empire-campaign 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
delands/+bug/1742534
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074
textual and map fixes for empire Missions 3 and 4
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bugfix-emp
24 matches
Mail list logo
