The proposal to merge
lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine/+merge/
* Source Package: widelands
* Version: 1:19-ppa0-bzr8859-201809290603~ubuntu14.04.1
* Architecture: i386
* Archive: ~widelands-dev/ubuntu/widelands-daily
* Component: main
* State: Failed to build
* Duration: 4 minutes
* Build Log:
https://launchpad.net/~widelands-dev/+archive/ubuntu/wid
* Source Package: widelands
* Version: 1:19-ppa0-bzr8859-201809290603~ubuntu14.04.1
* Architecture: amd64
* Archive: ~widelands-dev/ubuntu/widelands-daily
* Component: main
* State: Failed to build
* Duration: 4 minutes
* Build Log:
https://launchpad.net/~widelands-dev/+archive/ubuntu/wi
Gun/Benedikt we are actually at feature freeze and this _is_ a new feature.
I have no idea about the risks involved and the testing needed for this.
So I propose defering this to R21. What do you think?
--
https://code.launchpad.net/~widelands-dev/widelands/per-level-soldier-anims/+merge/354929
Y
Some nits for the strings + variable names
Diff comments:
>
> === modified file 'data/campaigns/fri01.wmf/scripting/texts.lua'
> --- data/campaigns/fri01.wmf/scripting/texts.lua 2018-07-24 11:09:41
> +
> +++ data/campaigns/fri01.wmf/scripting/texts.lua 2018-09-28 14:41:56
> +
Bug filed: https://bugs.launchpad.net/widelands/+bug/1795112
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine/+merge/354747
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-co
We need to defer opening this up for all tribes, because that needs further
changes in the game setup logic.
Thanks for testing!
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine/+merge/354747
Your team Widelands Developers is s
The proposal to merge lp:~widelands-dev/widelands/frisian_balancing_2 into
lp:widelands has been updated.
Commit message changed to:
Some balancing fixes:
- Fixed the bug that barbarian trading outposts and fortified villages start
with zero master-miners instead of 4 (like the headquarter doe
Review: Approve
Thanks - let's have it!
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/frisian_balancing_2/+merge/355358
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/frisian_balancing_2.
_
Review: Approve compile, review, testplay (osx, win10, linux)
Played this with kapputnik yesterday for about an hour or such.
We both finally got the Idea about the Map and how smuggling works :-)
We had no desnycs whatsover so this can go in.
Gun: Do you want to open Smugglers for all tribes in
Continuous integration builds have changed state:
Travis build 4068. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/434676212.
Appveyor build 3864. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fri_01_02_
Continuous integration builds have changed state:
Travis build 4067. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/434562141.
Appveyor build 3863. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_179492
Played this on OSX/localhost only, stating on the last save, no Issues.
Gun: perhpas we need som real world unreliable network to do more test?
I will try to come online this weekend perhpas we can do some smuggling?
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1751440-smugglers-de
The proposal to merge lp:~widelands-dev/widelands/bug-1759857-territorial-lord
into lp:widelands has been updated.
Commit message changed to:
Pulled out common code for Territorial Lord and Territorial Time. Ensure that
check_player_defeated is called before points are calculated. New function
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1759857-territorial-lord into lp:widelands.
Commit message:
Pulled out common code for Territorial Lord and Territorial Time. Ensure that
check_player_defeated is called before points are calculated.
Requested reviews:
Widelands D
Benedikt Straub has proposed merging
lp:~widelands-dev/widelands/fri-01-02-improvements into lp:widelands.
Commit message:
Various improvements to both frisian scenarios
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1792478 in widelands: "Frisians 2: No victory d
Review: Approve
Ok, currently at least on travis (MacOS and Linux) and on Travis (Windows)
CMake + DetectRevision.py can determine the git version.
On my local machine (windows) both git and bzr work.
So this can go in from my side.
--
https://code.launchpad.net/~widelands-dev/widelands/detect_
OK after cleaning my confusion about the two builds I will try a 2xWIN/ 2xOSX
Smugglers game.
... some hours later ...
Did so and it was quite ok until I ran into #1794965 I think this is unrelated.
But I may not be
able to continue testing. I will try other variants, later
--
https://code.lau
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1794924-logger-assert into lp:widelands.
Commit message:
Use std::cout for logging when calling terminate on shutdown, because the
logger might not exist any more.
Requested reviews:
Widelands Developers (widelands-dev)
Related bu
Ok will do this tonight.
--
https://code.launchpad.net/~widelands-dev/widelands/frisian_balancing_2/+merge/355358
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/frisian_balancing_2 into lp:widelands.
___
20 matches
Mail list logo
