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

2014-12-03 Thread SirVer
Review: Approve

You missed one rename :). I did it for you and merged.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1281823/+merge/242837
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1281823.

___
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-1281823 into lp:widelands

2014-12-03 Thread SirVer
Review: Needs Fixing

Spoke to early. The fix is flawed - it also changes initial_res_amount in a 
game. That leads to wrong results if a scenario changes a fields resource 
amount. I added a failing test.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1281823/+merge/242837
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1281823.

___
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/f_for_fullscreen into lp:widelands

2014-12-03 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/f_for_fullscreen into 
lp:widelands has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/f_for_fullscreen/+merge/243227
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/f_for_fullscreen.

___
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-1281823 into lp:widelands

2014-12-03 Thread TiborB
all right to have common design for both, I the new design will be: change the 
initial_res_amount to  res_amount only if initial_res_amount would be lower 
then new value of res_amount
Agreed?
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1281823/+merge/242837
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1281823.

___
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/seafaring-ai into lp:widelands

2014-12-03 Thread SirVer
I think you can maximize the fun by making smaller branches. They are faster to 
merge, clean and review.
-- 
https://code.launchpad.net/~widelands-dev/widelands/seafaring-ai/+merge/242271
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/seafaring-ai 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-1281823 into lp:widelands

2014-12-03 Thread TiborB
What happens when amount  initial_amount - I dont think is it good aproach 
to allow such situation and in addition, there is no set_initial_res_amount 
available via LUA - but I will change it, no  problem...
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1281823/+merge/242837
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1281823.

___
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/seafaring-ai into lp:widelands

2014-12-03 Thread GunChleoc
 No more big branches, this is why I enjoyed these two (or three) small
 branches I did lately (including this one and tha LUA resource think - though
 this gone wild from one-line change).

This has happened to me too and will keep happening - one day I will learn that 
there are no quick fixes. I sometimes find it frustrating at first as well, but 
when the branch is finished, I am happy, because the code is better.
-- 
https://code.launchpad.net/~widelands-dev/widelands/seafaring-ai/+merge/242271
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/seafaring-ai 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-1281823 into lp:widelands

2014-12-03 Thread TiborB
@SirVer - I changed it. Test works as well.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1281823/+merge/242837
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1281823.

___
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-1281823 into lp:widelands

2014-12-03 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1281823 into lp:widelands 
has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1281823/+merge/242837
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1281823.

___
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-1281823 into lp:widelands

2014-12-03 Thread SirVer
Review: Approve

Looks good now. Merged.

 What happens when amount  initial_amount - I dont think is it good aproach 
 to allow such situation and in addition, there is no set_initial_res_amount 
 available via LUA - but I will change it, no problem...

I understand what you say. If a scripter sets res  initial that could be bad 
for the engine. But then again, why should initial be changed if somebody 
changes res? initial is the value at the beginning of the game, it is not the 
max value. Why should the current value not be higher than the initial value? 
For fish it could even make logical sense. So I think your implementation is 
correct - let's see if it makes any trouble.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1281823/+merge/242837
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1281823.

___
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-859245 into lp:widelands

2014-12-03 Thread SirVer
Review: Approve

looks good. merged.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-859245/+merge/241549
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-859245.

___
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/remove_cached_resizing into lp:widelands

2014-12-03 Thread Tino
Review: Approve

Does work well on win.

I am for merging and getting rid of the old MinGW Makfile completely. It does 
miss all SDL2 related changes and CMake+Ninja|Make work fine on windows.
-- 
https://code.launchpad.net/~widelands-dev/widelands/remove_cached_resizing/+merge/243584
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/remove_cached_resizing.

___
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