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
lp
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
understa
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
--
https://code.launchpad.net/~widelands-dev/w
Thanks
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1530999/+merge/281691
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1530999.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to :
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 Wideland
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 glob
The proposal to merge lp:~widelands-dev/widelands/bug-1526903 into lp:widelands
has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1526903/+merge/281410
--
Your team Widelands Developers is subscribed to branch
lp
TiborB has proposed merging lp:~widelands-dev/widelands/bug-1530999 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1530999 in widelands: "Crash in defaultai"
https://bugs.launchpad.net/widelands/+bug/1530999
For more details, see:
https://code
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: https://la
@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.
__
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 about bunnybot: the commit mess
Travis build 190 has changed state to: passed. Details:
https://travis-ci.org/widelands/widelands/builds/100389397.
--
https://code.launchpad.net/~widelands-dev/widelands/fix_overlays/+merge/281641
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/fix_overlays.
Review: Needs Fixing
Solved buildhelp during game play, but in editor there is something wrong:
1. When trying to place resources on mountains, the red small house is
displayed on the mountains
2. When trying to place fish resource in editor the small red house is
displayed on water
--
https
Travis build 189 has changed state to: passed. Details:
https://travis-ci.org/widelands/widelands/builds/100349812.
--
https://code.launchpad.net/~widelands-dev/widelands/appveyor/+merge/281599
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/wideland
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
unders
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 from the commit log
> what ha
Review: Approve
Still needs testing, but code LGTM.
--
https://code.launchpad.net/~widelands-dev/widelands/fix_overlays/+merge/281641
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/fix_overlays.
___
Mailing list: ht
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 de
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 De
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
In r7687 the build help is ok. It seems that the latest merge is also the
culprit for some compiler warnings about unused variables.
--
https://code.launchpad.net/~widelands-dev/widelands/render_queue/+merge/250524
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/wideland
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:
m
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.
https://bugs.launchpad.net/widelands/+bug/1425870/+a
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.
__
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 o
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 re
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'
> --- src/
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
data/bzr_rep
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;
> }
>
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
data/bzr_rep
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.
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
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
lp:~widelands-dev/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
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 origi
Some graphics have very little white artifacts in comparison with trunk. Best
to see on the screenshot where left is the render queue branch and right
current trunk. Compare the mountain terrains in first column and third row.
Some terrains appear clearer (the first two in first row).
https://l
36 matches
Mail list logo
