The proposal to merge lp:~widelands-dev/widelands/bridges into lp:widelands has
been updated.
Status: Needs review => Work in progress
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bridges/+merge/364318
--
Your team Widelands Developers is subscribed to branch
Continuous integration builds have changed state:
Travis build 5186. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/544760083.
Appveyor build 4966. State: failed. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bridges-496
Continuous integration builds have changed state:
Travis build 5063. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/537402794.
Appveyor build 4843. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bridges-48
Yep, let's wait for the ferry branch and do a final round of code review and
testing in this branch when that's done.
--
https://code.launchpad.net/~widelands-dev/widelands/bridges/+merge/364318
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/ferry.
__
I already reworked that whole stuff in a different way for the ferries. The
TODO I think you´re referring to is also solved there already. I prefer my
solution because it gets rid of this bitwise hacking, and there´s no need to
invent the wheel twice…
--
https://code.launchpad.net/~widelands-de
Mhhh, We could iprove the RoadType via 4 bitflags and some inline fucntions:
1000
^ Road
^ Bridge
^ Waterway
^ Busy
kRoad = 1
kNormalRoad = 1
kBusyRoad = 9
kBridge = 2
kBridgeNormal = 2
kBridgeBusy = 10
kWaterway = 4
kNormalWaterway = 4
kBusyWa
The ferry branch needs to be merged first because this one is stacked on it.
--
https://code.launchpad.net/~widelands-dev/widelands/bridges/+merge/364318
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/ferry.
___
Mail
Now, can ths be merged or do we want another review?
--
https://code.launchpad.net/~widelands-dev/widelands/bridges/+merge/364318
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/ferry.
___
Mailing list: https://launch
Continuous integration builds have changed state:
Travis build 4841. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/526398829.
Appveyor build 4622. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bridges-46
Continuous integration builds have changed state:
Travis build 4838. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/526055823.
Appveyor build 4619. State: failed. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bridges-461
Maybe i should test the ferrys in the appropriate branch... can't get them to
work...
Regarding the bridges i think having a bridge for normal roads which looks more
like a wooden footbridge would be nicer.
Lifting the workers when walking over the bridge is really nice :)
--
https://code.laun
Continuous integration builds have changed state:
Travis build 4668. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/515650670.
Appveyor build 4454. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bridges-44
Thanks for reporting, I pushed a fix for the bug. It was a small error in the
loading code; the savegame can now be loaded.
--
https://code.launchpad.net/~widelands-dev/widelands/bridges/+merge/364318
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/ferry.
Forget: To reproduce
1. load 'test_ferries.wgf'
2. Build a waterway from flag 30,28 to node 31,27
3. Save the game
4. Try to load the previous saved game
--
https://code.launchpad.net/~widelands-dev/widelands/bridges/+merge/364318
Your team Widelands Developers is subscribed to branch
lp:~widel
Review: Needs Fixing
I get an error when trying to load this savegame:
https://bugs.launchpad.net/widelands/+bug/734193/+attachment/5252593/+files/test_ferries_1.wgf
This savegame was made close before the other one. The difference is this
savegame has no waterway yet. The other savegame has a w
Continuous integration builds have changed state:
Travis build 4652. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/511593017.
Appveyor build 4439. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bridges-4
Continuous integration builds have changed state:
Travis build 4651. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/511385042.
Appveyor build 4438. State: failed. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bridges-443
Continuous integration builds have changed state:
Travis build 4626. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/510312899.
Appveyor build 4413. State: failed. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bridges-441
Review: Approve
Done a bit of testing ad it looks fine.
There is 2 small z-layering glitch for bridges going north-south: Workers
walking on roads behind them to their upper flag are blitted after the bridge
is, so they appear to be on top of it. It's not a biggie though and shouldn't
block th
Fixed the assert. Thanks for taking care of the warnings :)
--
https://code.launchpad.net/~widelands-dev/widelands/bridges/+merge/364318
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bridges into lp:widelands.
I have fixed 2 compiler warnings. You need to use the PRIuS macro for logging
size_t, because the exact data type depends on the operating system. Also,
uint8_t will be interpreted as a character code point rather than a number, so
it needs an annoying explicit cast to every time you want to
p
Continuous integration builds have changed state:
Travis build 4615. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/508306031.
Appveyor build 4402. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bridges-44
you need to merge trunk to make appveyor happy and working
--
https://code.launchpad.net/~widelands-dev/widelands/bridges/+merge/364318
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bridges into lp:widelands.
_
Continuous integration builds have changed state:
Travis build 4609. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/508054226.
Appveyor build 4396. State: failed. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bridges-439
Diff comments:
> === modified file 'src/economy/roadbase.cc'
> --- src/economy/roadbase.cc 2019-03-12 12:11:23 +
> +++ src/economy/roadbase.cc 2019-03-12 12:11:50 +
> @@ -69,6 +71,68 @@
> return *flags_[FlagStart];
> }
>
> +// This returns true if and only if this is a road
Replied to diff comments
Diff comments:
> === modified file 'src/economy/roadbase.cc'
> --- src/economy/roadbase.cc 2019-03-12 12:11:23 +
> +++ src/economy/roadbase.cc 2019-03-12 12:11:50 +
> @@ -69,6 +71,68 @@
> return *flags_[FlagStart];
> }
>
> +// This returns true if and
Some code review comments
Diff comments:
> === modified file 'src/economy/roadbase.cc'
> --- src/economy/roadbase.cc 2019-03-12 12:11:23 +
> +++ src/economy/roadbase.cc 2019-03-12 12:11:50 +
> @@ -69,6 +71,68 @@
> return *flags_[FlagStart];
> }
>
> +// This returns true if an
Benedikt Straub has proposed merging lp:~widelands-dev/widelands/bridges into
lp:widelands with lp:~widelands-dev/widelands/ferry as a prerequisite.
Commit message:
Roads where both adjacent triangles are unwalkable are displayed as bridges
Requested reviews:
Widelands Developers (widelands-de
28 matches
Mail list logo
