[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1774591-loading-screen-tips into lp:widelands
Continuous integration builds have changed state: Travis build 3833. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/419064487. Appveyor build 3632. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1774591_loading_screen_tips-3632. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1774591-loading-screen-tips/+merge/353556 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1774591-loading-screen-tips 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-1784122-singleplayer-viewport into lp:widelands
*with a debug build, sorry. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1784122-singleplayer-viewport/+merge/353391 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1784122-singleplayer-viewport. ___ 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-1784122-singleplayer-viewport into lp:widelands
That bug is really fun but the streamreader isn't to blame. ;-) The problem is that the float_32() call not only returns the value but also modifies the internal state of the stream. As a consequence, the order of assignment to x and y matters (or more precisely, the order in which the respective float_32() calls are made). It seems as if calling it twice as constructor parameters results in the *second* call being done first, resulting in x and y being swapped after the assignment. Doing only one call as parameter and assigning the other one later on is fine. Or just assign both later on as in this branch. Took me quite some time of trial until I realized that... I am using gcc version 8.2.0 with a release build. The order of the evaluation is undefined in the standard, so it might indeed be compiler dependent. The null-assignment is required since the default constructor is deleted. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1784122-singleplayer-viewport/+merge/353391 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1784122-singleplayer-viewport. ___ 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/multiplayer-ui into lp:widelands
Continuous integration builds have changed state: Travis build 3831. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/419041575. Appveyor build 3630. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_multiplayer_ui-3630. -- https://code.launchpad.net/~widelands-dev/widelands/multiplayer-ui/+merge/353523 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/multiplayer-ui. ___ 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/multiplayer-ui into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/multiplayer-ui into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/multiplayer-ui/+merge/353523 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/multiplayer-ui. ___ 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-1784122-singleplayer-viewport into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1784122-singleplayer-viewport into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1784122-singleplayer-viewport/+merge/353391 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1784122-singleplayer-viewport. ___ 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-1784122-singleplayer-viewport into lp:widelands
> That code should be semantically identical? That's what I thought too when I broke it. I really don't want to dig into the streamreader right now though - there is some subtle unexpected side-effect going on there. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1784122-singleplayer-viewport/+merge/353391 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1784122-singleplayer-viewport. ___ 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/skipped_statistics into lp:widelands
Review: Disapprove -- https://code.launchpad.net/~widelands-dev/widelands/skipped_statistics/+merge/353552 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped. ___ 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/skipped_statistics into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/skipped_statistics into lp:widelands has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/skipped_statistics/+merge/353552 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/skipped_statistics 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-1774591-loading-screen-tips into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1774591-loading-screen-tips into lp:widelands. Commit message: Fix horizontal centering for game tips. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1774591 in widelands: "Center game/editor tips" https://bugs.launchpad.net/widelands/+bug/1774591 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1774591-loading-screen-tips/+merge/353556 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1774591-loading-screen-tips into lp:widelands. === modified file 'src/graphic/text/rt_render.cc' --- src/graphic/text/rt_render.cc 2018-05-27 06:11:04 + +++ src/graphic/text/rt_render.cc 2018-08-22 07:57:35 + @@ -1443,6 +1443,9 @@ uint8_t p = a["padding"].get_int(); padding.left = padding.top = padding.right = padding.bottom = p; } + // TODO(GunChleoc): padding_l and padding_r don't seem to produce balanced results. + // We ran into that with the game tips, + // using "" there. if (a.has("padding_r")) padding.right = a["padding_r"].get_int(); if (a.has("padding_b")) === modified file 'src/graphic/text_layout.cc' --- src/graphic/text_layout.cc 2018-07-28 07:02:25 + +++ src/graphic/text_layout.cc 2018-08-22 07:57:35 + @@ -75,9 +75,7 @@ std::string as_game_tip(const std::string& txt) { static boost::format f( - "" - "%s"); - + "%s"); f % txt; return f.str(); } === modified file 'src/wui/game_tips.cc' --- src/wui/game_tips.cc 2018-07-08 13:53:45 + +++ src/wui/game_tips.cc 2018-08-22 07:57:35 + @@ -32,6 +32,8 @@ #define BG_IMAGE "images/loadscreens/tips_bg.png" +constexpr int kTextPadding = 48; + GameTips::GameTips(UI::ProgressWindow& progressWindow, const std::vector& names) : lastUpdated_(0), updateAfter_(0), @@ -108,7 +110,7 @@ rt.blit(pt, pic_background); std::shared_ptr rendered_text = - UI::g_fh->render(as_game_tip(tips_[index].text), w); + UI::g_fh->render(as_game_tip(tips_[index].text), w - 2 * kTextPadding); pt = Vector2i((g_gr->get_xres() - rendered_text->width()) / 2, (g_gr->get_yres() - rendered_text->height()) / 2); rendered_text->draw(rt, pt); ___ 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/multiplayer-ui into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/multiplayer-ui into lp:widelands has been updated. Commit message changed to: Multiplayer-ui tweaks: less empty spaces and more space for important content. - chat has more space - map_info scales better - client_info has no height restriction For more details, see: https://code.launchpad.net/~widelands-dev/widelands/multiplayer-ui/+merge/353523 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/multiplayer-ui 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/multiplayer-ui into lp:widelands
Review: Approve LGTM :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/multiplayer-ui/+merge/353523 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/multiplayer-ui. ___ 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-1784122-singleplayer-viewport into lp:widelands
Now I am confused. That code should be semantically identical? As peformance optimizer I see the the extra null-assignement is a waste :-) Can you add a comment what compiler/enviroment causes this problem? I tested this in bzr8791[trunk] and it was ok for me. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1784122-singleplayer-viewport/+merge/353391 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1784122-singleplayer-viewport. ___ 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/skipped_statistics into lp:widelands
Toni Förster has proposed merging lp:~widelands-dev/widelands/skipped_statistics into lp:widelands with lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped as a prerequisite. Commit message: skipping a work program decreases productivity accordingly Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/skipped_statistics/+merge/353552 I mentioned this in the forum: http://wl.widelands.org/forum/topic/4323/ This branch requires that we use the return=no_stats instead of return=skipped for suppressing the calculation of productivity stats. Which is the prerequisite branch for this one. The current implementation just stalls the productivity. E.g. 40+ if this was the last updated value. This change basically decrease the productivity for a building, and subsequently the global productivity, if the economy doesn't need the wares the building produces. Furthermore a building that creates more than on ware will only reach 100% productivity if it produces all wares. The barbarian's metal-workshop for instance produces 10 wares in total. It would only reach 100% is it produces all 10. If 5 wares would not be needed anymore the productivity would decrease to 50% and stays there as long as only 5 wares a produced. This would be displayed as "50% =". If the building the would start producing a sixth ware the productivity the would climb up to 60%. And so on.. There are still other parts that needs to be fixed though. Since productivity values that are not divisible by 5 or 10 are not displayed correctly. E.g. the barbarians big inn productivity would jump between 30% and 35% since 33% cant be displayed. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/skipped_statistics into lp:widelands. === modified file 'src/logic/map_objects/tribes/production_program.h' --- src/logic/map_objects/tribes/production_program.h 2018-08-22 06:58:39 + +++ src/logic/map_objects/tribes/production_program.h 2018-08-22 06:58:40 + @@ -127,9 +127,10 @@ /// Parameter semantics: ///return_value: /// If return_value is Failed or Completed, the productionsite's - /// statistics is updated accordingly. If return_value is Skipped or - /// None, the statistics are not affected. But Skipped adds a 10s delay - /// before the program is executed again. + /// statistics is updated accordingly. If return_value is None, the + /// statistics are not affected. Skipped adds a 10s delay before + /// the program is executed again and updates the statistics + /// of the productionsite accordingly. ///condition: /// A boolean condition that can be evaluated to true or false. ///condition_part: === modified file 'src/logic/map_objects/tribes/productionsite.cc' --- src/logic/map_objects/tribes/productionsite.cc 2018-08-22 06:58:39 + +++ src/logic/map_objects/tribes/productionsite.cc 2018-08-22 06:58:40 + @@ -938,6 +938,9 @@ break; case Skipped: skipped_programs_[program_name] = game.get_gametime(); + statistics_.erase(statistics_.begin(), statistics_.begin() + 1); + statistics_.push_back(false); + calc_statistics(); crude_percent_ = crude_percent_ * 98 / 100; break; case None: ___ 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/fix_osx_nightlies into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/fix_osx_nightlies into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_osx_nightlies/+merge/353456 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_osx_nightlies. ___ 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