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/371170
--
Your team Widelands Develop
Code LGTM :)
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/371170
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands
/_widelands_dev_widelands_constructionsite_options-5086.
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/371170
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands
s/constructionsite_options/+merge/371170
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands.
=== modified file 'src/logic/map_objects/tribes/productionsite.cc'
--- src/logic/map_objects/tribes/productions
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/369210
--
Your team Widelands Develop
Continuous integration builds have changed state:
Travis build 5250. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/551743880.
Appveyor build 5029. State: success. Details:
@bunnybot merge
--
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.
___
Mailing list:
Refusing to merge, since Travis is not green. Use @bunnybot merge force for
merging anyways.
Travis build 5246. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/550167492.
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/369210
Yes, that fixed it :)
@bunnybot merge
--
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.
___
Should be fixed now. I´m unable to compile and test at the moment though.
--
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.
The hero/rookie buttons now oscillate their state, so that needs fixing.
The memory leak seems to be gone.
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/369210
Your team Widelands Developers is subscribed to branch
Review: Resubmit
Repositioned the buttons.
I also pushed a revision that should fix the memory leak you found (not tested).
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/369210
Your team Widelands Developers is subscribed to branch
I did some testing, looks good.
I noticed that the heroes/rookies buttons order is reversed in comparison to
the finished military buildings. Do you want to swap them before we merge this
branch?
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/369210
Your
Continuous integration builds have changed state:
Travis build 5231. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/549597607.
Appveyor build 5010. State: success. Details:
Changes look good :)
--
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.
___
Mailing list:
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
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
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 Widela
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
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.
();
> }
> - NEVER_HERE();
> }
> } else if (upcast(Building, b, mo)) {
> if (b->owner().player_number() == sender()) {
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_opti
NEVER_HERE();
> }
> NEVER_HERE();
> }
> - NEVER_HERE();
> }
> } else if (upcast(Building, b, mo)) {
>
to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands.
=== modified file 'src/logic/game.cc'
--- src/logic/game.cc 2019-06-23 11:41:17 +
+++ src/logic/game.cc 2019-06-23 14:34:42 +
@@ -789,17 +789,19 @@
void Game::send_player_set_war
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 Develop
@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:
Error merging this proposal:
Output:
stdout:
stderr:
Unable to obtain lock held by sir...@bazaar.launchpad.net on taotie (process
#21580), acquired 19 hours, 2 minutes ago.
See "bzr help break-lock" for more.
bzr: ERROR: Could not acquire lock "(remote lock)":
inputqueues again
@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.
___
Refusing to merge, since Travis is not green. Use @bunnybot merge force for
merging anyways.
Travis build 5203. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/547642295.
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428
Tested and still working - thanks for this great feature!
@bunnybot merge
--
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.
Review: Approve
LGTM now :)
I'd like to retest this due to the code changes made during review.
Diff comments:
>
> === modified file 'src/logic/map_objects/tribes/militarysite.cc'
> --- src/logic/map_objects/tribes/militarysite.cc 2019-05-26 17:21:15
> +
> +++
Continuous integration builds have changed state:
Travis build 5203. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/547642295.
Appveyor build 4982. State: success. Details:
No problem. I have very little time for Widelands at the moment anyway :)
Diff comments:
>
> === added file 'src/logic/map_objects/tribes/building_settings.cc'
> --- src/logic/map_objects/tribes/building_settings.cc 1970-01-01 00:00:00
> +
> +++
The changes look good - there are still some open comments, though. Sorry it
took me a while to get back to this.
Diff comments:
>
> === added file 'src/logic/map_objects/tribes/building_settings.cc'
> --- src/logic/map_objects/tribes/building_settings.cc 1970-01-01 00:00:00
> +
> +++
Implemented your comments
Diff comments:
>
> === added file 'src/logic/map_objects/tribes/building_settings.cc'
> --- src/logic/map_objects/tribes/building_settings.cc 1970-01-01 00:00:00
> +
> +++ src/logic/map_objects/tribes/building_settings.cc 2019-05-28 15:09:01
> +
> @@ -0,0
Review: Needs Fixing
I finally got around to doing the code review. This branch still has a lot of
room for streamlining the code and the performance.
Diff comments:
>
> === added file 'src/logic/map_objects/tribes/building_settings.cc'
> --- src/logic/map_objects/tribes/building_settings.cc
/_widelands_dev_widelands_constructionsite_options-4856.
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands
/_widelands_dev_widelands_constructionsite_options-4854.
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands
has been fixed, we still need to look at the code.
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:w
hpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands.
___
Mailing list: https:/
64-linux-gnu/libc.so.6+0x21b96)
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_opt
s/constructionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to
OK, will change it like this
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands
Would it be possible to move the tabs for Warehouses' and Ports' to the top,
instead of having to tab rows?
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev
/_widelands_dev_widelands_constructionsite_options-4784.
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands.
___
Mailing list: https
Seems to be fixed.
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands
Since the bug is not reproducible, I can´t be certain, but it should most
likely be gone now
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands
merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https
ons/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-
Oops… should be fixed now
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands
tionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to
Assert fail fixed :)
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands
428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.
got similar crashes before, but I
thought I had caught all corner cases now…
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_opti
address 0x (pc
0x bp 0x7ffee6344650 sp 0x7ffee63445a8 T0)
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands
/constructionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post
the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help
the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More
-dev/widelands/constructionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
/~widelands-dev/widelands/constructionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands.
___
Mailing list: https://launchpad.net
/_widelands_dev_widelands_constructionsite_options-4752.
--
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands
Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/constructionsite_options into lp:widelands.
=== modified file 'src/ai/defaultai_seafaring.cc'
--- src/ai/defaultai_seafaring.cc 2019-02-23 11:00:49 +
+++ src/ai/defaultai_seafaring.cc 2019-05-14 17:38:23 +
@@ -34
63 matches
Mail list logo
