[Orxonox-commit 2342] r7057 - in code/branches/fps/data/levels: . templates

[edwind at orxonox.net]

Author: edwind
Date: 2010-05-31 16:21:30 +0200 (Mon, 31 May 2010)
New Revision: 7057

Modified:
   code/branches/fps/data/levels/fps_test.oxw
   code/branches/fps/data/levels/templates/fps.oxt
Log:
by ED

Modified: code/branches/fps/data/levels/fps_test.oxw
===================================================================
--- code/branches/fps/data/levels/fps_test.oxw	2010-05-31 14:19:14 UTC (rev 7056)
+++ code/branches/fps/data/levels/fps_test.oxw	2010-05-31 14:21:30 UTC (rev 7057)
@@ -43,15 +43,14 @@
 do
 j = math.random()
 ?>
-
-    <MovableEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 100) ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>" >
+  <MovableEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 100) ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>" >
       <attached>
         <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
       </attached>
       <collisionShapes>
         <SphereCollisionShape radius="<?lua print(j * 100) ?>" />
       </collisionShapes>
-    </MovableEntity>
+  </MovableEntity>
 <?lua
 end
 ?>

Modified: code/branches/fps/data/levels/templates/fps.oxt
===================================================================
--- code/branches/fps/data/levels/templates/fps.oxt	2010-05-31 14:19:14 UTC (rev 7056)
+++ code/branches/fps/data/levels/templates/fps.oxt	2010-05-31 14:21:30 UTC (rev 7057)
@@ -23,7 +23,7 @@
    weapon            = "hs-w01.mesh"
   >
     <collisionShapes>
-      <BoxCollisionShape position="0,-20,0" halfExtents="10,25,10" />
+      <BoxCollisionShape position="0,-20,0" halfExtents="15,25,15" />
     </collisionShapes>
     
     <camerapositions>