Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/render_queue into lp:widelands
On windows the only glitch i can see are the road textures. Switching from/to fullscreen, menues, everything else seems fine! -- https://code.launchpad.net/~widelands-dev/widelands/render_queue/+merge/250524 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/render_queue. ___ 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:~hjd/widelands/tests-poc into lp:~widelands-dev/widelands/debian
(This presumably failed to build because this branch isn't intended for merging into the main one, in case anyone were wondering) -- https://code.launchpad.net/~hjd/widelands/tests-poc/+merge/250533 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/tests-poc into lp:~widelands-dev/widelands/debian. ___ 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/request_supply_opt into lp:widelands
Review: Approve LGTM. I cannot really quantify the performance gain, but i did not find any regression. -- https://code.launchpad.net/~widelands-dev/widelands/request_supply_opt/+merge/280193 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/request_supply_opt. ___ 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] Bunnybot says...
Travis build 101 has changed state to: passed. Details: https://travis-ci.org/widelands/widelands/builds/99640935. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1526903/+merge/281410 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1526903. ___ 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] Bunnybot says...
Travis build 118 has changed state to: failed. Details: https://travis-ci.org/widelands/widelands/builds/99729706. -- https://code.launchpad.net/~widelands-dev/widelands/logic_directory_layout/+merge/280354 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/logic_directory_layout 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] Bunnybot says...
Travis build 166 has changed state to: passed. Details: https://travis-ci.org/widelands/widelands/builds/99877556. -- https://code.launchpad.net/~widelands-dev/widelands/ai_ship_tweaks/+merge/280192 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_ship_tweaks. ___ 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] Bunnybot says...
Travis build 121 has changed state to: failed. Details: https://travis-ci.org/widelands/widelands/builds/99770120. -- https://code.launchpad.net/~widelands-dev/widelands/table_align/+merge/279685 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/table_align 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] Bunnybot says...
Travis build 162 has changed state to: errored. Details: https://travis-ci.org/widelands/widelands/builds/99874912. -- https://code.launchpad.net/~widelands-dev/widelands/request_supply_opt/+merge/280193 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/request_supply_opt. ___ 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] Bunnybot says...
Travis build 122 has changed state to: failed. Details: https://travis-ci.org/widelands/widelands/builds/99778652. -- https://code.launchpad.net/~widelands-dev/widelands/map_compatibility/+merge/276088 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/map_compatibility 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] Bunnybot says...
Travis build 124 has changed state to: failed. Details: https://travis-ci.org/widelands/widelands/builds/99784765. -- https://code.launchpad.net/~hjd/widelands/tests-poc/+merge/250533 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/tests-poc into lp:~widelands-dev/widelands/debian. ___ 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] Bunnybot says...
Travis build 123 has changed state to: failed. Details: https://travis-ci.org/widelands/widelands/builds/99784763. -- https://code.launchpad.net/~widelands-dev/widelands/split_overlay_manager/+merge/254496 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/split_overlay_manager into lp:~widelands-dev/widelands/render_queue. ___ 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] Bunnybot says...
Travis build 167 has changed state to: passed. Details: https://travis-ci.org/widelands/widelands/builds/99877641. -- https://code.launchpad.net/~widelands-dev/widelands/render_queue/+merge/250524 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/render_queue. ___ 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] Bunnybot says...
Travis build 126 has changed state to: failed. Details: https://travis-ci.org/widelands/widelands/builds/99797556. -- https://code.launchpad.net/~widelands-dev/widelands/find_attack_soldiers/+merge/245276 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/find_attack_soldiers. ___ 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] Bunnybot says...
Travis build 127 has changed state to: failed. Details: https://travis-ci.org/widelands/widelands/builds/99803809. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1397500. ___ 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/request_supply_opt into lp:widelands
Review: Needs Fixing I think this is broken in the current state. The problem is that logic depends on available_supply which is a multimap. The problem is that the map is sorted by distance, then by a pointer. In a replay or in a multiplayer games, the order of elements in this map is different, yielding therefore different routing results. This will desync the game. Change the ordering to use a tie-breaker, for example the game object id before the pointer. -- https://code.launchpad.net/~widelands-dev/widelands/request_supply_opt/+merge/280193 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/request_supply_opt. ___ 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] Bunnybot says...
Travis build 162 has changed state to: passed. Details: https://travis-ci.org/widelands/widelands/builds/99874912. -- https://code.launchpad.net/~widelands-dev/widelands/request_supply_opt/+merge/280193 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/request_supply_opt. ___ 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/request_supply_opt into lp:widelands
@SirVer What about: std::multimap<, Supply*> available_supplies; Where is , serial should be the same across the network clients, I presume... -- https://code.launchpad.net/~widelands-dev/widelands/request_supply_opt/+merge/280193 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/request_supply_opt. ___ 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/request_supply_opt into lp:widelands
That should work - but I would suggest to make a tiny private struct to improve
readability.
struct SupplyQuality {
uint32 distance;
uint32 serial;
bool operator<(const SupplyQuality& other) const {
return std::forward_as_tuple(distance, serial) <
std::forward_as_tuple(other.distance, other.serial);
}
}
--
https://code.launchpad.net/~widelands-dev/widelands/request_supply_opt/+merge/280193
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/request_supply_opt.
___
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/request_supply_opt into lp:widelands
Well I am not that skillful in C++, I want(ed) to use trivial:
bool operator() (const uint32_t & p1, const uint32_t & p2) const {
return p1.distance == p2.distance ? p1.serial < p2.serial :
p1.distance < p2.distance;
}
(not tested of course)
--
https://code.launchpad.net/~widelands-dev/widelands/request_supply_opt/+merge/280193
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/request_supply_opt.
___
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/request_supply_opt into lp:widelands
Oh, I just read about comparison of tuples, so I understand your example now, thanks.. -- https://code.launchpad.net/~widelands-dev/widelands/request_supply_opt/+merge/280193 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/request_supply_opt. ___ 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
