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

2019-04-23 Thread GunChleoc
I have copied the fix to the Build 20 branch too. -- https://code.launchpad.net/~widelands-dev/widelands/fix_fix_dependencies/+merge/366416 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_fix_dependencies. ___ Mai

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

2019-04-23 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fix_fix_dependencies/+merge/366416 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_fix_dependencies. ___ Mailing list: https://launchpad.net/~

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1825925-mac-dylib-fix into lp:widelands/build20

2019-04-23 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1825925-mac-dylib-fix into lp:widelands/build20 has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1825925-mac-dylib-fix/+merge/366418 -- Your team Widelands

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1825925-mac-dylib-fix into lp:widelands/build20

2019-04-23 Thread Toni Förster
It is indeed :). Let's go with your solution. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1825925-mac-dylib-fix/+merge/366418 Your team Widelands Developers is subscribed to branch lp:widelands/build20. ___ Mailing list: https://launchpad

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

2019-04-23 Thread Toni Förster
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/fix_fix_dependencies/+merge/366416 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_fix_dependencies. ___ Mailing list: https://launchpad.net

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/editor-resize-map into lp:widelands

2019-04-23 Thread GunChleoc
@bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/editor-resize-map/+merge/365638 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/editor-resize-map. ___ Mailing list: https://launchpad.net/~

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

2019-04-23 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/mipmaps/+merge/363780 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mipmaps. ___ Mailing list: https://launchpad.net/~widelands-dev Post to

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands

2019-04-23 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue. ___ Mailing

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

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

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

2019-04-23 Thread GunChleoc
Transient failure on Travis @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/cleanup-soundhandler/+merge/365001 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cleanup-rendertarget. ___ M

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

2019-04-23 Thread bunnybot
Continuous integration builds have changed state: Travis build 4771. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/523680818. Appveyor build 4555. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_fix_dep

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

2019-04-23 Thread bunnybot
Continuous integration builds have changed state: Travis build 4770. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/523599764. Appveyor build 4554. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_cleanup_s

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

2019-04-23 Thread bunnybot
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 4770. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/523599764. -- https://code.launchpad.net/~widelands-dev/widelands/cleanup-soundhandler/+merge/365001 Your tea

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1825925-mac-dylib-fix into lp:widelands/build20

2019-04-23 Thread SirVer
It's kinda fun that we both solved the same problem at the same time, isn't it? :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1825925-mac-dylib-fix/+merge/366418 Your team Widelands Developers is subscribed to branch lp:widelands/build20.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1825925-mac-dylib-fix into lp:widelands/build20

2019-04-23 Thread SirVer
I do feel that this might do the wrong thing for the executable itself (i.e. the widelands binary), since it also changes the id of it. Not sure what behavior this has. The code is also still containing the bug that the id line is parsed as if it where a dependency. Since I was not sure if the

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

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

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

2019-04-23 Thread bunnybot
Continuous integration builds have changed state: Travis build 4768. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/523572522. Appveyor build 4552. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_campaignse

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands

2019-04-23 Thread bunnybot
Continuous integration builds have changed state: Travis build 4769. State: canceled. Details: https://travis-ci.org/widelands/widelands/builds/523574258. Appveyor build 3779. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1791

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/editor-resize-map into lp:widelands

2019-04-23 Thread bunnybot
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 4766. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/523536087. -- https://code.launchpad.net/~widelands-dev/widelands/editor-resize-map/+merge/365638 Your team W

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/editor-resize-map into lp:widelands

2019-04-23 Thread GunChleoc
@bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/editor-resize-map/+merge/365638 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/editor-resize-map. ___ Mailing list: https://launchpad.net/~

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/editor-resize-map into lp:widelands

2019-04-23 Thread GunChleoc
Transient failure on Travis @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/editor-resize-map/+merge/365638 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/editor-resize-map. ___ Mailing list:

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/editor-resize-map into lp:widelands

2019-04-23 Thread bunnybot
Continuous integration builds have changed state: Travis build 4766. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/523536087. Appveyor build 4550. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_editor_re

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1825925-mac-dylib-fix into lp:widelands/build20

2019-04-23 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/bug-1825925-mac-dylib-fix into lp:widelands/build20. Commit message: macOS: fix ids for dylib Requested reviews: SirVer (sirver) Related bugs: Bug #1825925 in widelands: "Mac OS builds for >= 10.9 have no sound playing" https://

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1825925-mac-dylib-fix into lp:widelands

2019-04-23 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/bug-1825925-mac-dylib-fix into lp:widelands. Commit message: macOS: fix ids for dylib Requested reviews: SirVer (sirver) Related bugs: Bug #1825925 in widelands: "Mac OS builds for >= 10.9 have no sound playing" https://bugs.lau

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1825925-mac-dylib-fix into lp:widelands

2019-04-23 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/bug-1825925-mac-dylib-fix into lp:widelands has been updated. Commit message changed to: macOS: fix ids for dylib For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1825925-mac-dylib-fix/+merge/366417 -- Your team Wi

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

2019-04-23 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/fix_fix_dependencies into lp:widelands. Commit message: Fix the fix_dependency.py script. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1825925 in widelands: "Mac OS builds for >= 10.9 have no sound playing"

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

2019-04-23 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/cleanup-soundhandler/+merge/365001 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cleanup-rendertarget. ___ Mailing list: https://launchpad.net/~

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

2019-04-23 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/campaignselect_box/+merge/360901 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/campaignselect_box. ___ Mailing list: https://launchpad.net/~wide

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

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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1817550-Statistics-hook-Winconditions into lp:widelands

2019-04-23 Thread GunChleoc
2 nits - not tested yet. Diff comments: > > === modified file 'data/scripting/win_conditions/territorial_lord.lua' > --- data/scripting/win_conditions/territorial_lord.lua2019-03-09 > 10:55:24 + > +++ data/scripting/win_conditions/territorial_lord.lua2019-03-26 > 07:43:29 +

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

2019-04-23 Thread GunChleoc
This has been tested with the sound handler branch. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/cleanup-rendertarget/+merge/365000 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/cleanup-rendertarget into lp:widel

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands

2019-04-23 Thread bunnybot
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 3981. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/428918967. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/3

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/soldier-capacity-ctrl into lp:widelands

2019-04-23 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/soldier-capacity-ctrl into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/soldier-capacity-ctrl/+merge/355002 -- Your team Widelands Developers is subs

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

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

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1764318-barbarian-lore into lp:widelands

2019-04-23 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1764318-barbarian-lore into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1764318-barbarian-lore/+merge/365637 -- Your team Widelands Develope

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/editor-resize-map into lp:widelands

2019-04-23 Thread bunnybot
Error merging this proposal: Output: stdout: stderr: +N data/images/wui/editor/editor_menu_tool_resize.png +N data/images/wui/editor/fsel_editor_resize.png +N src/editor/tools/resize_tool.cc +N src/editor/tools/resize_tool.h +N src/editor/ui_menus/tool_resize_options_menu.cc +N src/editor/u

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1823471-empire3-4-victory into lp:widelands

2019-04-23 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug1823471-empire3-4-victory into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug1823471-empire3-4-victory/+merge/365640 -- Your team Widelands Deve

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

2019-04-23 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/new_frisian_roads/+merge/365496 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/new_frisian_roads into lp:widelands. ___ Mail

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1764318-barbarian-lore into lp:widelands

2019-04-23 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1764318-barbarian-lore/+merge/365637 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1764318-barbarian-lore. ___ Mailing list: https://lau

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1823471-empire3-4-victory into lp:widelands

2019-04-23 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug1823471-empire3-4-victory/+merge/365640 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug1823471-empire3-4-victory. ___ Mailing list: https:/

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/editor-resize-map into lp:widelands

2019-04-23 Thread GunChleoc
Transient failure on Travis @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/editor-resize-map/+merge/365638 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/editor-resize-map. ___ Mailing

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands

2019-04-23 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue. ___ Mailing

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/soldier-capacity-ctrl into lp:widelands

2019-04-23 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/soldier-capacity-ctrl/+merge/355002 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/soldier-capacity-ctrl. ___ Mailing list: https://launchpad.net

[Widelands-dev] [Merge] lp:widelands/build20 into lp:widelands

2019-04-23 Thread GunChleoc
The proposal to merge lp:widelands/build20 into lp:widelands has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~widelands-dev/widelands/build20/+merge/366347 -- Your team Widelands Developers is requested to review the proposed merge

[Widelands-dev] Windows builds are done

2019-04-23 Thread Fòram na Gàidhlig
The Windows builds are ready, so everybody can push again now. Sgrìobh Fòram na Gàidhlig na leanas 22/04/2019 aig 19:17: > Hi all, > > I am bugfixing the version information in the AppVeyor builds, but I > don't have access to our AppVeyor account, so I can't cancel any builds > there. > > Plea