[Orxonox-commit 4635] r9306 - in code/branches/presentation2012merge: data/levels src/modules/gametypes

[jo at orxonox.net]

Author: jo
Date: 2012-06-28 14:39:05 +0200 (Thu, 28 Jun 2012)
New Revision: 9306

Modified:
   code/branches/presentation2012merge/data/levels/tetris.oxw
   code/branches/presentation2012merge/src/modules/gametypes/SpaceRace.cc
Log:
Tetris: Level update

Modified: code/branches/presentation2012merge/data/levels/tetris.oxw
===================================================================
--- code/branches/presentation2012merge/data/levels/tetris.oxw	2012-06-18 19:54:49 UTC (rev 9305)
+++ code/branches/presentation2012merge/data/levels/tetris.oxw	2012-06-28 12:39:05 UTC (rev 9306)
@@ -40,8 +40,8 @@
   <TetrisBrick>
     <camerapositions>
       <CameraPosition position="55,75,200" absolute=true />
-      <CameraPosition position="0,50,160" drag=true mouselook=true />
-      <CameraPosition position="0,50,0" pitch=-90 drag=true mouselook=true />
+      <!--CameraPosition position="0,50,160" drag=true mouselook=true />
+      <CameraPosition position="0,50,0" pitch=-90 drag=true mouselook=true /-->
     </camerapositions>
   </TetrisBrick>
 </Template>
@@ -103,12 +103,12 @@
 
     ?>
 <!-- -------- 4 spaceships rotating around the tetris field --------- -->
-    <SpaceShip position="500,500,400" lookat="0,0,0">
+    <SpaceShip position="1000,-75,1" lookat="0,0,0">
       <templates>
         <Template link=spaceshipswallow />
       </templates>
       <controller>
-        <WaypointController team=10>
+        <WaypointController team=10 accuracy=200>
           <waypoints>
             <Model mesh="cube.mesh" scale=0 position="1000,-75,0" />
             <Model mesh="cube.mesh" scale=0 position="650,-75,650" />
@@ -143,12 +143,12 @@
       </controller>
     </SpaceShip>
     
-       <SpaceShip position="-600,500,400" lookat="0,0,0">
+       <SpaceShip position="-700,200,651" lookat="1,0,0">
       <templates>
         <Template link=spaceshipghost />
       </templates>
       <controller>
-        <WaypointController team=10>
+        <WaypointController team=10 accuracy=300>
           <waypoints>
             <Model mesh="cube.mesh" scale=0 position="-700,200,650" />
             <Model mesh="cube.mesh" scale=0 position="-55,100,1000" />
@@ -170,14 +170,14 @@
       <controller>
         <WaypointController team=10>
           <waypoints>
-            <Model mesh="cube.mesh" scale=10 position="400,240,400" />
-            <Model mesh="cube.mesh" scale=10 position="-55,240,700" />
-            <Model mesh="cube.mesh" scale=10 position="-500,240,400" />
-            <Model mesh="cube.mesh" scale=10 position="-700,240,0" />
-            <Model mesh="cube.mesh" scale=10 position="-500,240,-400" />
-            <Model mesh="cube.mesh" scale=10 position="-55,240,-700" />
-            <Model mesh="cube.mesh" scale=10 position="400,240,-400" />
-            <Model mesh="cube.mesh" scale=10 position="700,240,0" />
+            <Model mesh="cube.mesh" scale=0 position="400,240,400" />
+            <Model mesh="cube.mesh" scale=0 position="-55,240,700" />
+            <Model mesh="cube.mesh" scale=0 position="-500,240,400" />
+            <Model mesh="cube.mesh" scale=0 position="-700,240,0" />
+            <Model mesh="cube.mesh" scale=0 position="-500,240,-400" />
+            <Model mesh="cube.mesh" scale=0 position="-55,240,-700" />
+            <Model mesh="cube.mesh" scale=0 position="400,240,-400" />
+            <Model mesh="cube.mesh" scale=0 position="700,240,0" />
           </waypoints>
         </WaypointController>
       </controller>

Modified: code/branches/presentation2012merge/src/modules/gametypes/SpaceRace.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/gametypes/SpaceRace.cc	2012-06-18 19:54:49 UTC (rev 9305)
+++ code/branches/presentation2012merge/src/modules/gametypes/SpaceRace.cc	2012-06-28 12:39:05 UTC (rev 9306)
@@ -22,7 +22,7 @@
  *   Author:
  *     Mauro Salomon
  *   Co-authors:
- *      ...
+ *      Celine Egger
  *
  */