Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/safeguard-multiplayer-messages into lp:widelands
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 lp:~widelands-dev/widelands/safeguard-multiplayer-messages. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1810062-territorial-calculations into lp:widelands
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/widelands/bug-1810062-territorial-calculations/src/logic/editor_game_base.h:29, from /home/bratzbert/sources/widelands/bug-1810062-territorial-calculations/src/logic/game.h:28, from /home/bratzbert/sources/widelands/bug-1810062-territorial-calculations/src/wui/load_or_save_game.h:25, from /home/bratzbert/sources/widelands/bug-1810062-territorial-calculations/src/wui/load_or_save_game.cc:20: /home/bratzbert/sources/widelands/bug-1810062-territorial-calculations/src/logic/field.h:261:1: error: static assertion failed: Field is not tightly packed. static_assert(sizeof(Field) == sizeof(void*) * 2 + 10, "Field is not tightly packed."); -- https://code.launchpad.net/~widelands-dev/widelands/bug-1810062-territorial-calculations/+merge/361366 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1810062-territorial-calculations 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://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/safeguard-multiplayer-messages into lp:widelands
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 Developers is subscribed to branch lp:~widelands-dev/widelands/safeguard-multiplayer-messages. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/safeguard-multiplayer-messages into lp: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_multiplayer_messages-4232. -- 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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1796364-blinking-buildings into lp:widelands
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_1796364_blinking_buildings-4225. -- 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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/safeguard-multiplayer-messages into lp:widelands
@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 change them back for build_21, or we fix it now. We have a hodgepodge methods we use for sending messages ATM. It would be sensible to unify them, and use the same method for the same kind of message. We shouldn't forget that the win_conditions are also used in single player and there it is absolutely okay to wait for a message to pop-up. The changes we did in the other branch were a hot-fix, specifically for multiplayer. But being able to distinguish between single- and multiplayer, and making this method multiplayer-aware is the way to go IMHO. I don't think that this change interferes with the feature freeze. We could have searched through all the lua files and locate where the aforementioned method is used (there are still many left) and replace it with something like this: "player:send_message(HEADER, BODY)". But after the release of build_20, we then would have to revert all back to use the method from messages.lua. @GunChleoc & @kaputtnik I changed the documentation as well. The changes in win_condition_functions just restore the old behaviour; using the method from messages.lua. I hope my explanations sound sensible. -- 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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/safeguard-multiplayer-messages into lp:widelands
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 request, nor against you. But this branch solves an issue which is not really there. Or do i miss anything again? IMHO this should be targeted to build21. Once we had a feature freeze, but now we get far away from that :( -- 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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-better-syncstreams into lp:widelands
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 list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-better-syncstreams into lp:widelands
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 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://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-better-syncstreams into lp:widelands
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 the syncstream describing the type of the syncstream entries. Additionally, create a smaller syncstream extract file next to the syncstream file which contains only the last few seconds. This should be enough to debug the desync but reduces the size of the to-be-uploaded files. For more details, see: 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 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://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-better-syncstreams into lp:widelands
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: 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 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://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/safeguard-multiplayer-messages into lp:widelands
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/widelands/safeguard-multiplayer-messages. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1805325-joining-lan-games into lp:widelands
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_1805325_joining_lan_games-4221. -- 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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1805325-joining-lan-games into lp:widelands
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 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1805325-joining-lan-games. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/safeguard-multiplayer-messages into lp:widelands
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 if we have such constructions, at least for people doing scripting it get much more difficult. Just my opinion :-) -- 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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/safeguard-multiplayer-messages into lp:widelands
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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/bug-1807701_string_fixes_website into lp:widelands-website
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 lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/safeguard-multiplayer-messages into lp:widelands
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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-better-syncstreams into lp:widelands
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_sync_request() {
> + syncwrapper_.current_excerpt_id_ = (syncwrapper_.current_excerpt_id_ +
> 1) % SyncWrapper::kExcerptSize;
> + syncwrapper_.excerpts_buffer_[syncwrapper_.current_excerpt_id_].clear();
> +}
> +
> +/**
> + * Triggers writing of syncstream excerpt and adds the playernumber of the
> desynced player
> + * to the stream.
> + * Playernumber should be negative when called by network clients
> + */
> +void Game::report_desync(int32_t playernumber) {
> + std::string filename = syncwrapper_.dumpfname_;
> + filename.replace(filename.length() - kSyncstreamExtension.length(),
> kSyncstreamExtension.length(), kSyncstreamExcerptExtension);
No, too complicated. Just leave it like it is.
> + std::unique_ptr file(g_fs->open_stream_write(filename));
> + assert(file != nullptr);
> + // Write revision, branch and build type of this build to the file
> + file->unsigned_32(build_id().length());
> + file->text(build_id());
> + file->unsigned_32(build_type().length());
> + file->text(build_type());
> + file->signed_32(playernumber);
> + // Write our buffers to the file. Start with the oldest one
> + const size_t i2 = (syncwrapper_.current_excerpt_id_ + 1) %
> SyncWrapper::kExcerptSize;
> + size_t i = i2;
> + for (;;) {
> + file->text(syncwrapper_.excerpts_buffer_[i]);
> + syncwrapper_.excerpts_buffer_[i].clear();
> + i = (i + 1) % SyncWrapper::kExcerptSize;
> + if (i == i2) {
> + break;
> + }
> + }
> + file->unsigned_8(Syncstream::Desync);
> + file->signed_32(playernumber);
> + // Restart buffers
> + syncwrapper_.current_excerpt_id_ = 0;
> +}
> +
> +/**
> * Calculate the current synchronization checksum and copy
> * it into the given array, without affecting the subsequent
> * checksumming process.
>
> === modified file 'src/logic/game.h'
> --- src/logic/game.h 2018-12-13 07:24:01 +
> +++ src/logic/game.h 2019-01-20 23:22:08 +
> @@ -63,6 +63,51 @@
> gs_ending
> };
>
> +// The entry types that are written to the syncstream
> +// The IDs are a number in the higher 4 bits and the length in bytes in the
> lower 4 bits
> +namespace Syncstream {
> + // game.cc Game::report_desync()
If you're getting a nightmare of static_cast calls, you can use an enum instead
of an enum class. Plain enum has no type safety vs. int, so you won't need to
cast.
> + // s32 id of desynced user, -1 when written on client
> + constexpr uint8_t Desync = 0x14;
> + // map_object.cc CmdDestroyMapObject::execute()
> + // u32 object serial
> + constexpr uint8_t DestroyObject = 0x24;
> + // economy.cc Economy::process_requests()
> + // u8 request type
> + // u8 request index
> + // u32 target serial
> + constexpr uint8_t ProcessRequests = 0x36;
> + // economy.cc Economy::handle_active_supplies()
> + // u32 assignments size
> + constexpr uint8_t HandleActiveSupplies = 0x44;
> + // request.cc Request::start_transfer()
> + // u32 target serial
> + // u32 source(?) serial
> + constexpr uint8_t StartTransfer = 0x58;
> + // cmd_queue.cc CmdQueue::run_queue()
> + // u32 duetime
> + // u32 command id
> + constexpr uint8_t RunQueue = 0x68;
> + // game.h Game::logic_rand_seed()
> + // u32 random seed
> + constexpr uint8_t RandomSeed = 0x74;
> + // game.cc Game::logic_rand()
> + // u32 random value
> + constexpr uint8_t Random = 0x84;
> + // map_object.cc CmdAct::execute()
> + // u32 object serial
> + constexpr uint8_t CmdAct = 0x94;
> + // battle.cc Battle::Battle()
> + // u32 first soldier serial
> + // u32 second soldier serial
> + constexpr uint8_t Battle = 0xA8;
> + // bob.cc Bob::set_position()
> + // u32 bob serial
> + // s16 position x
> + // s16 position y
> + constexpr uint8_t BobSetPosition = 0xB8;
> +}
> +
> class Player;
> class MapLoader;
> class PlayerCommand;
--
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 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://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/safeguard-multiplayer-messages into lp:widelands
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.launchpad.net/~widelands-dev/widelands/safeguard-multiplayer-messages/+merge/362942
This should make sure that we don't have desyncs when in multiplayer and
sending messages. Could potentially solve some desyncs in smugglers multiplayer
campaign.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/safeguard-multiplayer-messages into lp:widelands.
=== modified file 'data/scripting/ui.lua'
--- data/scripting/ui.lua 2019-01-27 18:57:30 +
+++ data/scripting/ui.lua 2019-02-09 15:53:48 +
@@ -181,8 +181,10 @@
--Sleeps while player is in roadbuilding mode.
--
function wait_for_roadbuilding()
- _await_animation()
- while (wl.ui.MapView().is_building_road) do sleep(2000) end
+ if wl.Game().type == "singleplayer" then
+ _await_animation()
+ while (wl.ui.MapView().is_building_road) do sleep(2000) end
+ end
end
=== modified file 'data/scripting/win_conditions/win_condition_functions.lua'
--- data/scripting/win_conditions/win_condition_functions.lua 2019-02-09 07:51:55 +
+++ data/scripting/win_conditions/win_condition_functions.lua 2019-02-09 15:53:48 +
@@ -108,7 +108,7 @@
function broadcast(plrs, header, msg, goptions)
local options = goptions or {}
for idx, p in ipairs(plrs) do
- p:send_message(header, msg, options)
+ send_message(p, header, msg, options)
end
end
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/bug-1807701_string_fixes_website into lp:widelands-website
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 proposed merge of lp:~widelands-dev/widelands-website/bug-1807701_string_fixes_website into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/bug-1807701_string_fixes_website into lp:widelands-website
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/361402 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/bug-1807701_string_fixes_website into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/deleted_user2 into lp:widelands-website
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 is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/reenable_wiki_edit_lock into lp:widelands-website
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 Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/mv_templates into lp:widelands-website
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 is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~mmrxyz/widelands/scenario_tutorial01_typo_fix into lp:widelands
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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] 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 requested to review the proposed merge of lp:~mmrxyz/widelands/scenario_tutorial01_typo_fix 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://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-better-syncstreams into lp:widelands
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 @@
> }
>
> /**
> + * Switches to the next part of the syncstream excerpt.
> + */
> +void Game::report_sync_request() {
> + syncwrapper_.current_excerpt_id_ = (syncwrapper_.current_excerpt_id_ +
> 1) % SyncWrapper::kExcerptSize;
> + syncwrapper_.excerpts_buffer_[syncwrapper_.current_excerpt_id_].clear();
> +}
> +
> +/**
> + * Triggers writing of syncstream excerpt and adds the playernumber of the
> desynced player
> + * to the stream.
> + * Playernumber should be negative when called by network clients
> + */
> +void Game::report_desync(int32_t playernumber) {
> + std::string filename = syncwrapper_.dumpfname_;
> + filename.replace(filename.length() - kSyncstreamExtension.length(),
> kSyncstreamExtension.length(), kSyncstreamExcerptExtension);
That function is also stripping the directory from the path, so I would have to
add it again as well. Do you want me to do so? Using that function might be a
bit easier to read, apart from that I don't see any advantage.
> + std::unique_ptr file(g_fs->open_stream_write(filename));
> + assert(file != nullptr);
> + // Write revision, branch and build type of this build to the file
> + file->unsigned_32(build_id().length());
> + file->text(build_id());
> + file->unsigned_32(build_type().length());
> + file->text(build_type());
> + file->signed_32(playernumber);
> + // Write our buffers to the file. Start with the oldest one
> + const size_t i2 = (syncwrapper_.current_excerpt_id_ + 1) %
> SyncWrapper::kExcerptSize;
> + size_t i = i2;
> + for (;;) {
> + file->text(syncwrapper_.excerpts_buffer_[i]);
> + syncwrapper_.excerpts_buffer_[i].clear();
> + i = (i + 1) % SyncWrapper::kExcerptSize;
> + if (i == i2) {
Right... I totally forgot about this loop type, thanks!
> + break;
> + }
> + }
> + file->unsigned_8(Syncstream::Desync);
> + file->signed_32(playernumber);
> + // Restart buffers
> + syncwrapper_.current_excerpt_id_ = 0;
> +}
> +
> +/**
> * Calculate the current synchronization checksum and copy
> * it into the given array, without affecting the subsequent
> * checksumming process.
>
> === modified file 'src/logic/game.h'
> --- src/logic/game.h 2018-12-13 07:24:01 +
> +++ src/logic/game.h 2019-01-20 23:22:08 +
> @@ -63,6 +63,51 @@
> gs_ending
> };
>
> +// The entry types that are written to the syncstream
> +// The IDs are a number in the higher 4 bits and the length in bytes in the
> lower 4 bits
> +namespace Syncstream {
> + // game.cc Game::report_desync()
I would like to have an enum, but that would result in explicit static_cast's
each time one of these values is written to the syncstream, so I decided
against it. Do you want me to change it?
> + // s32 id of desynced user, -1 when written on client
> + constexpr uint8_t Desync = 0x14;
> + // map_object.cc CmdDestroyMapObject::execute()
> + // u32 object serial
> + constexpr uint8_t DestroyObject = 0x24;
> + // economy.cc Economy::process_requests()
> + // u8 request type
> + // u8 request index
> + // u32 target serial
> + constexpr uint8_t ProcessRequests = 0x36;
> + // economy.cc Economy::handle_active_supplies()
> + // u32 assignments size
> + constexpr uint8_t HandleActiveSupplies = 0x44;
> + // request.cc Request::start_transfer()
> + // u32 target serial
> + // u32 source(?) serial
> + constexpr uint8_t StartTransfer = 0x58;
> + // cmd_queue.cc CmdQueue::run_queue()
> + // u32 duetime
> + // u32 command id
> + constexpr uint8_t RunQueue = 0x68;
> + // game.h Game::logic_rand_seed()
> + // u32 random seed
> + constexpr uint8_t RandomSeed = 0x74;
> + // game.cc Game::logic_rand()
> + // u32 random value
> + constexpr uint8_t Random = 0x84;
> + // map_object.cc CmdAct::execute()
> + // u32 object serial
> + constexpr uint8_t CmdAct = 0x94;
> + // battle.cc Battle::Battle()
> + // u32 first soldier serial
> + // u32 second soldier serial
> + constexpr uint8_t Battle = 0xA8;
> + // bob.cc Bob::set_position()
> + // u32 bob serial
> + // s16 position x
> + // s16 position y
> + constexpr uint8_t BobSetPosition = 0xB8;
> +}
> +
> class Player;
> class MapLoader;
> class PlayerCommand;
--
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 lp:widelands.
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1808169-disable-focus into lp:widelands
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 is subscribed to branch lp:~widelands-dev/widelands/bug-1808169-disable-focus. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1800364-reset-economy-counter into lp:widelands
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 Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1800364-reset-economy-counter. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1800364-reset-economy-counter into lp:widelands
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_1800364_reset_economy_counter-4218. -- 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-counter. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1805325-joining-lan-games into lp:widelands
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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1796364-blinking-buildings into lp:widelands
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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1808169-disable-focus into lp:widelands
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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1808169-disable-focus into lp:widelands
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 team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1808169-disable-focus. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/json_writer into lp:widelands
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:~widelands-dev/widelands/json_writer. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1807701_translate_update_authors into lp:widelands
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 team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1807701_translate_update_authors. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/reenable_wiki_edit_lock into lp:widelands-website
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-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1800364-reset-economy-counter into lp:widelands
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 team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1800364-reset-economy-counter. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/json_writer into lp:widelands
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 Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/json_writer. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1810062-territorial-calculations into lp:widelands
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 though once it has been well-tested. I have a slow machine to test the performance of the current state. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1810062-territorial-calculations/+merge/361366 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1810062-territorial-calculations 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://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/json_writer into lp:widelands
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:~widelands-dev/widelands/json_writer. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1807701_translate_update_authors into lp:widelands
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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/user-status-lobby into lp:widelands
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 review the proposed merge of lp:~widelands-dev/widelands/user-status-lobby 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://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1800364-reset-economy-counter into lp:widelands
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-reset-economy-counter/+merge/362938 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1800364-reset-economy-counter. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/user-status-lobby into lp:widelands
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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/territorial_unify_notifications 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 2019-01-27
> 15:18:27 +
> +++ data/scripting/win_conditions/win_condition_functions.lua 2019-02-04
> 21:32:17 +
> @@ -237,3 +237,61 @@
> table.sort(ranked_players_and_teams, function(a,b) return a["points"] >
> b["points"] end)
> return ranked_players_and_teams
> end
> +
> +-- RST
> +-- .. function:: format_remaining_time(remaining_time)
> +--
> +--return a message that contains the remaining game time
> +--to be used when sending status meassages
> +--
> +--:arg remaining_time:The remaining game time in minutes
> +function format_remaining_time(remaining_time)
> + local h = 0
> + local m = 60
> + local time = ""
> + set_textdomain("win_conditions")
> +
> + if (remaining_time ~= 60) then
> + h = math.floor(remaining_time / 60)
> + m = remaining_time % 60
> + end
> +
> + if ((h > 0) and (m > 0)) then
> + -- TRANSLATORS: Context: 'The game will end in 2 hours and 30 minutes.'
> + time = (ngettext("%1% hour and %2% minutes", "%1% hours and %2%
> minutes", h, m)):bformat(h, m)
While we're reworking this, we need a separate ngettext call for the "minutes"
part too. So, this string needs splitting up with a placeholder.
> + elseif m > 0 then
> + -- TRANSLATORS: Context: 'The game will end in 30 minutes.'
> + time = (ngettext("%i minute", "%i minutes", m)):format(m)
> + else
> + -- TRANSLATORS: Context: 'The game will end in 2 hours.'
> + time = (ngettext("%1% hour", "%1% hours", h)):bformat(h)
> + end
> + -- TRANSLATORS: Context: 'The game will end in (2 hours and) 30 minutes.'
> + return p(_"The game will end in %s."):format(time)
> +end
> +
> +-- RST
> +-- .. function:: notification_remaining_time(max_time)
> +--
> +--Calculate the remaining game time for notifications.
> +--Should only be called within a coroutine, because the routine gets
> blocked.
> +--Returns the remaining time and whether the notification should popup.
> +--
> +--To be used when sending status messages.
> +--Status messages are to be send every 30 minutes and every 5 during the
> last 30 minutes,
send -> sent
> +--the message window pops up ever hour, 30, 20 & 10 minutes before the
> game ends.
> +--
> +--:arg max_time:The time maximum game time in minutes
> +function notification_remaining_time(max_time, remaining_time)
> + local show_popup = false
> + if (wl.Game().time < ((max_time - 30) * 60 * 1000)) then --
> + wake_me(wl.Game().time + (30 * 60 * 1000)) -- 30 minutes
> + remaining_time = remaining_time - 30
> + if (remaining_time % 60 == 0) or (remaining_time == 30) then
> show_popup = true end
> + else
> + wake_me(wl.Game().time + (300 * 1000)) --5 Minutes
> + remaining_time = remaining_time - 5
> + if ((remaining_time ~= 0) and (remaining_time % 10 == 0)) then
> show_popup = true end
> + end
> + return remaining_time, show_popup
> +end
> \ No newline at end of file
--
https://code.launchpad.net/~widelands-dev/widelands/territorial_unify_notifications/+merge/362502
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/territorial_unify_notifications 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://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/robust-file-saving into lp:widelands
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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1800364-reset-economy-counter into lp:widelands
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-counter. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~mmrxyz/widelands/scenario_tutorial01_typo_fix into lp:widelands
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_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.
=== modified file 'data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua'
--- data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua 2018-08-13 16:44:58 +
+++ data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua 2019-02-09 09:06:26 +
@@ -237,7 +237,7 @@
title = _"How to Build a Quarry",
body = (
p(_[[Build a quarry next to those rocks here. Remember how I did it earlier?]]) ..
- p(_[[Make sure that you are showing the building spaces, then just click on the space were you want the building to be, choose it from the window that appears, and it is placed. Maybe this is a good time to explain about all those building space symbols we activated earlier.]]) ..
+ p(_[[Make sure that you are showing the building spaces, then just click on the space where you want the building to be, choose it from the window that appears, and it is placed. Maybe this is a good time to explain about all those building space symbols we activated earlier.]]) ..
p(_[[You can build four things on fields in Widelands: flags, small houses, medium houses and big houses. But not every field can hold everything. The build space symbols ease recognition:]]) ..
li_image("images/wui/overlays/big.png", _[[Everything can be built on the green house symbol.]]) ..
li_image("images/wui/overlays/medium.png", _[[Everything except for big buildings can be built on a yellow house symbol.]]) ..
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~mmrxyz/widelands/scenario_tutorial01_typo_fix into lp:widelands
@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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1805325-joining-lan-games 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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1800364-reset-economy-counter into lp:widelands
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/+merge/362938 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1800364-reset-economy-counter. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/workerwarehotspots into lp:widelands
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 to branch lp:~widelands-dev/widelands/workerwarehotspots. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/json_writer into lp:widelands
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 ;-) Please explain which website tools are actually affected. -- 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 list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1800364-reset-economy-counter into lp:widelands
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://bugs.launchpad.net/widelands/+bug/1800364
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1800364-reset-economy-counter/+merge/362938
This should fix some desyncs
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1800364-reset-economy-counter into lp:widelands.
=== modified file 'src/economy/economy.cc'
--- src/economy/economy.cc 2018-12-13 07:24:01 +
+++ src/economy/economy.cc 2019-02-09 08:50:46 +
@@ -43,6 +43,11 @@
Serial Economy::last_economy_serial_ = 0;
+void Economy::initialize_serial() {
+ log("Initializing economy serial\n");
+ last_economy_serial_ = 0;
+}
+
Economy::Economy(Player& player) : Economy(player, last_economy_serial_++) {
}
=== modified file 'src/economy/economy.h'
--- src/economy/economy.h 2018-12-13 07:24:01 +
+++ src/economy/economy.h 2019-02-09 08:50:46 +
@@ -91,6 +91,9 @@
public:
friend class EconomyDataPacket;
+ // Initialize the global serial on game start
+ static void initialize_serial();
+
/// Configurable target quantity for the supply of a ware type in the
/// economy.
///
=== modified file 'src/logic/game.cc'
--- src/logic/game.cc 2018-12-13 07:24:01 +
+++ src/logic/game.cc 2019-02-09 08:50:46 +
@@ -134,6 +134,7 @@
/** TRANSLATORS: Win condition for this game has not been set. */
win_condition_displayname_(_("Not set")),
replay_(false) {
+ Economy::initialize_serial();
}
Game::~Game() {
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/workerwarehotspots into lp:widelands
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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/json_writer into lp:widelands
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 list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
