I added some more comments for a follow-up branch.
Diff comments:
>
> === modified file 'src/logic/map_objects/tribes/market.cc'
> --- src/logic/map_objects/tribes/market.cc2017-09-18 13:43:08 +
> +++ src/logic/map_objects/tribes/market.cc2017-09-23 15:17:19 +
> @@ -38,10 +46,223
The proposal to merge lp:~widelands-dev/widelands/market1 into lp:widelands has
been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/market1/+merge/331233
--
Your team Widelands Developers is subscribed to branch
lp:~widela
Review: Resubmit
Thank you for the code review! All addressed.
@bunnybot merge
Diff comments:
>
> === modified file 'src/logic/game.cc'
> --- src/logic/game.cc 2017-08-30 12:01:47 +
> +++ src/logic/game.cc 2017-09-23 15:17:19 +
> @@ -753,6 +754,87 @@
> get_gametime(), ship.get
I added a bunch of small nits & ideas.
I don't know when I'll be able to check in again, so please do merge once
you're happy.
Diff comments:
>
> === modified file 'src/logic/game.cc'
> --- src/logic/game.cc 2017-08-30 12:01:47 +
> +++ src/logic/game.cc 2017-09-23 15:17:19 +
> @@ -753,
Review: Approve
I compiled the branch and "tested" it, though actually there is not much to
test.
I did as well some AI-only test so at least I can say that this does not affect
normal play.
So IMHO it can go.
Did not read the code though
--
https://code.launchpad.net/~widelands-dev/widelands
Continuous integration builds have changed state:
Travis build 2689. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/278977032.
Appveyor build 2509. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_market1-25
Found it - a copy & pasto. Great to have tests catching stuff like this :)
--
https://code.launchpad.net/~widelands-dev/widelands/market1/+merge/331233
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/market1 into lp:widelands.
_
I am unsure as of now how, but this breaks the casern and something in
seafaring. I have to investigate how I broke this.
--
https://code.launchpad.net/~widelands-dev/widelands/market1/+merge/331233
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/wid
Continuous integration builds have changed state:
Travis build 2686. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/278792165.
Appveyor build 2506. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_market1-2
Still very big, but the smallest functional piece I could make. Forward looking
I'll probably have essentially one branch per TODO which should make the diffs
even smaller.
--
https://code.launchpad.net/~widelands-dev/widelands/market1/+merge/331233
Your team Widelands Developers is requested to
SirVer has proposed merging lp:~widelands-dev/widelands/market1 into
lp:widelands.
Commit message:
First working land-based trading implementation.
A trade works like this: A player proposes to another players market to
initiate a trade. A trade consists of the three pieces of information: wha
11 matches
Mail list logo
