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

The graph lines are buggy and not intended that way. I will open a bug report for them when merging this branch. I'd like to get it in sooner than later though as it is pretty high maintenance to keep it updated. You have a keen eye, kaputtnik :) In fact the 'artifacts' are already in the

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

Review: Approve code lgtm now. A couple of minor nits, feel free to merge after addressing these. Diff comments: > === modified file 'src/economy/economy.cc' > --- src/economy/economy.cc2015-11-11 09:52:55 + > +++ src/economy/economy.cc2016-01-04 18:44:46 + > @@ -664,14 +665,45

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

Tino has proposed merging lp:~widelands-dev/widelands/appveyor into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/appveyor/+merge/281599 Provide a build script for appveyor, the "travis ci" for

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

Followup bug for the line issue: https://bugs.launchpad.net/widelands/+bug/1531114 Thanks for testing, everybody! @bunnbot merge -- https://code.launchpad.net/~widelands-dev/widelands/render_queue/+merge/250524 Your team Widelands Developers is subscribed to branch

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

Review: Approve I agree that it is an improvement. Since I'm still on he dead slow virtual machine, I will give my OK if somebody who can reproduce the fuzzy roads does some testing to confirm that the problem is fixed on their machine - I expect that the problem will have been the same one.

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

The proposal to merge lp:~widelands-dev/widelands/fix_overlays into lp:widelands has been updated. Commit Message changed to: Fixes the display of the buildhelp. This got broken in r7688 by changing the callback function of the OverlayManager to return a bool instead of a NodeCap. For more

[Widelands-dev] Bunnybot says...

Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~widelands-dev/widelands/fix_overlays mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_fix_overlays You can give me commands by starting a line with @bunnybot . I

Re: [Widelands-dev] Bunnybot commit messages

Bunnybot uses the launchpad commit message for the merge request. I added this feature yesterday. > Am 05.01.2016 um 15:33 schrieb Fòram na Gàidhlig : > > There is 1 thing that bothers me about bunnybot: the commit messages > just say "merged ", so it's hard to see

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

SirVer has proposed merging lp:~widelands-dev/widelands/fix_overlays into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_overlays/+merge/281641 Fixes the buildhelp. -- Your team Widelands

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

Yes, the build help is broken. When toggeling the build help it shows only the little red house for small buildings for all places and it appears also on mountains and water. Hm, i don't remember seeing this the first time i test this branch.

[Widelands-dev] Bunnybot commit messages

There is 1 thing that bothers me about bunnybot: the commit messages just say "merged ", so it's hard to see from the commit log what has been done. Launchpad has the option to add a commit message to merge requests, would bunnybot be able to pick those up? Or could we add a commit message when we

[Widelands-dev] Bunnybot says...

Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~widelands-dev/widelands/appveyor mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_appveyor You can give me commands by starting a line with @bunnybot . I understand:

Re: [Widelands-dev] Bunnybot commit messages

Cool, thanks! Sgrìobh Holger Rapp na leanas 05/01/2016 aig 17:23: > Bunnybot uses the launchpad commit message for the merge request. I added > this feature yesterday. > >> Am 05.01.2016 um 15:33 schrieb Fòram na Gàidhlig : >> >> There is 1 thing that bothers me

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

@SirVer I incorporated your comments, with one exception, can I merge it? -- https://code.launchpad.net/~widelands-dev/widelands/request_supply_opt/+merge/280193 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/request_supply_opt.

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

I believe that I can merge it @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1526903/+merge/281410 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1526903. ___ Mailing list:

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

Review: Approve Very straightforward fix. I like it. I am in no position to test right now, but since this is fixing a crashing bug and the diff is tiny, I'll merge it right now. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1530999/+merge/281691 Your team

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

Tibor, sure, go ahead and merge. > I looked at other examples f.e. here: > http://bazaar.launchpad.net/~widelands-dev/widelands/request_supply_opt/view/head:/src/economy/supply.h#L94 > and everywhere it is done this way. Ah, that is a philosophical question, really. Does local style trump

[Widelands-dev] Bunnybot says...

Bunnybot encountered an error while working on this merge proposal: Running 'bzr branch lp:~widelands-dev/widelands/appveyor data/bzr_repo/_widelands_dev_widelands_appveyor' failed. Output: bzr: ERROR: Not a branch: "bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/appveyor

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

Thanks for the review. I addressed all comments. I might have made a mistake though, it seems that the buildhelp is now broken. Can somebody repo that? Bug 1519361 does not happen for me with this branch. Diff comments: > > === added file 'src/graphic/gl/coordinate_conversion.h' > ---

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

Added a comment to your comment, see in diff Diff comments: > > === modified file 'src/economy/idleworkersupply.cc' > --- src/economy/idleworkersupply.cc 2015-11-11 09:52:55 + > +++ src/economy/idleworkersupply.cc 2016-01-04 18:44:46 + > @@ -71,6 +71,11 @@ > return true; > }

[Widelands-dev] Bunnybot says...

Bunnybot encountered an error while working on this merge proposal: Running 'bzr branch lp:~widelands-dev/widelands/appveyor data/bzr_repo/_widelands_dev_widelands_appveyor' failed. Output: bzr: ERROR: Not a branch: "bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/appveyor

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

Ok, no static linking at all for now. Locally i am able to do a complete static widelands.exe, will have to figure this out for appveyor later. -- https://code.launchpad.net/~widelands-dev/widelands/appveyor/+merge/281599 Your team Widelands Developers is requested to review the proposed merge

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

The buildhelp is also broken in trunk, so not the fault of this branch. Please test, so we can get it merged. -- https://code.launchpad.net/~widelands-dev/widelands/render_queue/+merge/250524 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/render_queue.

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

The proposal to merge lp:~widelands-dev/widelands/bug-1530999 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1530999/+merge/281691 -- Your team Widelands Developers is subscribed to branch

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

You are right, I will rework it, though I am not that good programmer so it is not as simple for me as for you. This is only reason why I opted to mimic the existing code. But as there is no need to hurry with this branch so it can wait a bit again --

[Widelands-dev] Bunnybot says...

Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~widelands-dev/widelands/bug-1530999 mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_bug_1530999 You can give me commands by starting a line with @bunnybot . I

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

There is nothing obvious on your last commit that should cause the problem with the build help. We can consider Bug 1519361 to be fixed in this branch, because it appeared on all systems. I just noticed one more thing: class RenderQueue { public: enum Program { Any specific