Changeset 12058 for code/branches

Timestamp:

Oct 31, 2018, 9:13:23 AM (5 years ago)

Author:

linggj

Message:

building

Location:

code/branches/WorldMap_HS18

Files:

• data/levels/NC_StoryModeLevel.oxw (modified) (1 diff)
• data/levels/StoryModeMap.oxw (modified) (1 diff)
• src/orxonox/LevelManager.cc (modified) (2 diffs)
• src/orxonox/gametypes/StoryMode.cc (modified) (1 diff)

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

@@ -1 @@
-<LevelInfo
+a<LevelInfo
  name = "NC StoryMode"
  description = "A level in which the Campaign Menu is defined, which opens other levels."

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

@@ -33 +33 @@
 
         <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 />
         <Billboard colour="1,1,0.05" position="600,370,-80"  material="Flares/lensflare" scale=4.5 />

code/branches/WorldMap_HS18/src/orxonox/LevelManager.cc

@@ -63 +63 @@
         RegisterObject(LevelManager);
         this->setConfigValues();
-        orxout(status)<<" a ";
+
         // check override
         if (!CommandLineParser::getArgument("level")->hasDefaultValue())
@@ -257 +257 @@
         // Get all files matching the level criteria
         Ogre::StringVectorPtr levels = Resource::findResourceNames("*.oxw");
-        orxout(internal_info) << levels << "itse me";
+
         // We only want to load as little as possible
         ClassTreeMask mask;

code/branches/WorldMap_HS18/src/orxonox/gametypes/StoryMode.cc

@@ -47 +47 @@
     StoryMode::StoryMode(Context* context) : Gametype(context)
     {
-        orxout(internal_info) << levels << "itse me";
+        
         RegisterObject(StoryMode);