Changeset 12059 for code/branches

Timestamp:

Oct 31, 2018, 10:37:15 AM (6 years ago)

Author:

linggj

Message:

Story Mode Controller added

Location:

code/branches/WorldMap_HS18

Files:

• data/levels/StoryModeMap.oxw (modified) (2 diffs)
• src/orxonox/controllers/CMakeLists.txt (modified) (1 diff)

code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw

@@ -11 +11 @@
   include("StoryModeHUD.oxo")
   include("templates/lodInformation.oxt")
+  include("templates/spaceshipAssff.oxt")
   include("templates/StoryMode.oxt")
 ?>
@@ -34 +35 @@
         <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 />
        

code/branches/WorldMap_HS18/src/orxonox/controllers/CMakeLists.txt

@@ -20 +20 @@
   MasterController.cc
   ArrowController.cc;
-  AutonomousDroneController.cc;
+  AutonomousDroneController.cc; 
+  StoryModeController.cc;
         
 )