This has a chance of fixing some desyncs for us, which is why I want it for
Build 20. We do need to get rid of those desyncs.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/safeguard-multiplayer-messages/+merge/362942
Your team Widelands Developers is subscribed to branch
I'm getting a compile error on debug builds:
Building CXX object
src/wui/CMakeFiles/wui_common_gamedetails.dir/load_or_save_game.cc.o
In file included from
/home/bratzbert/sources/widelands/bug-1810062-territorial-calculations/src/logic/map.h:33:0,
from
/home/bratzbert/sources/
The proposal to merge
lp:~widelands-dev/widelands/safeguard-multiplayer-messages into lp:widelands
has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/safeguard-multiplayer-messages/+merge/362942
--
Your team Widelands
Continuous integration builds have changed state:
Travis build . State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/491032831.
Appveyor build 4232. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_safeguard_
Continuous integration builds have changed state:
Travis build 4437. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/490952737.
Appveyor build 4225. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_17963
@kaputtnik
Neither do your sentences sound to hard nor rude. :-) Please let me explain why
I think the changes are necessary for build_20.
send_message() from messages.lua is also used in mp_scenarios and some other
win_conditions. We could either change the method calls there as well and
chan
Sorry if my sentences sounds too hard...
> Add the info to the documentation, like for the send_message function which
> now states that it isn't multiplayer-safe.
This statement is not valid anymore, if this branch get merged. Or do i miss
some thing?
Tony, this is nothing against your merge
Review: Approve
Code LGTM, not tested
--
https://code.launchpad.net/~widelands-dev/widelands/bug-better-syncstreams/+merge/361922
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-better-syncstreams.
___
Mailing li
As far as I am concerned, this branch is ready for review and merge now.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-better-syncstreams/+merge/361922
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-better-syncstreams into
The proposal to merge lp:~widelands-dev/widelands/bug-better-syncstreams into
lp:widelands has been updated.
Description changed to:
[Ready for review and merge]
Since I am not really able to get useful information out of the existing
syncstream files, this branch adds further information to t
The proposal to merge lp:~widelands-dev/widelands/bug-better-syncstreams into
lp:widelands has been updated.
Commit message changed to:
Print more information in syncstreams. Create additional smaller syncstream
files containing the last few seconds leading to a desync.
For more details, see:
Add the info to the documentation, like for the send_message function which now
states that it isn't multiplayer-safe.
--
https://code.launchpad.net/~widelands-dev/widelands/safeguard-multiplayer-messages/+merge/362942
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/wide
Continuous integration builds have changed state:
Travis build 4433. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/490911106.
Appveyor build 4221. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_18053
Refusing to merge, since Travis is not green. Use @bunnybot merge force for
merging anyways.
Travis build 4433. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/490911106.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1805325-joining-lan-games/+merge/359789
What is the reason for the change in win_condition_functions.lua?
wait_for_roadbuilding() acts now different when in multiplayer: The sentence
"Sleeps while player is in roadbuilding mode." is now only valid in
singleplayer games. How should this be documented?
I fear we get things messsed up i
Thanks.
And BTW: Welcome back GunChleoc
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/safeguard-multiplayer-messages/+merge/362942
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/safeguard-multiplayer-messages.
___
Excellent :)
It's good to be back.
--
https://code.launchpad.net/~widelands-dev/widelands-website/bug-1807701_string_fixes_website/+merge/361402
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/bug-1807701_string_fixes_website into
Review: Approve
Code LGTM :)
--
https://code.launchpad.net/~widelands-dev/widelands/safeguard-multiplayer-messages/+merge/362942
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/safeguard-multiplayer-messages.
___
Mai
Answered.
Diff comments:
>
> === modified file 'src/logic/game.cc'
> --- src/logic/game.cc 2018-12-13 07:24:01 +
> +++ src/logic/game.cc 2019-01-20 23:22:08 +
> @@ -603,6 +608,47 @@
> }
>
> /**
> + * Switches to the next part of the syncstream excerpt.
> + */
> +void Game::report_syn
Toni Förster has proposed merging
lp:~widelands-dev/widelands/safeguard-multiplayer-messages into lp:widelands.
Commit message:
Safeguard to avoid desyncs when using send_message() from ui.lua
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpa
Nice to have you back GunChleoc :-)
Thanks for all the reviews.
Since the other branch is merged, i have merged this also.
--
https://code.launchpad.net/~widelands-dev/widelands-website/bug-1807701_string_fixes_website/+merge/361402
Your team Widelands Developers is requested to review the propo
The proposal to merge
lp:~widelands-dev/widelands-website/bug-1807701_string_fixes_website into
lp:widelands-website has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/bug-1807701_string_fixes_website/+merge/36
The proposal to merge lp:~widelands-dev/widelands-website/deleted_user2 into
lp:widelands-website has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/deleted_user2/+merge/361963
--
Your team Widelands Developers
The proposal to merge
lp:~widelands-dev/widelands-website/reenable_wiki_edit_lock into
lp:widelands-website has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/reenable_wiki_edit_lock/+merge/361388
--
Your team
The proposal to merge lp:~widelands-dev/widelands-website/mv_templates into
lp:widelands-website has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/mv_templates/+merge/362221
--
Your team Widelands Developers i
I merged this manually.
--
https://code.launchpad.net/~mmrxyz/widelands/scenario_tutorial01_typo_fix/+merge/362939
Your team Widelands Developers is requested to review the proposed merge of
lp:~mmrxyz/widelands/scenario_tutorial01_typo_fix into lp:widelands.
The proposal to merge lp:~mmrxyz/widelands/scenario_tutorial01_typo_fix into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~mmrxyz/widelands/scenario_tutorial01_typo_fix/+merge/362939
--
Your team Widelands Developers is requ
Thanks for the review. I answered some of your comments below and will push a
merge-ready version later on.
Diff comments:
>
> === modified file 'src/logic/game.cc'
> --- src/logic/game.cc 2018-12-13 07:24:01 +
> +++ src/logic/game.cc 2019-01-20 23:22:08 +
> @@ -603,6 +608,47 @@
> }
>
The proposal to merge lp:~widelands-dev/widelands/bug-1808169-disable-focus
into lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1808169-disable-focus/+merge/361097
--
Your team Widelands Developers
The proposal to merge
lp:~widelands-dev/widelands/bug-1800364-reset-economy-counter into lp:widelands
has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1800364-reset-economy-counter/+merge/362938
--
Your team Wid
Continuous integration builds have changed state:
Travis build 4430. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/490899112.
Appveyor build 4218. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_180036
Tested and working
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1805325-joining-lan-games/+merge/359789
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1805325-joining-lan-games.
___
I could reproduce the assert error and it should be fixed now.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1796364-blinking-buildings/+merge/359348
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1796364-blinking-buildings.
__
Again a Travis hiccup.
@bunnybot merge force
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1808169-disable-focus/+merge/361097
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1808169-disable-focus.
_
Refusing to merge, since Travis is not green. Use @bunnybot merge force for
merging anyways.
Travis build 4404. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/479143097.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1808169-disable-focus/+merge/361097
Your
Let's have it. We can always revisit it whenever we get around to implementing
more keyboard navigation.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1808169-disable-focus/+merge/361097
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widela
The proposal to merge lp:~widelands-dev/widelands/json_writer into lp:widelands
has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/json_writer/+merge/357908
--
Your team Widelands Developers is subscribed to branch
lp
The proposal to merge
lp:~widelands-dev/widelands/bug-1807701_translate_update_authors into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1807701_translate_update_authors/+merge/361401
--
Your te
Review: Approve played
Can this be merged? I tested this and found no issues.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1808169-disable-focus/+merge/361097
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1808169-disable-focus.
Review: Approve
LGTM :)
--
https://code.launchpad.net/~widelands-dev/widelands-website/reenable_wiki_edit_lock/+merge/361388
Your team Widelands Developers is subscribed to branch lp:widelands-website.
___
Mailing list: https://launchpad.net/~widelands
Review: Approve
LGTM :)
--
https://code.launchpad.net/~widelands-dev/widelands-website/deleted_user2/+merge/361963
Your team Widelands Developers is subscribed to branch lp:widelands-website.
___
Mailing list: https://launchpad.net/~widelands-dev
Post
Review: Approve
LGTM, let's have it :)
--
https://code.launchpad.net/~widelands-dev/widelands-website/mv_templates/+merge/362221
Your team Widelands Developers is subscribed to branch lp:widelands-website.
___
Mailing list: https://launchpad.net/~widel
Thanks for the review!
I have tested all combinations to make sure that this is always called, so
let's have it ASAP so that we can test for any other desyncs more easily.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1800364-reset-economy-counter/+merge/362938
Your
The problem with the streaming was that it's very hacky and hard to read. So,
we have sacrificed some efficiency and gained a lot of readability/code
stability.
Thanks for the review!
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/json_writer/+merge/357908
Your team Wid
Shifting this to C++ and pre-calculating would work like this:
1. Add a Bool to flag whether the fields have been calculated
2. Increase the map packet number and use it to add a condition to map loading
3. For older maps, calculate, for newer maps, pre-load
We should only save this to maps thoug
This affects uploading a map onto the website (wl_map_info) and creating the
encyclopedia (wl_map_object_info) https://wl.widelands.org/encyclopedia/
--
https://code.launchpad.net/~widelands-dev/widelands/json_writer/+merge/357908
Your team Widelands Developers is subscribed to branch
lp:~widela
Review: Approve
LGTM :)
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1807701_translate_update_authors/+merge/361401
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1807701_translate_update_authors.
___
The proposal to merge lp:~widelands-dev/widelands/user-status-lobby into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/user-status-lobby/+merge/361704
--
Your team Widelands Developers is requested to
OK, last_economy_serial_ becomes different for replays and causes desnycs.
And restarting a game may result in desyncs as well.
OK, I always try to keep my roads connected, so this may explain why this
does not hit me that often.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1800364-
LGTM :)
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/user-status-lobby/+merge/361704
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/user-status-lobby into lp:widelands.
___
I think this is a great change. 2 nits.
Let's postpone this to Build21 though to make sure we don't get accidental nil
values again.
Diff comments:
>
> === modified file 'data/scripting/win_conditions/win_condition_functions.lua'
> --- data/scripting/win_conditions/win_condition_functions.lua
I have had a look at the diff for the trunk merge and the resolution of the
merge conflict looks fine.
--
https://code.launchpad.net/~widelands-dev/widelands/robust-file-saving/+merge/358718
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/robust-file-saving.
_
See the linked bug, especially comment #10, about the reasoning of this branch.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1800364-reset-economy-counter/+merge/362938
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1800364-reset-economy-count
GunChleoc has proposed merging
lp:~mmrxyz/widelands/scenario_tutorial01_typo_fix into lp:widelands.
Commit message:
Typo fix in tutorial01 were -> where
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~mmrxyz/widelands/scenario_tutoria
@bunnybot merge
--
https://code.launchpad.net/~mmrxyz/widelands/scenario_tutorial01_typo_fix/+merge/362939
Your team Widelands Developers is requested to review the proposed merge of
lp:~mmrxyz/widelands/scenario_tutorial01_typo_fix into lp:widelands.
Merged trunk so that we can do some testing
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1805325-joining-lan-games/+merge/359789
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1805325-joining-lan-games.
___
Review: Approve review
That code is straight forard.
But please detail why this should fix some desyncs?
(We had some nice Multiplayer games upto 2 vs 2 tese days
but had some crashes from such desyncs.)
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1800364-reset-economy-counter/
The proposal to merge lp:~widelands-dev/widelands/workerwarehotspots into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/workerwarehotspots/+merge/359915
--
Your team Widelands Developers is subscribed
Review: Approve code review
OK, for the Reeview:
This branch substitutes a streaming JSON aproach with a Tree Object model.
Streaming is normally better as of resource usage,
but in this case this does not matter.
If kaputtnik likes it his way, its all fine with me.
(Solange nix kaputt geht ;-)
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1800364-reset-economy-counter into lp:widelands.
Commit message:
Reset economy serial in Game constructor
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1800364 in widelands: "Replay desyncs"
https:/
I don't think that this will mess up anything, so let's have it anyway.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/workerwarehotspots/+merge/359915
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/workerwarehotspots.
It has already been tested, what's missing is a code review.
--
https://code.launchpad.net/~widelands-dev/widelands/json_writer/+merge/357908
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/json_writer.
___
Mailing li
62 matches
Mail list logo
