Review: Approve compile / test
OK, tested this again, works as intended.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1826669-mp-map-b20/+merge/366619
Your team Widelands Developers is subscribed to branch lp:widelands/build20.
_
Implemented some of your diff comments and replied to the others
Diff comments:
>
> === modified file 'src/logic/widelands_geometry.h'
> --- src/logic/widelands_geometry.h2019-03-11 14:45:04 +
> +++ src/logic/widelands_geometry.h2019-04-28 16:58:57 +
> @@ -157,6 +156,25 @@
> };
Benedikt Straub has proposed merging
lp:~widelands-dev/widelands/expedition_portspace_indicator into lp:widelands.
Commit message:
Show a port icon on the field where an expedition ship can build a port
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1826655 in wid
Continuous integration builds have changed state:
Travis build 4832. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/525833878.
Appveyor build 4613. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_per_level
Continuous integration builds have changed state:
Travis build 4834. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/525875233.
Appveyor build 4615. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_overlappin
Some replies
Diff comments:
>
> === modified file 'src/wui/fieldaction.cc'
> --- src/wui/fieldaction.cc2019-02-23 11:00:49 +
> +++ src/wui/fieldaction.cc2019-04-28 16:58:57 +
> @@ -683,17 +695,99 @@
>
> void FieldActionWindow::building_icon_mouse_out(Widelands::DescriptionInde
Excellent, thanks for testing!
I'll port the fix to trunk.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1826669-mp-map-b20/+merge/366619
Your team Widelands Developers is subscribed to branch lp:widelands/build20.
___
Mailing list: https:
Ah, I misunderstood the point about fieldaction.cc. Implemented your comments.
--
https://code.launchpad.net/~widelands-dev/widelands/overlapping_workareas/+merge/366623
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/overlapping_workareas i
Continuous integration builds have changed state:
Travis build 4835. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/525916562.
Appveyor build 4616. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_expedition
Continuous integration builds have changed state:
Travis build 4836. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/526029169.
Appveyor build 4617. State: failed. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4617
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
The proposal to merge lp:~widelands-dev/widelands/bug-1826669-mp-map-b20 into
lp:widelands/build20 has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1826669-mp-map-b20/+merge/366619
--
Your team Widelands Develope
Continuous integration builds have changed state:
Travis build 4840. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/526107870.
Appveyor build 4621. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_overlappin
13 matches
Mail list logo
