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 bra
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:
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:
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…
--
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
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.
___
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:
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:
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:
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 :)
--
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:
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
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
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:
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:
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:
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
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
erge of
lp:~widelands-dev/widelands/bridges 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
-4402.
--
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.
___
Mailing list: https://launchpad.net
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
-4396.
--
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.
___
Mailing list: https://launchpad.net
dir)) {
> + type += RoadType::kBridgeNormal -
> RoadType::kNormal;
> + }
> + egbase.set_road(curf, dir, type);
> + }
>
> map.get_neighb
nds::RoadType::kBridgeNormal ||
> f->road_se == Widelands::RoadType::kBridgeBusy) {
> + dst->blit_animation(f->rendertarget_pixel,
> scale, f->owner->tribe().bridge_animation(
> + Widelands::WALK_
::RoadType::kBridgeNormal ||
> f->road_se == Widelands::RoadType::kBridgeBusy) {
> + dst->blit_animation(f->rendertarget_pixel,
> scale, f->owner->tribe().bridge_animation(
> + Widela
sible when bobs walk over the
bridge.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bridges into lp:widelands.
=== modified file 'data/tribes/atlanteans.lua'
--- data/tribes/atlanteans.lua 2019-03-12 12:00:25 +
+++ data/tribes/atla
28 matches
Mail list logo
