[Orxonox-commit 7451] r12058 - in code/branches/WorldMap_HS18: data/levels src/orxonox src/orxonox/gametypes

[linggj at orxonox.net]

Author: linggj
Date: 2018-10-31 09:13:23 +0100 (Wed, 31 Oct 2018)
New Revision: 12058

Modified:
   code/branches/WorldMap_HS18/data/levels/NC_StoryModeLevel.oxw
   code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw
   code/branches/WorldMap_HS18/src/orxonox/LevelManager.cc
   code/branches/WorldMap_HS18/src/orxonox/gametypes/StoryMode.cc
Log:
building

Modified: code/branches/WorldMap_HS18/data/levels/NC_StoryModeLevel.oxw
===================================================================
--- code/branches/WorldMap_HS18/data/levels/NC_StoryModeLevel.oxw	2018-10-24 09:43:55 UTC (rev 12057)
+++ code/branches/WorldMap_HS18/data/levels/NC_StoryModeLevel.oxw	2018-10-31 08:13:23 UTC (rev 12058)
@@ -1,4 +1,4 @@
-<LevelInfo
+a<LevelInfo
  name = "NC StoryMode"
  description = "A level in which the Campaign Menu is defined, which opens other levels."
  tags = "test"

Modified: code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw
===================================================================
--- code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw	2018-10-24 09:43:55 UTC (rev 12057)
+++ code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw	2018-10-31 08:13:23 UTC (rev 12058)
@@ -32,7 +32,10 @@
       <attached>
 
         <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 />
        

Modified: code/branches/WorldMap_HS18/src/orxonox/LevelManager.cc
===================================================================
--- code/branches/WorldMap_HS18/src/orxonox/LevelManager.cc	2018-10-24 09:43:55 UTC (rev 12057)
+++ code/branches/WorldMap_HS18/src/orxonox/LevelManager.cc	2018-10-31 08:13:23 UTC (rev 12058)
@@ -62,7 +62,7 @@
     {
         RegisterObject(LevelManager);
         this->setConfigValues();
-        orxout(status)<<" a ";
+
         // check override
         if (!CommandLineParser::getArgument("level")->hasDefaultValue())
         {
@@ -256,7 +256,7 @@
     {
         // 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;
         mask.exclude(Class(BaseObject));

Modified: code/branches/WorldMap_HS18/src/orxonox/gametypes/StoryMode.cc
===================================================================
--- code/branches/WorldMap_HS18/src/orxonox/gametypes/StoryMode.cc	2018-10-24 09:43:55 UTC (rev 12057)
+++ code/branches/WorldMap_HS18/src/orxonox/gametypes/StoryMode.cc	2018-10-31 08:13:23 UTC (rev 12058)
@@ -46,7 +46,7 @@
     
     StoryMode::StoryMode(Context* context) : Gametype(context)
     {
-        orxout(internal_info) << levels << "itse me";
+        
         RegisterObject(StoryMode);
 
         this->gtinfo_ = new GametypeInfo(context);