[Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands

2019-06-22 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/elk_moose into lp:widelands. Commit message: Rename "elk" to "moose" and add map compatibility code - Add support for critter renamings depending on packet version to WorldLegacyLookupTable - New map version property "needs_widelands_ve

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands

2019-06-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 5218. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/549145830. Appveyor build 4997. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_elk_moose

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands

2019-06-22 Thread bunnybot
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 5218. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/549145830. -- https://code.launchpad.net/~widelands-dev/widelands/elk_moose/+merge/369201 Your team Widelands

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands

2019-06-23 Thread bunnybot
Error merging this proposal: Output: stdout: stderr: Unable to obtain lock held by sir...@bazaar.launchpad.net on taotie (process #21580), acquired 37 hours, 41 minutes ago. See "bzr help break-lock" for more. bzr: ERROR: Could not acquire lock "(remote lock)": bzr+ssh://bazaar.launchpad.net/~

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands

2019-06-23 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/elk_moose into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/elk_moose/+merge/369201 -- Your team Widelands Developers is subscribed to branch lp:~wi

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands

2019-06-22 Thread Klaus Halfmann
Some questions inline Code otherwise LGTM. Will commpile this and the read that code again. Diff comments: > > === modified file 'src/logic/map.cc' > --- src/logic/map.cc 2019-05-16 09:15:03 + > +++ src/logic/map.cc 2019-06-22 11:22:28 + > @@ -714,6 +714,22 @@ > pathfieldmgr_->se

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands

2019-06-22 Thread Klaus Halfmann
I expect some followup change on the website then. Widelands will always read older Maps. Did another review with a look into the complete code. (We need some Widelands historian for all this legacy :-) A bit more documentation would help. Diff comments: > > === modified file 'src/map_io/widel

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands

2019-06-22 Thread Klaus Halfmann
I openend some buitin and a new Map, how can I see this new value in a map? I am missing some info about wl_map_info / wl_map_object_info -- https://code.launchpad.net/~widelands-dev/widelands/elk_moose/+merge/369201 Your team Widelands Developers is requested to review the proposed merge of lp:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands

2019-06-22 Thread Klaus Halfmann
Review: Approve review, compile, short test OTOH the code is OK for me, anything more I can / must do? -- https://code.launchpad.net/~widelands-dev/widelands/elk_moose/+merge/369201 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/elk_moose. ___

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands

2019-06-22 Thread GunChleoc
I have added comments. If you run ./wl_map_info without parameters, it will give you command line help. It results in a JSON file for the website. Diff comments: > > === modified file 'src/logic/map.cc' > --- src/logic/map.cc 2019-05-16 09:15:03 + > +++ src/logic/map.cc 2019-06-22 11:22:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands

2019-06-22 Thread Klaus Halfmann
Review: Approve testing Ahh, the json file is created in thee same dir as the wmf file, e.g. { "name": "CrossriverA", "author": "Hasi50", "description": "A nice River flows through this land and water can be found there. Metal in the hills nearby, but you are not alone", "hint": "",

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands

2019-06-22 Thread GunChleoc
Thanks for the review & testing! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/elk_moose/+merge/369201 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/elk_moose. ___ Mailing list: https://lau

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands

2019-06-23 Thread Klaus Halfmann
Travis: 1 x curl: (6) Could not resolve host: deb.debian.org Error: An exception occurred within a child process: DownloadError: Failed to download resource "isl" 3 x Loading savegame: inputqueues ... No output has been received in the last 10m0s -> Adressed elsewhere All other Builds are f

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands

2019-06-23 Thread GunChleoc
@bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/elk_moose/+merge/369201 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/elk_moose. ___ Mailing list: https://launchpad.net/~widelands-dev Po