The proposal to merge
lp:~widelands-dev/widelands/bug-1732765-economy-refactoring into lp:widelands
has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1732765-economy-refactoring/+merge/345277
--
Your t
@bunnybot merge force
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1732765-economy-refactoring/+merge/345277
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1732765-economy-refactoring.
___
Mailing
Refusing to merge, since Travis is not green. Use @bunnybot merge force for
merging anyways.
Travis build 3658. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/402567175.
--
Continuous integration builds have changed state:
Travis build 3658. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/402567175.
Appveyor build 3457. State: failed. Details:
Transient failure on Travis
@bunnybot merge force
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1732765-economy-refactoring/+merge/345277
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1732765-economy-refactoring.
We only have 1 bug left now with a savegame that's needed:
https://bugs.launchpad.net/widelands/+bug/1678987
So, let's have this branch now to give it some more testing exposure.
@bunnybot merge
--
Continuous integration builds have changed state:
Travis build 3624. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/400510697.
Appveyor build 3423. State: success. Details:
Continuous integration builds have changed state:
Travis build 3623. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/399752394.
Appveyor build 3422. State: success. Details:
My Bad, was playing Singleplayer/Frisians for too long.
this was a multiplay game. Looks I will create the next
Youtube video tomorrow, then.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1732765-economy-refactoring/+merge/345277
Your team Widelands Developers is subscribed to
There are 3 packets that have changed version - I have added comments to the
diff so that you can find them. Savegames from other branches will be
incompatible with this one.
Diff comments:
>
> === modified file 'src/game_io/game_player_economies_packet.cc'
> ---
Uhm I checked ~/.widelands/save, my save files are there,
where is that code to check the file versions?
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1732765-economy-refactoring/+merge/345277
Your team Widelands Developers is subscribed to branch
I tried to load some old savegame (for my youtube channel) but it failed to
display
the correct files, loading the other files failed, of course.
I assume some versioncheck was lost during the latest merge?
I will merge trunk again now
--
We still have some crash reports with attached savegames. I'd like those to be
sorted out first before merging this branch, because they will become
unreproducible once this branch hits trunk.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1732765-economy-refactoring/+merge/345277
Continuous integration builds have changed state:
Travis build 3575. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/387075948.
Appveyor build 3378. State: success. Details:
> * As Serial is uint32_t so we have 2^32 different Economies, ok
> Should we do some stress testing with a Mutiplayergame
placing and removing flags and roads like mad?
> We could run this some more to see if we ever hit the limit
If by testing the limit you mean the number 2^32, this is
Any Codechecker around?
I think I fixed it but _some_ compilers still dont like me?
Why is it that differetn with some compilers?
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1732765-economy-refactoring/+merge/345277
Your team Widelands Developers is subscribed to branch
Continuous integration builds have changed state:
Travis build 3574. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/387006015.
Appveyor build 3377. State: success. Details:
Review: Approve
Got a conflcit merging test/maps/plain.wmf/scripting/test_campaign_data.lua.
I used the versison from trunk, but actually there was no difference.
Regression tests: Ran 42 tests in 1125.653s
We should get his in soon now, merging can become difficult.
And this is (?) the last
I have had 8 AIs battle it out on Ice Wars for 100+ hours and have attached the
savegame to the bug. We could run this some more to see if we ever hit the limit
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1732765-economy-refactoring/+merge/345277
Your team Widelands Developers is
Review: Approve
Played this now for about 30 Minutes again, did not notice any Problems.
Ran the regression tests: Ran 41 tests in 739.863s,
all fine.
GUn: I will leave it up to you to merge this,
it will for sure break savegames.
Should we do some stress testing with a Mutiplayergame
placing
pers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1732765-economy-refactoring into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad
only
> + void remove_economy(Serial serial);
> + const std::map<Serial, std::unique_ptr>& economies() const;
Good point, we should try this.
> + Economy* get_economy(Widelands::Serial serial) const;
> + bool has_economy(Widelands::Serial serial) const;
&g
-refactoring/+merge/345277
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1732765-economy-refactoring into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post
://code.launchpad.net/~widelands-dev/widelands/bug-1732765-economy-refactoring/+merge/345277
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1732765-economy-refactoring into lp:widelands.
___
Mailing list: https
d::unique_ptr>& economies() const;
Why not unordered_map, I do not think we need range iteration?
"unordered_map containers are faster than map containers to access individual
elements by their key, although they are generally less efficient for range
iteration through a subset of their
/_widelands_dev_widelands_bug_1732765_economy_refactoring-3311.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1732765-economy-refactoring/+merge/345277
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1732765-economy-refactoring into lp:widelands
/_widelands_dev_widelands_bug_1732765_economy_refactoring-3302.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1732765-economy-refactoring/+merge/345277
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1732765-economy-refactoring into lp:widelands
have interesting savegames attached before merging this.
Implementing compatibility would be very complicated.
We used to have economy numbers per player, now we have 1 global serial number.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1732765-e
-economy-refactoring/+merge/345277
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1732765-economy-refactoring into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post
Oops, found a failing test
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1732765-economy-refactoring/+merge/345277
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1732765-economy-refactoring into lp:widelands
The proposal to merge
lp:~widelands-dev/widelands/bug-1732765-economy-refactoring into lp:widelands
has been updated.
Status: Needs review => Work in progress
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1732765-economy-refactoring/+merge/345277
--
Y
Do you want it in Build 20?
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1732765-economy-refactoring/+merge/345277
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1732765-economy-refactoring into lp:widelands
have interesting savegames attached before merging this.
Implementing compatibility would be very complicated.
We used to have economy numbers per player, now we have 1 global serial number.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1732765-e
33 matches
Mail list logo
