[Orxonox-commit 7452] r12059 - in code/branches/WorldMap_HS18: data/levels src/orxonox/controllers

[linggj at orxonox.net]

Author: linggj
Date: 2018-10-31 10:37:15 +0100 (Wed, 31 Oct 2018)
New Revision: 12059

Modified:
   code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw
   code/branches/WorldMap_HS18/src/orxonox/controllers/CMakeLists.txt
Log:
Story Mode Controller added

Modified: code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw
===================================================================
--- code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw	2018-10-31 08:13:23 UTC (rev 12058)
+++ code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw	2018-10-31 09:37:15 UTC (rev 12059)
@@ -10,6 +10,7 @@
   include("stats.oxo")
   include("StoryModeHUD.oxo")
   include("templates/lodInformation.oxt")
+  include("templates/spaceshipAssff.oxt")
   include("templates/StoryMode.oxt")
 ?>
 
@@ -33,10 +34,9 @@
 
         <Model name="a" position="600,370,0" mesh="planets/moon.mesh" scale=100 visible="false" />
          
-        <alfred>
+        
          <Model position="550,300,0" mesh="assff.mesh" scale=20  visible="true" orientation="-0.015,0.091,0.038,-0.995"/>
-       </alfred>
-        <Model position="600,370,0" mesh="Coordinates.mesh" scale=10 />
+               <Model position="600,370,0" mesh="Coordinates.mesh" scale=10 />
         <Billboard colour="1,1,0.05" position="600,370,-80"  material="Flares/lensflare" scale=4.5 />
        
 

Modified: code/branches/WorldMap_HS18/src/orxonox/controllers/CMakeLists.txt
===================================================================
--- code/branches/WorldMap_HS18/src/orxonox/controllers/CMakeLists.txt	2018-10-31 08:13:23 UTC (rev 12058)
+++ code/branches/WorldMap_HS18/src/orxonox/controllers/CMakeLists.txt	2018-10-31 09:37:15 UTC (rev 12059)
@@ -19,6 +19,7 @@
   FightingController.cc
   MasterController.cc
   ArrowController.cc;
-  AutonomousDroneController.cc;
+  AutonomousDroneController.cc;	
+  StoryModeController.cc;
 	
 )