[Orxonox-commit 6610] r11250 - in code/branches/SpaceRace_HS16: . data/levels

[bberabi at orxonox.net]

Author: bberabi
Date: 2016-10-30 21:55:02 +0100 (Sun, 30 Oct 2016)
New Revision: 11250

Added:
   code/branches/SpaceRace_HS16/svn-commit.2.tmp
Modified:
   code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw
Log:
bots are added to the space race

Modified: code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw
===================================================================
--- code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw	2016-10-24 14:14:16 UTC (rev 11249)
+++ code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw	2016-10-30 20:55:02 UTC (rev 11250)
@@ -9,9 +9,12 @@
   include("stats.oxo")
   include("HUDTemplates3.oxo")
   include("templates/lodInformation.oxt")
+    include("templates/spaceshipAssff.oxt")
+
 ?>
 
 <?lua
+  include("templates/spaceshipAssff2.oxt")
   include("templates/fastship.oxt")
   include("templates/spaceshipPirate.oxt")
 ?>
@@ -30,6 +33,8 @@
     skybox       = "Orxonox/skyBoxMoreNebula"
   >
   
+
+
   <!-- SOUNDS & MUSIC -->
   
   
@@ -68,12 +73,22 @@
     </WorldAmbientSound>
 
 
+    <SpaceShip position="0,0,200" lookat="0,0,0">
+      <templates>
+        <Template link=spaceshipassff />
+      </templates>
+      <controller>
+        <WaypointPatrolController alertnessradius=0 team=10>
+          <waypoints>
+            <Model mesh="cube.mesh" scale=0 position="0,-2000,1000" />
+            <Model mesh="cube.mesh" scale=0 position="0,2100,2300" />
+            <Model mesh="cube.mesh" scale=0 position="0,-400,300" />
+          </waypoints>
+        </WaypointPatrolController>
+      </controller>
+    </SpaceShip>
 
 
-
-        
-
-
   <!--   <WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true" /> -->
   
 
@@ -115,6 +130,9 @@
       </collisionShapes>
   </StaticEntity>
 
+
+
+
     <!-- ---------------ForceFields----------------- -->
     <ForceField position="0,0,0" direction="0,-1,0" diameter=500 velocity=2000 length=1000/>
 

Added: code/branches/SpaceRace_HS16/svn-commit.2.tmp
===================================================================
--- code/branches/SpaceRace_HS16/svn-commit.2.tmp	                        (rev 0)
+++ code/branches/SpaceRace_HS16/svn-commit.2.tmp	2016-10-30 20:55:02 UTC (rev 11250)
@@ -0,0 +1,4 @@
+
+--This line, and those below, will be ignored--
+
+M    data/levels/newnewnewspacerace.oxw