koda [Mon, 08 Nov 2010 23:58:59 +0100] rev 4216
merge
Henek [Mon, 08 Nov 2010 22:12:14 +0100] rev 4215
inactivate sudden death if both health decrease and water rise is 0 and lower sudden death turns to 50 again
nemo [Mon, 08 Nov 2010 14:24:31 -0500] rev 4214
fix preview for the FlightJoust test map (not for release)
koda [Mon, 08 Nov 2010 23:58:22 +0100] rev 4213
smaller update (color and modes)
nemo [Mon, 08 Nov 2010 14:15:26 -0500] rev 4212
Darken blue, brighten cyan to make more distinguishable, replace gold with peach. Should hopefully resolve objections about colour distinguishability
koda [Mon, 08 Nov 2010 23:46:34 +0100] rev 4211
this time i got it right, i'm sure of it; TEST ANYWAYS
nemo [Sun, 07 Nov 2010 18:35:21 -0500] rev 4210
revert 4200:dd54999c2822 - it was breaking schemes. koda. just leave this alone until next release
nemo [Sun, 07 Nov 2010 17:48:21 -0500] rev 4209
no need to clear this flag
koda [Sun, 07 Nov 2010 23:47:29 +0100] rev 4208
revamp gamemodes section in the ifrontend and update ios game modes
move minestime and turntime *1000 away from frontend and move it in engine (preserving lua compatibility)
nemo [Sun, 07 Nov 2010 17:40:55 -0500] rev 4207
better end of turn in infinite attack mode. NEEDS TESTING.