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

2019-06-23 Thread Benedikt Straub
Benedikt Straub has proposed merging lp:~widelands-dev/widelands/constructionsite_options into lp:widelands. Commit message: Fixes for some errors in constructionsite settings Requested reviews: GunChleoc (gunchleoc) Related bugs: Bug #1597310 in widelands: "Possibility to set building optio

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

2019-06-23 Thread Benedikt Straub
The proposal to merge lp:~widelands-dev/widelands/constructionsite_options into lp:widelands has been updated. Description changed to: As happens so often, new bugs are found directly after the feature that causes them has been merged :) – Fix two errors with ware priorities and max fills (we

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

2019-06-23 Thread Benedikt Straub
The proposal to merge lp:~widelands-dev/widelands/constructionsite_options into lp:widelands has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/369210 -- Your team Widelands De

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

2019-06-23 Thread Benedikt Straub
Just found another issue in trainingsite-constructionsite saveloading which I´d like to fix with this branch -- https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/369210 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/constructi

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

2019-06-23 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/quiz_captcha into lp:widelands-website. Commit message: Add a quiz captcha to https://www.widelands.org/legal_notice/ to prevent spam mails Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1799375 i

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

2019-06-23 Thread GunChleoc
Review: Approve Yep, that makes sense. Code LGTM, not tested yet. -- https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/369210 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/constructionsite_options. __

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

2019-06-23 Thread Benedikt Straub
Replied to the diff comment. Also found and fixed another flaw in the inputqueuedisplay. Diff comments: > > === modified file 'src/logic/playercommand.cc' > --- src/logic/playercommand.cc2019-06-23 11:41:17 + > +++ src/logic/playercommand.cc2019-06-23 14:34:42 + > @@ -113

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

2019-06-23 Thread GunChleoc
1 small nit. Diff comments: > > === modified file 'src/logic/playercommand.cc' > --- src/logic/playercommand.cc2019-06-23 11:41:17 + > +++ src/logic/playercommand.cc2019-06-23 14:34:42 + > @@ -1131,39 +1139,43 @@ > PlayerImmovable&

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

2019-06-23 Thread Benedikt Straub
Benedikt Straub has proposed merging lp:~widelands-dev/widelands/constructionsite_options into lp:widelands. Commit message: Fixes for some errors in constructionsite settings Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1597310 in widelands: "Possibility to set

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

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

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

2019-06-23 Thread Benedikt Straub
inputqueues @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/workarea-fixes/+merge/368342 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/workarea-fixes. ___ Mailing list: https://launchpa

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

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

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

2019-06-23 Thread bunnybot
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 5211. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/548652135. -- https://code.launchpad.net/~widelands-dev/widelands/workarea-fixes/+merge/368342 Your team Wide

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

2019-06-23 Thread GunChleoc
Review: Approve Retested and still working :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/workarea-fixes/+merge/368342 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/workarea-fixes. ___ M

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

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

[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-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

[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/~

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