Revision: 11192
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=11192view=rev
Author: cypr
Date: 2010-07-13 18:37:54 + (Tue, 13 Jul 2010)
Log Message:
---
Fix off by (almost) half of a tile when building derricks.
Was + TILE_SHIFT / 2 = +3 instead of +
Revision: 11193
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=11193view=rev
Author: cypr
Date: 2010-07-13 18:38:27 + (Tue, 13 Jul 2010)
Log Message:
---
2.3: Fix off by (almost) half of a tile when building derricks.
Was + TILE_SHIFT / 2 = +3 instead of +
Revision: 11194
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=11194view=rev
Author: cypr
Date: 2010-07-13 18:52:21 + (Tue, 13 Jul 2010)
Log Message:
---
Merge remote branch 'origin/master' into newnet
Conflicts:
lib/netplay/netplay.c
From: Cyp
Revision: 11197
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=11197view=rev
Author: cypr
Date: 2010-07-13 22:39:32 + (Tue, 13 Jul 2010)
Log Message:
---
newnet: Add mysterious (char *) cast to fix windows build.
From: Cyp c...@example.com
Modified Paths:
Revision: 11198
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=11198view=rev
Author: buginator
Date: 2010-07-13 23:34:42 + (Tue, 13 Jul 2010)
Log Message:
---
Prevent division by 0 when a object has 0 original hit points.
Add a check for that condition on
Revision: 11199
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=11199view=rev
Author: buginator
Date: 2010-07-13 23:59:51 + (Tue, 13 Jul 2010)
Log Message:
---
revert r2 --can't test things if you only have 10secs before you win. :P
Don't forget to
Revision: 11200
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=11200view=rev
Author: zarelsl
Date: 2010-07-14 05:44:23 + (Wed, 14 Jul 2010)
Log Message:
---
2.3: Reverting r11199 because else I'll get a bunch of merge conflicts when I
commit my fix to bug
