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

2019-04-24 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732 -- Your team

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

2019-04-24 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/bug-1817550-Statistics-hook-Winconditions into lp:widelands

2019-04-24 Thread hessenfarmer
moved the statistics Table definititon to territorial fuctions -- https://code.launchpad.net/~widelands-dev/widelands/bug-1817550-Statistics-hook-Winconditions/+merge/365086 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1817550-Statist

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

2019-04-24 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/territorial_unify_notifications into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/territorial_unify_notifications/+merge/362502 -- Your team Widelan

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

2019-04-24 Thread bunnybot
Continuous integration builds have changed state: Travis build 4788. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/524155429. Appveyor build 4569. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_territoria

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

2019-04-24 Thread bunnybot
Continuous integration builds have changed state: Travis build 4787. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/524095891. Appveyor build 4568. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_179189

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

2019-04-24 Thread GunChleoc
Review: Approve @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/territorial_unify_notifications/+merge/362502 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/collectors_notification. ___ Mailin

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

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

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

2019-04-24 Thread bunnybot
Continuous integration builds have changed state: Travis build 4782. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/523935950. Appveyor build 4534. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mipmaps-45

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

2019-04-24 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/cleanup-statistics-plotter into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/cleanup-statistics-plotter/+merge/365138 -- Your team Widelands Develope

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

2019-04-24 Thread Toni Förster
fixed in r8979 -- https://code.launchpad.net/~widelands-dev/widelands/territorial_unify_notifications/+merge/362502 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/collectors_notification. ___ Mailing list: https://la

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

2019-04-24 Thread GunChleoc
Transient failure on Travis @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/cleanup-statistics-plotter/+merge/365138 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cleanup-statistics-plotter. __

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

2019-04-24 Thread bunnybot
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 4780. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/523885621. -- https://code.launchpad.net/~widelands-dev/widelands/cleanup-statistics-plotter/+merge/365138 Yo

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

2019-04-24 Thread bunnybot
Continuous integration builds have changed state: Travis build 4780. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/523885621. Appveyor build 4536. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_cleanup_s

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

2019-04-24 Thread Benedikt Straub
The proposal to merge lp:~widelands-dev/widelands/editor-grid into lp:widelands has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~widelands-dev/widelands/editor-grid/+merge/366482 -- Your team Widelands Developers is requested to r

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

2019-04-24 Thread Benedikt Straub
Sorry, this branch is a bit messed up :( -- https://code.launchpad.net/~widelands-dev/widelands/editor-grid/+merge/366482 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/editor-grid into lp:widelands. ___

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

2019-04-24 Thread Benedikt Straub
Benedikt Straub has proposed merging lp:~widelands-dev/widelands/editor-grid into lp:widelands with lp:~nordfriese/widelands/workareas as a prerequisite. Commit message: Add a grid overlay to the editor, which can be toggled with a button or the hotkey 'G' Requested reviews: Widelands Develop

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

2019-04-24 Thread Benedikt Straub
The proposal to merge lp:~widelands-dev/widelands/editor-grid into lp:widelands has been updated. Status: Work in progress => Superseded For more details, see: https://code.launchpad.net/~widelands-dev/widelands/editor-grid/+merge/366481 -- Your team Widelands Developers is requested to rev

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

2019-04-24 Thread Benedikt Straub
The proposal to merge lp:~widelands-dev/widelands/editor-grid into lp:widelands has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~widelands-dev/widelands/editor-grid/+merge/366481 -- Your team Widelands Developers is requested to r

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

2019-04-24 Thread Benedikt Straub
Benedikt Straub has proposed merging lp:~widelands-dev/widelands/editor-grid into lp:widelands. Commit message: Add a grid overlay to the editor, which can be toggled with a button or the hotkey 'G' Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1529261 in widela

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

2019-04-24 Thread GunChleoc
Tested and working. I think we should not allow peaceful mode for territorial time, territorial lord or autocrat, because it can make those game modes unwinnable. UI-wise, you could hook into the win condition dropdown's selected signal and show/hide the checkbox. -- https://code.launchpad.net

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

2019-04-24 Thread Toni Förster
I'll have a look. -- https://code.launchpad.net/~widelands-dev/widelands/territorial_unify_notifications/+merge/362502 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/collectors_notification. ___ Mailing list: https:/

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

2019-04-24 Thread GunChleoc
Review: Approve OK, let's have it then :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/cleanup-statistics-plotter/+merge/365138 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cleanup-statistics-plotter. _

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

2019-04-24 Thread GunChleoc
Yes, introducing new developers - especially ones that are as capable as you are - definitely does speed up things. Repeatedly spending a lot of time, energy and frustration on discussions like this one however does not. And yes, development can always take longer that one has projected, which i

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

2019-04-24 Thread Toni Förster
I'd say we merge it as it is now. I'll look into this when I find more time. -- https://code.launchpad.net/~widelands-dev/widelands/cleanup-statistics-plotter/+merge/365138 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/cleanup-statistics-p

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

2019-04-24 Thread ypopezios
It is funny how you still mention "this instance" when the scale of things here is whole months. Of course introducing new bugs doesn't speed-up things, but I don't remember you ever bothering with project's speed to begin with. Still introducing developers can definitely speed-up things. Especi

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

2019-04-24 Thread GunChleoc
Review: Needs Fixing When the 20 minutes timer reaches 0, the game is not lost or won. Note that I have pushed to this branch, so don't forget to pull, because that is so annoying when it happens. -- https://code.launchpad.net/~widelands-dev/widelands/territorial_unify_notifications/+merge/3625

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1809838-document-mill into lp:widelands

2019-04-24 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1809838-document-mill into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1809838-document-mill/+merge/364704 -- Your team Widelands Developers

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

2019-04-24 Thread GunChleoc
Do you want to try hour hand at the refactoring that I suggested above before we merge this? -- https://code.launchpad.net/~widelands-dev/widelands/cleanup-statistics-plotter/+merge/365138 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/cle

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1809838-document-mill into lp:widelands

2019-04-24 Thread GunChleoc
@bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/bug-1809838-document-mill/+merge/364704 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1809838-document-mill. ___ Mailing list: https:/

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1809838-document-mill into lp:widelands

2019-04-24 Thread GunChleoc
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/bug-1809838-document-mill/+merge/364704 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1809838-document-mill. ___ Mailing list: https://lau

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

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

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

2019-04-24 Thread GunChleoc
OK, the double // is correct then :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1817550-Statistics-hook-Winconditions/+merge/365086 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1817550-Statistics-hook-Winconditions int

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

2019-04-24 Thread GunChleoc
Considering all the desyncs and unexpected bugs we were struggling with, do you really think adding a complex new algorithm to the code would have made things any more predictable, or speeded up the release in any way whatsoever? It would have potentially slowed things even further. I'm sorry th

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

2019-04-24 Thread ypopezios
You can end a discussion, but you cannot help your case. Quite expectedly, the "few weeks" of the "release coming shortly" turned out to be more than half a year (and still counting). Congratulations for the upcoming release, and I wish it to really happen and not to be "too little too late". I

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

2019-04-24 Thread hessenfarmer
Thanks for the review. the double // is intentional to get an integer back (Stats expect integers) Will check if it is possible to move to territorial functions. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1817550-Statistics-hook-Winconditions/+merge/365086 Your team Widelands Dev

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

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

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

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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/per-level-soldier-anims into lp:widelands

2019-04-24 Thread GunChleoc
I have pushed a commit with a code review. I am also getting this error when loading the tribes: Trying to add unknown battle animation: attack_walk_ne -- https://code.launchpad.net/~widelands-dev/widelands/per-level-soldier-anims/+merge/354929 Your team Widelands Developers is requested to rev

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

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

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

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