[Orxonox-commit 2899] r7602 - in code/branches/lastmanstanding: data/levels src/orxonox/gametypes

[jo at orxonox.net]

Author: jo
Date: 2010-10-31 17:14:55 +0100 (Sun, 31 Oct 2010)
New Revision: 7602

Modified:
   code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw
   code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc
Log:
Collisionshapes do not work as intended. Although I followed the structure given in the forum.

Modified: code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw
===================================================================
--- code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw	2010-10-30 11:54:49 UTC (rev 7601)
+++ code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw	2010-10-31 16:14:55 UTC (rev 7602)
@@ -120,9 +120,10 @@
       <attached>
         <Model position="0,0,0" scale=25 mesh="ast6.mesh">
 	</Model>
+        <Model position="0,0,0" mesh="cube.mesh" scale3D="25,70,15" />
       </attached>
       <collisionShapes>
-        <BoxCollisionShape    halfExtents="50,25,50" position="0,0,0" yaw="<?lua print(-90+i*360/max) ?>"/>
+        <BoxCollisionShape    halfExtents="25,70,15" position="0,0,0"/>
       </collisionShapes>
     </StaticEntity>
 

Modified: code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc
===================================================================
--- code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc	2010-10-30 11:54:49 UTC (rev 7601)
+++ code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc	2010-10-31 16:14:55 UTC (rev 7602)
@@ -45,7 +45,7 @@
         this->bForceSpawn_=true;
         this->lives=4;
         this->playersAlive=0;
-        this->timeRemaining=10.0f;
+        this->timeRemaining=15.0f;
         this->respawnDelay=4.0f;
         this->setHUDTemplate("LastmanstandingHUD");
     }
@@ -81,7 +81,7 @@
     void LastManStanding::setConfigValues()
     {
         SetConfigValue(lives, 4);
-        SetConfigValue(timeRemaining, 20.0f);
+        SetConfigValue(timeRemaining, 15.0f);
         SetConfigValue(respawnDelay, 4.0f);
     }