The proposal to merge lp:~widelands-dev/widelands/bug-1829623-assert_is_present
into lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1829623-assert_is_present/+merge/367912
--
Your team Widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/reed-compatibility
into lp:widelands.
Commit message:
Fix savegame compatibility for reed, buildings, players view and economy
requests.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
The proposal to merge lp:~widelands-dev/widelands/ai-rename-bo-outputs into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/ai-rename-bo-outputs/+merge/367928
--
Your team Widelands Developers is
The input queues again
@bunnybot merge force
--
https://code.launchpad.net/~widelands-dev/widelands/ai-rename-bo-outputs/+merge/367928
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/ai-rename-bo-outputs.
___
That was the BaseDropdown. The Dropdown template looks like this:
template class Dropdown : public BaseDropdown {
...
/// Add an element to the list
/// \param name the display name of the entry
/// \param valuethe value for the entry
/// \param
> Since Entry is the descname (right?),
Wrong. The dropdown also comes with documentation:
/// Add an element to the list
/// \param name the display name of the entry
/// \param valuethe index of the entry
/// \param pic an image to
Continuous integration builds have changed state:
Travis build 5043. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/537115107.
Appveyor build 4823. State: success. Details:
Refusing to merge, since Travis is not green. Use @bunnybot merge force for
merging anyways.
Travis build 5043. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/537115107.
--
https://code.launchpad.net/~widelands-dev/widelands/list-directories-in-cpp/+merge/366614
Your
The proposal to merge lp:~widelands-dev/widelands/choose-attack-soldiers into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/choose-attack-soldiers/+merge/367471
--
Your team Widelands Developers is
Continuous integration builds have changed state:
Travis build 5041. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/537114220.
Appveyor build 4821. State: success. Details:
Ware stats menu fixed. It is already too large in trunk, but I made it shorter
now.
We still need knowledge of the phase we´re in during the loop so we can know
whether to change the target for all wares or only for the selected. Since
anything_selected may change during the loop, we need two
Refusing to merge, since Travis is not green. Use @bunnybot merge force for
merging anyways.
Travis build 5040. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/537114075.
--
https://code.launchpad.net/~widelands-dev/widelands/ai-rename-bo-outputs/+merge/367928
Your
Continuous integration builds have changed state:
Travis build 5040. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/537114075.
Appveyor build 4820. State: success. Details:
You can now get rid of the second_phase variable entirely. Just check for
!anything_selected at the end of the loop, then you can also get rid of
if (anything_selected) {
return;
}
Confirmed that the layouting is fixed. The ware
Thanks!
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/ai-rename-bo-outputs/+merge/367928
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/ai-rename-bo-outputs.
___
Mailing list:
Review: Approve
I have done some testing and it seems to work fine. I am not getting the double
free you mentioned.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/refactor_gameclient/+merge/366743
Your team Widelands Developers is subscribed to branch
The proposal to merge lp:~widelands-dev/widelands/wrong-password-message into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/wrong-password-message/+merge/367929
--
Your team Widelands Developers is
Continuous integration builds have changed state:
Travis build 5039. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/537113797.
Appveyor build 4819. State: failed. Details:
Layouting fixed. Ware statistics now sets a hgap as well
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/economy-target-profiles.
Review: Approve
checked if all instances are caught.
LGTM ;-)
--
https://code.launchpad.net/~widelands-dev/widelands/ai-rename-bo-outputs/+merge/367928
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/ai-rename-bo-outputs.
OK, let's leave the design as it is :)
This doesn't compile:
ow.cc.o -c ../src/wui/dismantlesitewindow.cc
In file included from ../src/wui/dismantlesitewindow.h:25:0,
from ../src/wui/dismantlesitewindow.cc:20:
../src/wui/buildingwindow.h: In member function ‘void
Review: Approve
This fixed it, thanks!
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1829623-assert_is_present/+merge/367912
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1829623-assert_is_present.
Implemented or replied to the diff comments.
The ASan error is in trunk and can happen everywhere there are dropdowns. For
example, when I´m thrown back to the main menu by an error from a fsmenu screen
that has one I already got this crash. It can appear whenever destroying a
window that
> "Launch expedition" should be "Start an expedition" like on the button for
> the finished port.
> The target of the help button does not get updated when enhancing, e.g.
> construction site for deeper coal mine will show the coal mine instead.
> ASan
Should all be fixed now
> It would be
Review: Resubmit
Found and fixed another potential source of asserts and/or segfaults. And it
appears the the assert cannot be guaranteed in certain cornercases.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1829623-assert_is_present/+merge/367912
Your team Widelands Developers is
We are merging a lot of branches today, so maybe do the merging tomorrow and
ping me so I'll take over and have a look?
--
https://code.launchpad.net/~widelands-dev/widelands/ferry/+merge/351880
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/ferry.
Sorry, your recent changes slipped me by. Thanks for the reminder, I will do
another review & testing.
--
https://code.launchpad.net/~widelands-dev/widelands/refactor_gameclient/+merge/366743
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/refactor_gameclient.
Thanks a lot for the review and testing :)
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/list-directories-in-cpp/+merge/366614
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/list-directories-in-cpp.
Also, this:
=
==6265==ERROR: LeakSanitizer: detected memory leaks
Direct leak of 2744 byte(s) in 49 object(s) allocated from:
#0 0x7ff86f576458 in operator new(unsigned long)
(/usr/lib/x86_64-linux-gnu/libasan.so.4+0xe0458)
The proposal to merge
lp:~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start/+merge/367314
--
It would be nice if the tab was remembered after using the "enhance" button.
The target of the help button does not get updated when enhancing, e.g.
construction site for deeper coal mine will show the coal mine instead.
"Launch expedition" should be "Start an expedition" like on the button for
The proposal to merge
lp:~widelands-dev/widelands/tribe-immovable-file-structure into lp:widelands
has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/tribe-immovable-file-structure/+merge/367611
--
Your team
Also:
==6158==ERROR: AddressSanitizer: heap-use-after-free on address 0x6183eda0
at pc 0x55fbbb8f1299 bp 0x7ffc346f2020 sp 0x7ffc346f2010
READ of size 8 at 0x6183eda0 thread T0
#0 0x55fbbb8f1298 in
I have just tested the relayouting when fullscreen switching. It works well for
warehouses and the stock statistics.
In the ware statistics, the bottom slider and text are cut off.
In the economy window, we get wide gaps between the columns and some extra
space on the left and right of the
Review: Approve
LGTM :)
--
https://code.launchpad.net/~widelands-dev/widelands/list-directories-in-cpp/+merge/366614
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/list-directories-in-cpp.
___
Mailing list:
Review: Needs Fixing
This will break once translations come in.
Diff comments:
>
> === modified file 'src/wui/economy_options_window.cc'
> --- src/wui/economy_options_window.cc 2019-02-23 11:00:49 +
> +++ src/wui/economy_options_window.cc 2019-05-16 17:28:26 +
> @@ -186,35 +281,402 @@
Since the parent branch has been merged, this can go in as well.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start/+merge/367314
Your team Widelands Developers is subscribed to branch
Review: Approve
Perfect :)
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/choose-attack-soldiers/+merge/367471
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/choose-attack-soldiers.
___
Thanks for the review :)
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/tribe-immovable-file-structure/+merge/367611
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/tribe-immovable-file-structure.
Thanks a lot for the review!
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/font_size-lua.
___
Mailing list:
Review: Resubmit
A tooltip it is :)
--
https://code.launchpad.net/~widelands-dev/widelands/choose-attack-soldiers/+merge/367471
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/choose-attack-soldiers.
___
Mailing
Thanks!
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/wrong-password-message/+merge/367929
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/wrong-password-message.
___
Mailing list:
> the output stops for a while. On each load of the save game the stop-time is
> different, one time the stop lasts longer, the other time it lasts shorter
> (but noticeable).
It stops because Widelands is loading more stuff for starting the game that
isn't producing log outputs. This has
Review: Approve
--
https://code.launchpad.net/~widelands-dev/widelands/wrong-password-message/+merge/367929
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/wrong-password-message.
___
Mailing list:
GunChleoc has proposed merging
lp:~widelands-dev/widelands/wrong-password-message into lp:widelands.
Commit message:
Improved message for "wrong password"
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
GunChleoc has proposed merging lp:~widelands-dev/widelands/ai-rename-bo-outputs
into lp:widelands.
Commit message:
Rename BuildingObserver::outputs to BuildingObserver::ware_outputs
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
The proposal to merge lp:~widelands-dev/widelands/ai-rename-bo-outputs into
lp:widelands has been updated.
Description changed to:
The variable name has already confused at least 2 people, so I decided to
change it.
For more details, see:
The proposal to merge
lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
I think the last idea is the best one :)
--
https://code.launchpad.net/~widelands-dev/widelands/choose-attack-soldiers/+merge/367471
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/choose-attack-soldiers.
___
Mailing
Now why can we nort merge this one?
--
https://code.launchpad.net/~widelands-dev/widelands/refactor_gameclient/+merge/366743
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/refactor_gameclient.
___
Mailing list:
Review: Approve
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start.
Code LGTM.
One tweak I'd like to see after testing:
Error message "The sent password was incorrect!" - call it "Wrong password" or
"Wrong password, please try again." The user doesn't care about the technical
detail that it was sent. This is coming from the metaserver, so I have opened a
but
Review: Approve
I agree that we should go through the formal process here, just to make sure
that no extra changes have been accidentally committed and to have bunnybot
build it.
--
https://code.launchpad.net/~widelands-dev/widelands/ai_new_wai_files_21052019/+merge/367709
Your team Widelands
I think skipped should be ignored in the UI, but the AI should be able to know
whether a program has been skipped a lot recently, because that means that a
new building is not needed.
--
https://code.launchpad.net/~widelands-dev/widelands/ai_productionsites_statistics/+merge/367613
Your team
Review: Needs Fixing
I retested with the savegame attached to the bug and this does not fix the
problem
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1829623-assert_is_present/+merge/367912
Your team Widelands Developers is subscribed to branch
Review: Approve
Code LTGM.
I think we should replace "deserted" with "has left the building", because he
has not fled the tribe.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1829623-assert_is_present/+merge/367912
Your team Widelands Developers is subscribed to branch
56 matches
Mail list logo
