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

2016-11-29 Thread GunChleoc
Review: Needs Fixing The conditional statement can be more effective - see the diff comments. You will also need to merge trunk to make Travis happy. Diff comments: > === modified file 'data/scripting/win_conditions/collectors.lua' > --- data/scripting/win_conditions/collectors.lua 2016-09

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

2016-11-29 Thread bunnybot
Continuous integration builds have changed state: Travis build 1662. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/179952744. Appveyor build 1502. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mac_os_x_bu

Re: [Widelands-dev] [Merge] lp:~7010622-q/widelands/topple-seafaring-2 into lp:widelands

2016-11-29 Thread toptopple
My work on colony expedition AI draws to a first conclusion. I have worked in several "printf" log messages which I don't know what to do with. The rules for coding in this point are not clear to me. Can you helo me out? It would be benefitial to keep the logs, though in out-commented status, fo

[Widelands-dev] [Merge] lp:~7010622-q/widelands/topple-seafaring-2 into lp:widelands

2016-11-29 Thread toptopple
toptopple has proposed merging lp:~7010622-q/widelands/topple-seafaring-2 into lp:widelands. Commit message: further improvements of sea exploration AI (seafaring) max. expedition time made adapting to map size (60-210 min) Requested reviews: Widelands Developers (widelands-dev) For more deta

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

2016-11-29 Thread bunnybot
Continuous integration builds have changed state: Travis build 1661. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/179901083. Appveyor build 1501. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_collec

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

2016-11-29 Thread bunnybot
Continuous integration builds have changed state: Travis build 1657. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/179369228. Appveyor build 1497. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mac_os_x_b

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

2016-11-29 Thread SirVer
Please wait on feedback on https://bugs.launchpad.net/bugs/1643149 before merging. -- https://code.launchpad.net/~widelands-dev/widelands/mac_os_x_build_fixes/+merge/312105 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/mac_os_x_build_fixe

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

2016-11-29 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/mac_os_x_build_fixes into lp:widelands. Commit message: More changes towards a stable Mac OS X build. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/mac_

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

2016-11-29 Thread Notabilis
Notabilis has proposed merging lp:~widelands-dev/widelands/bug-collectors into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-collectors/+merge/312092 When a game of Collectors ends and the p

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

2016-11-29 Thread SirVer
3 sounds alright to me if you hand in the UniqueWindowHandler, not the whole InteractiveBase class. I think that should work alright. The two ship messages could probably be folded into one anyways... right now, the first one is kLost, kGained (I guess a new ship/one destroyed) and kWaitingFor

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

2016-11-29 Thread SirVer
Review: Needs Fixing notabilis is right and there is one other bug in this change. I added inline comments to explain what is going on. Diff comments: > === modified file 'src/ai/defaultai.cc' > --- src/ai/defaultai.cc 2016-11-19 18:25:49 + > +++ src/ai/defaultai.cc 2016-11-20 1

Re: [Widelands-dev] [Merge] lp:~janus-jhor/widelands-website/unread_read_outbox_messages into lp:widelands-website

2016-11-29 Thread kaputtnik
Diese Kleinigkeit brauchst Du doch nur in diesem branch ändern... -- https://code.launchpad.net/~janus-jhor/widelands-website/unread_read_outbox_messages/+merge/311994 Your team Widelands Developers is requested to review the proposed merge of lp:~janus-jhor/widelands-website/unread_read_outbox_m

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

2016-11-29 Thread kaputtnik
I am often unsure where to put related comments, below or on top of the related line. For 'if' statements its better below, but for normal lines of code like here i am unsure. -- https://code.launchpad.net/~widelands-dev/widelands-website/wlimages_rework/+merge/311985 Your team Widelands Develop

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

2016-11-29 Thread GunChleoc
Now I get it - the line above it is a comment to explain, and not commented out code. Definitely has to stay in :) -- https://code.launchpad.net/~widelands-dev/widelands-website/wlimages_rework/+merge/311985 Your team Widelands Developers is requested to review the proposed merge of lp:~wideland

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

2016-11-29 Thread kaputtnik
Thanks for looking into it :-) Regarding to 'imagename = forms.ImageField(max_length=90)' 'imagename' is needed for the function (added also a comment there): def clean_imagename( self ): # clean_() acts only for this specific field Django uses theses kind of things in some places..

Re: [Widelands-dev] [Merge] lp:~janus-jhor/widelands-website/unread_read_outbox_messages into lp:widelands-website

2016-11-29 Thread janus
ja werde ich nachreichen in einem neuen ersuch ;) -- https://code.launchpad.net/~janus-jhor/widelands-website/unread_read_outbox_messages/+merge/311994 Your team Widelands Developers is requested to review the proposed merge of lp:~janus-jhor/widelands-website/unread_read_outbox_messages into lp

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

2016-11-29 Thread GunChleoc
Added some small proofreading nits. Code LGTM as far as I can tell. Diff comments: > > === modified file 'wlimages/forms.py' > --- wlimages/forms.py 2013-06-14 19:23:53 + > +++ wlimages/forms.py 2016-11-28 21:56:50 + > @@ -4,12 +4,18 @@ > import os > > class UploadImageForm(forms.For