Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/doc_type_name into lp:widelands

2017-08-04 Thread SirVer
Ups, sorry for this. :( -- https://code.launchpad.net/~widelands-dev/widelands/doc_type_name/+merge/328006 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/doc_type_name. ___ Mailing list: https://launchpad.net/~widela

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/doc_type_name into lp:widelands

2017-08-04 Thread SirVer
This is a test, please ignore. -- https://code.launchpad.net/~widelands-dev/widelands/doc_type_name/+merge/328006 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/doc_type_name. ___ Mailing list: https://launchpad.net/

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1705771 into lp:widelands

2017-07-28 Thread SirVer
I manually merged this one since I could not fix bunnybot quickly. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1705771/+merge/328122 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1705771. ___ Mai

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1705771 into lp:widelands

2017-07-28 Thread SirVer
Bunnybot choked on this branch. Investigating right now. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1705771/+merge/328122 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1705771. ___ Mailing list:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1705771 into lp:widelands

2017-07-27 Thread SirVer
Review: Approve @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1705771/+merge/328122 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1705771. ___ Mailing list: https://launchpad.net/~w

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-relay into lp:widelands

2017-07-24 Thread SirVer
Diff comments: > > === added file 'src/network/relay_protocol.h' > --- src/network/relay_protocol.h 1970-01-01 00:00:00 + > +++ src/network/relay_protocol.h 2017-07-16 12:04:39 + > @@ -0,0 +1,215 @@ > +/* > + * Copyright (C) 2012-2017 by the Widelands Development Team > + * >

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/00_private_inheritance into lp:widelands

2017-07-07 Thread SirVer
Thanks for the review! @bunnybot merge Diff comments: > > === modified file 'src/logic/cmd_luacoroutine.cc' > --- src/logic/cmd_luacoroutine.cc 2017-01-25 18:55:59 + > +++ src/logic/cmd_luacoroutine.cc 2017-07-05 21:50:35 + > @@ -51,11 +53,11 @@ > log("%s\n", e.wha

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/00_private_inheritance into lp:widelands

2017-07-05 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/00_private_inheritance into lp:widelands. Commit message: - Replace private inheritance with composition everywhere. - Add a lint to forbid private inheritance. - Use std::unique_ptr<> in more places to signify passing or having own

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/00_private_inheritance into lp:widelands

2017-07-05 Thread SirVer
This was the cleanup I originally intended to do when I ran into doc issues and failing tests in the lint suite. These are all refactorings to make the code smell better. -- https://code.launchpad.net/~widelands-dev/widelands/00_private_inheritance/+merge/326886 Your team Widelands Developers is

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-986611-cppcheck-uninitialized-variables into lp:widelands

2017-07-04 Thread SirVer
Review: Needs Fixing Diff comments: > > === modified file 'src/base/md5.h' > --- src/base/md5.h2017-01-25 18:55:59 + > +++ src/base/md5.h2017-06-28 08:25:35 + > @@ -74,7 +74,7 @@ > */ > template class MD5Checksum : public Base { > public: > - MD5Checksum() { > + MD

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/mathjax_for_documentation into lp:widelands-website

2017-07-04 Thread SirVer
Review: Approve Thanks! There is no harm in merging this right-away, it is not user visible unless mathjax is actually used. -- https://code.launchpad.net/~widelands-dev/widelands-website/mathjax_for_documentation/+merge/326800 Your team Widelands Developers is subscribed to branch lp:widelands-

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/codecheck into lp:widelands

2017-07-04 Thread SirVer
> I've made a website-branch to fix displaying of formulas when switching to > mathjax: > https://code.launchpad.net/~widelands-dev/widelands-website/mathjax_for_documentation Thanks! I think mathjax is a better solution for typesetting formulas (I switched my personal blog also from images to m

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/compiler_warnings_062017_windows into lp:widelands

2017-07-03 Thread SirVer
Review: Approve travis lgtm - no new warnings that I could see. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/compiler_warnings_062017_windows/+merge/326232 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/compiler_warnings_062017_windo

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/codecheck into lp:widelands

2017-07-03 Thread SirVer
> Nice intiative :) Thanks, but this also scratches two concrete itches I had: 1) I added a new lint in another branch and found out that you cannot reliably run the lint tests anymore because some fail. 2) Errors in the docs trigger an email per hour that ends up in my inbox. There are current

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/codecheck into lp:widelands

2017-07-03 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/codecheck into lp:widelands has been updated. Commit Message changed to: Test more on travis - Enable building documentation with warnings as errors on travis. - Enable running running the test suite of our lints on travis. - Remove dynamic_cast

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/codecheck into lp:widelands

2017-07-03 Thread SirVer
Okay, this is ready for review now. -- https://code.launchpad.net/~widelands-dev/widelands/codecheck/+merge/326647 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/codecheck into lp:widelands. ___

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/codecheck into lp:widelands

2017-07-03 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/codecheck into lp:widelands has been updated. Commit Message changed to: Test more on travis - Enable building documentation with warnings as errors on travis. - Enable running running the test suite of our lints on travis. - Remove dynamic_cast

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/codecheck into lp:widelands

2017-07-02 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/codecheck into lp:widelands. Commit message: Enable building documentation with nit-picky warnings as errors on travis. Enable running running the test suite of our lints on travis. Requested reviews: Widelands Developers (widelands-dev

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/codecheck into lp:widelands

2017-07-02 Thread SirVer
This is not yet for review. I want to see this fail on travis before fixing the errors. -- https://code.launchpad.net/~widelands-dev/widelands/codecheck/+merge/326647 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/codecheck into lp:widelan

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-internetgaming-ipv6 into lp:widelands

2017-07-01 Thread SirVer
Let's do it. I wasn't sure if you were happy. You know that you can tell bunnybot to merge as well, right? @bunnybot merge > Am 01.07.2017 um 08:37 schrieb Notabilis : > > Is there anything left that should be done? Otherwise I would say lets merge > this. > -- > https://code.launchpad.net/~

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands

2017-06-30 Thread SirVer
Review: Approve @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/326266 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list: https://launchpad.net/

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-internetgaming-ipv6 into lp:widelands

2017-06-29 Thread SirVer
Awesome! You led us into the future, notabilis! > Am 29.06.2017 um 23:18 schrieb Notabilis : > > Well, the 2 hours are over. ;) > I can successfully connect to the metaserver with IPv4 and IPv6. Thanks! > And the website is available per IPv6 now, too. > -- > https://code.launchpad.net/~wideland

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-internetgaming-ipv6 into lp:widelands

2017-06-29 Thread SirVer
> What is still missing is the record for widelands.org I found a setting where I could configure this in the strato config. Apparantly it takes ~2 hours to roll out, but after, it should work. -- https://code.launchpad.net/~widelands-dev/widelands/net-internetgaming-ipv6/+merge/326027 Yo

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-internetgaming-ipv6 into lp:widelands

2017-06-29 Thread SirVer
Review: Approve lgtm now. I also merged the metaserver branch on GitHub, relearned how to deploy the metaserver and did it. My understanding is that these changes can now be merged savely into trunk. I also went through stratos docs and found a way of enabling ipv6 for our server. It should no

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-internetgaming-ipv6 into lp:widelands

2017-06-25 Thread SirVer
Review: Approve Only some nits. I reviewed the metaserver branch on GitHub. Diff comments: > > === modified file 'src/network/internet_gaming.cc' > --- src/network/internet_gaming.cc2017-06-04 16:01:13 + > +++ src/network/internet_gaming.cc2017-06-22 07:30:44 + > @@ -122,6 +130,

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-986611-cppcheck-explicit-constructors into lp:widelands

2017-06-25 Thread SirVer
Review: Approve This is a great change! I wish c++ would not have this implicit 'implicit' construct @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-986611-cppcheck-explicit-constructors/+merge/326255 Your team Widelands Developers is subscribed to branch lp:~wid

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/compiler_warnings_062017_windows into lp:widelands

2017-06-25 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/compiler_warnings_062017_windows/+merge/326232 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/compiler_warnings_062017_windows. ___ Mailing lis

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-986611-cppcheck-pass-by-reference into lp:widelands

2017-06-24 Thread SirVer
Review: Needs Fixing Diff comments: > > === modified file 'src/graphic/text/rt_render.cc' > --- src/graphic/text/rt_render.cc 2017-06-01 08:52:15 + > +++ src/graphic/text/rt_render.cc 2017-06-24 11:37:18 + > @@ -969,7 +969,7 @@ > public: > TagHandler(Tag& tag, >

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-986611-cppcheck-unused into lp:widelands

2017-06-24 Thread SirVer
Review: Approve more stuff can be removed, see inline comment. Diff comments: > > === modified file 'src/logic/editor_game_base.cc' > --- src/logic/editor_game_base.cc 2017-02-28 12:59:39 + > +++ src/logic/editor_game_base.cc 2017-06-23 17:42:19 + > @@ -419,31 +419,6 @@ >

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/00_soldier_control into lp:widelands

2017-06-24 Thread SirVer
/logic/map_objects/tribes/militarysite.cc 2017-06-19 07:06:15 > + > @@ -43,6 +43,114 @@ > > namespace Widelands { > > +// TODO(sirver): This method should probably return a const reference. remode the TODOs for now. > +std::vector MilitarySite::SoldierControl::pre

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai-post-b19-2 into lp:widelands

2017-06-23 Thread SirVer
drive by: I like this stack overflow for information about dynamic_cast<> cost: https://stackoverflow.com/questions/4050901/performance-of-dynamic-cast tl;dr: dynamic_cast<> is not crazy expensive, but if you can do without, great. It also is usually bad design if you require dynamic_cast<> - bu

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-metaserver/ipv6 into lp:widelands-metaserver

2017-06-20 Thread SirVer
Will try to review on the weekend! -- https://code.launchpad.net/~widelands-dev/widelands-metaserver/ipv6/+merge/326028 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-metaserver/ipv6 into lp:widelands-metaserver. _

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/00_soldier_control into lp:widelands

2017-06-19 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/00_soldier_control into lp:widelands. Commit message: Refactor SoldierControl to use composition instead of inheritance. The interface is still weird, but at least this gets rid of some DynamicCasts. It could potentially modify behavior

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/00_soldier_control into lp:widelands

2017-06-19 Thread SirVer
Please review carefully around upcast() and dynamic_cast<> changes. -- https://code.launchpad.net/~widelands-dev/widelands/00_soldier_control/+merge/325902 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/00_soldier_control into lp:widelands.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/compiler_warnings_062017 into lp:widelands

2017-06-17 Thread SirVer
Redoing the import yielded the exact same state in git as before. According to the git history, the "merged GUNs weak vtables change" deleted most files in the repository, though of course it did not according to bzr. I think this branch somehow triggered a bug in the git-bzr import script that

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/compiler_warnings_062017 into lp:widelands

2017-06-17 Thread SirVer
I am investigating the weirdness with travis right now. Looking at GitHub [1], the branch only contains partial data and claims to have deleted 37.000 files. Looking at the bzr diff between trunk and this branch shows a smaller diff - so my guess is that bunnybot did not do a good job importing

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gcc7 into lp:widelands

2017-06-13 Thread SirVer
qq: why not use__attribute__ ((fallthrough)); [1] to get rid of the warnings? This is slightly ugly - so we could hide it in a macro: #define FALLTHROUGH_INTENDED __attribute__ ((fallthrough)) This would make it explicit that we did intend for this to fall through. It should also be compat

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-boost-asio into lp:widelands

2017-06-03 Thread SirVer
Sorry for that. Bunnybot did not restart after a computer reboot and I did not even notice the computer rebooted. Should work now again. -- https://code.launchpad.net/~widelands-dev/widelands/net-boost-asio/+merge/324364 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/w

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/remove_namespace_std into lp:widelands

2017-05-31 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/remove_namespace_std into lp:widelands. Commit message: Wanted to remove 'using namespace std;' in all places where it was only for convenience. Turns out there were no non-lazy uses. A tiny cleanup to make clearer in plac

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/warehouse_refactor into lp:widelands

2017-05-21 Thread SirVer
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/warehouse_refactor/+merge/324367 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/warehouse_refactor. ___ Mailing list: https://launchpad.net/~wide

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/warehouse_refactor into lp:widelands

2017-05-21 Thread SirVer
Diff comments: > > === renamed file 'src/logic/map_objects/attackable.h' => > 'src/logic/map_objects/attack_target.h' done. > > === modified file 'src/logic/map_objects/tribes/soldier.cc' > --- src/logic/map_objects/tribes/soldier.cc 2017-05-13 18:48:26 + > +++ src/logic/map_objects/t

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1674243-crash_with_save_game into lp:widelands

2017-05-21 Thread SirVer
Yes, could be. I am traveling and cannot check right now. But if roads is set, owner should be too - there can't be a field with roads but without owners. > Am 21.05.2017 um 11:39 schrieb GunChleoc : > > In Player::rediscover_node, I found the following code: > >{ // discover everything (

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/warehouse_refactor into lp:widelands

2017-05-20 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/warehouse_refactor into lp:widelands. Commit message: Refactor Attackable. - Getting rid of some multiple inheritance in Warehouse and MilitarySite by composing Attackable as a member into Building. - Rename Attackable -> AttackTar

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/warehouse_refactor into lp:widelands

2017-05-20 Thread SirVer
I was looking into how Warehouse works - thinking about trading. And the design of this irked me, so I improved it. -- https://code.launchpad.net/~widelands-dev/widelands/warehouse_refactor/+merge/324367 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-de

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1674243-crash_with_save_game into lp:widelands

2017-05-20 Thread SirVer
I think this line is correct and should not be removed. This is the idea: to draw a road, you need to know the owner of the road to pull the road textures from its tribe. So f.owner must be set. In the changed function, the following is checked: this field was seen before by our current intera

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/widelands_includes into lp:widelands

2017-05-14 Thread SirVer
Review: Approve lgtm. No logic changes, so good to go. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/widelands_includes/+merge/324029 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/widelands_includes. ___

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/refac-netcode into lp:widelands

2017-05-10 Thread SirVer
Review: Approve Reviewed the code. lgtm, I left a few nits in the code in the last commit. Grep for NOCOM please. -- https://code.launchpad.net/~widelands-dev/widelands/refac-netcode/+merge/323798 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/refac-netcode.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/notifications_cleanup into lp:widelands-website

2017-05-09 Thread SirVer
> I am not sure where the output of this command will be written. It will be silently dropped on success (i.e. exit code 0) (by cronic). On error, cronic will output an error report to stderr which will trigger cron to send it to me by email. I forgot where to configure the recipient of the emai

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gcc7 into lp:widelands

2017-05-08 Thread SirVer
Seems like this one can go back to in progress, right? -- https://code.launchpad.net/~widelands-dev/widelands/gcc7/+merge/323576 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gcc7 into lp:widelands. ___

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1688655-suitability-mines into lp:widelands

2017-05-08 Thread SirVer
Review: Approve code looks good. not tested, but seems straightforward enough. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1688655-suitability-mines/+merge/323716 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1688655-suitability-mines. ___

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/notifications_cleanup into lp:widelands-website

2017-05-08 Thread SirVer
I agree, that seems overkill and the current solution is much simpler. -- https://code.launchpad.net/~widelands-dev/widelands-website/notifications_cleanup/+merge/323457 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Ma

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/rendertarget_ints into lp:widelands

2017-05-07 Thread SirVer
Review: Approve code Good change! One suggestion to improve the code: how about we disallow Vector2i() (by making the default constructor deleted) and instead have a static function Vector2i::Zero() that returns Vector2i(0, 0). It would make the call sites slightly easier to read. otherwise

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/notifications_cleanup into lp:widelands-website

2017-05-07 Thread SirVer
I think your reasoning and arguments are correct. My thoughts are more like this: Using django's ORM makes the schema of your messages explicit in the code (as compared to pickling them) and allows for transformations forward of the schema (using south). It is also resilient to updates of django

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/notifications_cleanup into lp:widelands-website

2017-05-04 Thread SirVer
Review: Approve > I think this is because of wl_map_info needs long time to process the map. I agree, this is probably the problem. It takes so long because it needs to load all of Widelands graphics assets into memory and on a cold cache this takes probably too long. Not much we can do about

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/notifications_cleanup into lp:widelands-website

2017-05-02 Thread SirVer
Review: Approve Some comments while testing: - On http://alpha.widelands.org/notification/, the maps heading says Wlmaps. That should probably just read Maps. - I sent myself a PM and got an email immediately. - I subscribed to the forum and created a new topic. - When uploading a map I got a 50

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/notifications_cleanup into lp:widelands-website

2017-05-01 Thread SirVer
Will review and test this this week. Thanks for continuing to bring the complexity of the homepage down! -- https://code.launchpad.net/~widelands-dev/widelands-website/notifications_cleanup/+merge/323457 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-d

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1_width_and_mapobject_messages into lp:widelands

2017-04-30 Thread SirVer
This is a const issue. Const Image vs (nonconst) texture. Just a guess - I am on mobile and can't decipher the code. > Am 30.04.2017 um 19:22 schrieb Klaus Halfmann : > > Sorry, still does not like it, Attaching the complete messages, maybe it can > help you > > ... > bzr+ssh://bazaar.launch

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1_width_and_mapobject_messages into lp:widelands

2017-04-28 Thread SirVer
> instead of checking for the player color on disk every single time, we can > now grab the image directly from the cache if it's there. it's true that you are not loading the image, but you still check on disk if the _pc.png image is available every time you draw an image that does not have a

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1_width_and_mapobject_messages into lp:widelands

2017-04-27 Thread SirVer
Review: Approve > I don't think it's worth adding preload code for all UI images at this time, > because only very few of them have player color. Didn't your last chance then make it worse? I mean, if most images do not have a _pc.png image associated, the current code will construct the hash,

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1_width_and_mapobject_messages into lp:widelands

2017-04-26 Thread SirVer
Review: Approve 1) makes sense 3) That should work too, I think. About the playercolor() function: I am a little concerned that this now has to hit the disk everytime it is called (to see if _pc.png is there). I think on spindle disks this might get slow and could be noticable - ideally we woul

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1_width_and_mapobject_messages into lp:widelands

2017-04-24 Thread SirVer
Review: Needs Fixing Looking over the code, a few comments: 1) What is up with barbarians/warehouse/representative image? Why is this only for the barbarian warehouse in this branch? 2) I made DesiredWidth a struct, since it always appeared in a tuple of (int, unit). 3) I found a memory leak th

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1675179-lua-hide-fields into lp:widelands

2017-04-21 Thread SirVer
Review: Approve - It only affects the current player, other players' and critters' states shouldn't care about what I see afaik the only thing that does look at your current vision is the scout. And if you have a different vision table than some other host on the game around the area of the sc

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/save_refactor into lp:widelands

2017-04-21 Thread SirVer
Review: Needs Fixing Diff comments: > === modified file 'src/logic/save_handler.cc' > --- src/logic/save_handler.cc 2017-01-25 18:55:59 + > +++ src/logic/save_handler.cc 2017-04-21 16:12:49 + > @@ -37,25 +37,119 @@ > #include "wlapplication.h" > #include "wui/interactive_base.h" > >

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1675179-lua-hide-fields into lp:widelands

2017-04-19 Thread SirVer
Review: Needs Fixing Some thoughts inlined. Diff comments: > === modified file 'src/logic/player.cc' > --- src/logic/player.cc 2017-03-03 18:13:55 + > +++ src/logic/player.cc 2017-03-29 16:01:53 + > @@ -1024,9 +1024,10 @@ > field.vision = fvision; > } > > -void Playe

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1668052-fix-multiselect into lp:widelands

2017-04-09 Thread SirVer
Review: Approve Tested & works. Code LGTM and is even a valid simplification (since we no longer support replaying input events). @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1668052-fix-multiselect/+merge/320760 Your team Widelands Developers is subscribed to bra

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/graphics into lp:widelands

2017-04-09 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/graphics into lp:widelands has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/graphics/+merge/314279 -- Your team Widelands Developers is requested to review the prop

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/graphics into lp:widelands

2017-04-09 Thread SirVer
Actually, I can only reject it, there is no in-progress for reviews. I am rejecting for now, since this is not gonna be merged like this I think. -- https://code.launchpad.net/~widelands-dev/widelands/graphics/+merge/314279 Your team Widelands Developers is requested to review the proposed merge

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/graphics into lp:widelands

2017-04-09 Thread SirVer
Nicolai, are you still working on this? I am setting to in-progress for the meantime so that it does not show up as an active review. -- https://code.launchpad.net/~widelands-dev/widelands/graphics/+merge/314279 Your team Widelands Developers is requested to review the proposed merge of lp:~wide

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/widelands_trunk_binaries into lp:widelands-website

2017-04-09 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands-website/widelands_trunk_binaries/+merge/319233 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev P

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/move_website_binaries into lp:widelands

2017-04-04 Thread SirVer
Review: Approve I missed this, sorry. compile.sh basically never works for Mac OS, since there are no agreed upon search paths for libraries like they are on Linux. So for calling into cMake, the user usually has to provide a ton of extra information. This is the incantation that I am currentl

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1653254-flagaction-roads into lp:widelands

2017-04-03 Thread SirVer
Review: Approve Code lgtm and works for me too. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1653254-flagaction-roads/+merge/317709 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1653254-flagaction-roads. ___

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-536489-pictorial-dropdown into lp:widelands

2017-04-02 Thread SirVer
2 nits, otherwise code lgtm. Tested: worked, but when I first tried, the tribe selection was greyed out. I was unable to repro immediately after, but it seems there is some initialized variables somewhere? Diff comments: > > === modified file 'src/ui_basic/dropdown.cc' > --- src/ui_basic/drop

[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website

2017-04-02 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/wlwebsite_docker/+merge/317036 -- Your team Widelands De

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/hasimusic into lp:widelands

2017-03-25 Thread SirVer
Setting to rejected then. -- https://code.launchpad.net/~widelands-dev/widelands/hasimusic/+merge/317892 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/hasimusic. ___ Mailing list: https://launchpad.net/~widelands-de

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/hasimusic into lp:widelands

2017-03-25 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/hasimusic into lp:widelands has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/hasimusic/+merge/317892 -- Your team Widelands Developers is subscribed to branch lp:~

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1657117-fishbreeder-messages into lp:widelands

2017-02-14 Thread SirVer
Had to edit the commit message as bzr chocked on non-ascii characters. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1657117-fishbreeder-messages/+merge/317028 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1657117-fishbree

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1657117-fishbreeder-messages into lp:widelands

2017-02-14 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/bug-1657117-fishbreeder-messages into lp:widelands has been updated. Commit Message changed to: Fish Breeder's Houses no longer display a "Can't find any more resources!" tooltip when the fishing rounds are full. We have the following behaviour

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/cleanup-networking-messages into lp:widelands

2017-02-12 Thread SirVer
BACKWAR[TD]S_RUNNING_TIME: This is used here: http://bazaar.launchpad.net/~widelands-dev/widelands/less_compilers/view/8276/src/network/nethost.cc#L1721 I think the string is sent between widelands game client and widelands game host - so renaming should be save since we do not guarantee that d

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/cleanup-networking-messages into lp:widelands

2017-02-12 Thread SirVer
Review: Needs Fixing Diff comments: > > === modified file 'src/network/internet_gaming_messages.cc' > --- src/network/internet_gaming_messages.cc 2017-01-25 18:55:59 + > +++ src/network/internet_gaming_messages.cc 2017-02-10 15:40:11 + > @@ -40,26 +40,10 @@ > void InternetGamingMe

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/cleanup-networking-messages into lp:widelands

2017-02-12 Thread SirVer
The GamePinger in the metaserver is responsible for figuring out the state of the game[1] which replies to the client with "ERROR GAME_OPEN GAME_TIMEOUT". This is handled in Widelands somewhere and translated into a message here[2]. [1] https://github.com/widelands/widelands_metaserver/blob/mas

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website

2017-02-11 Thread SirVer
Diff comments: > > === modified file 'settings.py' > --- settings.py 2017-01-21 12:39:23 + > +++ settings.py 2017-02-11 21:31:29 + > @@ -245,7 +232,7 @@ > ### > # Sphinx (Search prog) Config # > ### > -USE_SPHINX = T

[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website

2017-02-11 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website has been updated. Description changed to: Experimental branch, not sure if this should be merged. I set up a docker workflow to run the website against a real mysql database on any development

[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website

2017-02-11 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website has been updated. Description changed to: Experimental branch, not sure if this should be merged. I set up a docker workflow to run the website against a real mysql database on any development

[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website

2017-02-11 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website has been updated. Description changed to: Experimental branch, not sure if this should be merged. I set up a docker workflow to run the website against a real mysql database on any development

[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website

2017-02-11 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands-website/wlwebsite_docker into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/wlwebsite_docker/+merge/317036 Experimental

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1658456-quantity-empire-soldier into lp:widelands

2017-02-11 Thread SirVer
Review: Approve Nic find! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1658456-quantity-empire-soldier/+merge/317026 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1658456-quantity-empire-soldier. ___

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands

2017-02-11 Thread SirVer
I think clang 4 is a sensible addition, gcc 7 does not seem to be supported yet, so this should be removed again. -- https://code.launchpad.net/~hjd/widelands/additional-compilers/+merge/316258 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/additio

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/less_compilers into lp:widelands

2017-02-11 Thread SirVer
Review: Approve Instead of dropping gcc 4.9, I suggest making gcc 4.7 not-supported anymore. Ubuntu 14.04 LTS ships with gcc 4.8 and that is a reasonable lower bound to support. Afaik there is no supported linux distribution that still ships with 4.7. otherwise lgtm. -- https://code.launchpa

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/notifications_economy_window into lp:widelands

2017-02-11 Thread SirVer
Review: Approve I added a tiny rewording of a comment, otherwise lgtm. Please merge when happy. -- https://code.launchpad.net/~widelands-dev/widelands/notifications_economy_window/+merge/311572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/notifications_econo

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ignore_too_many_z_valuees into lp:widelands

2017-02-07 Thread SirVer
Thanks! @bunnybot merge > Am 07.02.2017 um 10:22 schrieb GunChleoc : > > Review: Approve > > Code LGTM, not tested. > -- > https://code.launchpad.net/~widelands-dev/widelands/ignore_too_many_z_valuees/+merge/316498 > Your team Widelands Developers is subscribed to branch > lp:~widelands-dev/w

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ignore_too_many_z_valuees into lp:widelands

2017-02-06 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/ignore_too_many_z_valuees into lp:widelands. Commit message: Limit zoom to avoid having too many objects on the screen as of not running out of z-values and do not crash when we run out of z-layers. Requested reviews: Widelands

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/fix_news into lp:widelands-website

2017-02-05 Thread SirVer
Review: Approve lgtm! -- https://code.launchpad.net/~widelands-dev/widelands-website/fix_news/+merge/316401 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1627537-window-mouserelease into lp:widelands

2017-02-05 Thread SirVer
Review: Approve code lgtm. not tested. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1627537-window-mouserelease/+merge/315986 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1627537-window-mouserelease. __

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands

2017-02-05 Thread SirVer
> I was under the impression that the different compilers were run in > parallell, so it wouldn't affect the run time (much). Is there a limit on > simultaneous builds? Yes, I think there is, but I did not find it in the documentation. All I found was this: https://docs.travis-ci.com/user/custo

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands

2017-02-02 Thread SirVer
Our travis builds border on the acceptable run time for open source builds. I think we should probably start dropping some compilers and get more strict on what we support. Thoughts? -- https://code.launchpad.net/~hjd/widelands/additional-compilers/+merge/316258 Your team Widelands Developers is

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1512076-scoped-timer-for-lua into lp:widelands

2017-02-02 Thread SirVer
Review: Approve I took a look at the branch and made some changes: - I changed print_loading_message to take a function to time I also changed the formatting of the reported output a bit. - I renamed system_time to ticks since that is what it really is. This branch now LGTM. please take a look

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bunnybot_smoke into lp:widelands

2017-02-01 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/bunnybot_smoke into lp:widelands has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bunnybot_smoke/+merge/316168 -- Your team Widelands Developers is requested to rev

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bunnybot_smoke into lp:widelands

2017-02-01 Thread SirVer
Awesome. Works. So bunnybot will only merge branches passing Travis now. This should make master break less often. Abandoning this branch. -- https://code.launchpad.net/~widelands-dev/widelands/bunnybot_smoke/+merge/316168 Your team Widelands Developers is requested to review the proposed me

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bunnybot_smoke into lp:widelands

2017-02-01 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/bunnybot_smoke into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bunnybot_smoke/+merge/316168 Please ignore. This is a test to see that

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bunnybot_smoke into lp:widelands

2017-02-01 Thread SirVer
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bunnybot_smoke/+merge/316168 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bunnybot_smoke into lp:widelands. ___ Mailing li

<    1   2   3   4   5   6   7   8   9   10   >