Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/refactoring-input-queue into lp:widelands

2017-01-22 Thread Notabilis
Nits are done, testing by someone else is still needed. -- https://code.launchpad.net/~widelands-dev/widelands/refactoring-input-queue/+merge/315313 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/refactoring-input-queue. ___

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/refactoring-input-queue into lp:widelands

2017-01-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 1850. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/194249534. Appveyor build 1687. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_refactorin

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

2017-01-22 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/ai_for_mods into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ai_for_mods/+merge/315311 -- Your team Widelands Developers is subscribed to branch lp

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

2017-01-22 Thread GunChleoc
Well, actually found some. This was int before, so an improvement :) -- https://code.launchpad.net/~widelands-dev/widelands/ai_for_mods/+merge/315311 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_for_mods. ___ Ma

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

2017-01-22 Thread GunChleoc
The only division now is in final += (attack * health) / (defense * evade); and those variables are all float. -- https://code.launchpad.net/~widelands-dev/widelands/ai_for_mods/+merge/315311 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_for_mods. __

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

2017-01-22 Thread TiborB
My only concern is division of integers and consequent rounding Dňa ne 22. 1. 2017, 21:52 GunChleoc napísal(a): > Actually, the divisions by 100 cancel each other out in > > final += (attack * health) / (defense * evade); > > so I have removed them. Less code is good code :) > > @bunnybot me

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

2017-01-22 Thread GunChleoc
Actually, the divisions by 100 cancel each other out in final += (attack * health) / (defense * evade); so I have removed them. Less code is good code :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/ai_for_mods/+merge/315311 Your team Widelands Developers is subscr

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

2017-01-22 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/fsmenu_fullscreen_4_options into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fsmenu_fullscreen_4_options/+merge/312966 -- Your team Widelands Develo

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

2017-01-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 1849. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/194204747. Appveyor build 1686. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_for_mod

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

2017-01-22 Thread GunChleoc
Hasi50 approved the code for this branch in IRC. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fsmenu_fullscreen_4_options/+merge/312966 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fsmenu_fullscreen_4_options. _

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

2017-01-22 Thread TiborB
Review: Approve This looks like very smart change!!!, I tested it, seems working OK. the "+=" issue is really a stupid bug. As for mathematics - I never understood or even care about formulas, but they seems OK to me (when comparing them with the current version in trunk). -- https://code.launc

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1625502-tips-in-help into lp:widelands

2017-01-22 Thread Klaus Halfmann
Code LGTM, one nit about but as this HTML is not in the wild, it may not be worth changing. Will compile / test this now -- https://code.launchpad.net/~widelands-dev/widelands/bug-1625502-tips-in-help/+merge/312969 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/wideland

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

2017-01-22 Thread GunChleoc
I think x1 looks most balanced. -- https://code.launchpad.net/~widelands-dev/widelands/reset_zoom_button/+merge/313058 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/reset_zoom_button into lp:widelands.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/refactoring-input-queue into lp:widelands

2017-01-22 Thread GunChleoc
Review: Approve Coede LGTM - just some small nits. Needs testing. Diff comments: > > === modified file 'src/ai/defaultai_warfare.cc' > --- src/ai/defaultai_warfare.cc 2017-01-06 09:00:11 + > +++ src/ai/defaultai_warfare.cc 2017-01-22 16:41:24 + > @@ -478,22 +478,26 @@ >

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/refactoring-input-queue into lp:widelands

2017-01-22 Thread Notabilis
Notabilis has proposed merging lp:~widelands-dev/widelands/refactoring-input-queue into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/refactoring-input-queue/+merge/315313 Replaces usage of Ware

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

2017-01-22 Thread SirVer
> I apologize for messing up the code, I added missing parts. However I see one > regression test still fails: test_casern.lua I actually blame bunnybot for this. It should just not merge a branch with failing travis tests. I am attempting to fix this behavior. -- https://code.launchpad.net/~w

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

2017-01-22 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/ai_for_mods into lp:widelands has been updated. Description changed to: The values should all be the same as before, except for Barbarian increase_per_level = 850, which was assumed = 700 before. Also, the values were assigned by = for the Atla

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

2017-01-22 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/ai_for_mods into lp:widelands. Commit message: AI calculates military strength based on the actual init.lua files now rather than hard-coding the values. This removed the tribe name restriction for modders. Requested reviews: TiborB

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

2017-01-22 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1658317 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1658317/+merge/315302 -- Your team Widelands Developers is subscribed to branch lp

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

2017-01-22 Thread GunChleoc
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/bug-1658317/+merge/315302 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1658317. ___ Mailing list: https://launchpad.net/~widelands-dev Po

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

2017-01-22 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1658317 into lp:widelands has been updated. Commit Message changed to: Reinstated LuaMap::set/set_warehouse_policies and removed superfluous line from set_inputs. This fixes the test suite. For more details, see: https://code.launchpad.net/

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

2017-01-22 Thread GunChleoc
Yes, that fixed it. I messed that one up when I merged trunk. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1658317/+merge/315302 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1658317 into lp:widelands. _

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

2017-01-22 Thread Notabilis
On my system everything compiles and all tests run now. @travis checkitnow -- https://code.launchpad.net/~widelands-dev/widelands/bug-1658317/+merge/315302 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1658317 into lp:widelands.