[Orxonox-commit 3020] r7717 - in code/branches/masterserver: data src/libraries/core src/libraries/tools

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-12-03 14:38:46 +0100 (Fri, 03 Dec 2010)
New Revision: 7717

Modified:
   code/branches/masterserver/data/DefaultResources.oxr
   code/branches/masterserver/src/libraries/core/GUIManager.cc
   code/branches/masterserver/src/libraries/tools/ResourceLocation.cc
Log:
Updating branch for changes in the data repository. Please also update your data repository, or else it won't work.

Modified: code/branches/masterserver/data/DefaultResources.oxr
===================================================================
--- code/branches/masterserver/data/DefaultResources.oxr	2010-12-03 13:38:42 UTC (rev 7716)
+++ code/branches/masterserver/data/DefaultResources.oxr	2010-12-03 13:38:46 UTC (rev 7717)
@@ -1,12 +1,10 @@
 <ResourceCollection resourceGroup = "General" >
-    <ResourceLocation path = "levels" />
+    <ResourceLocation path = "levels" recursive=true/>
     <ResourceLocation path = "lua" />
     <ResourceLocation path = "overlays" />
     <ResourceLocation path = "particle" />
     <ResourceLocation path = "tcl" />
-</ResourceCollection>
 
-<ResourceCollection resourceGroup = "GUI" >
     <ResourceLocation path = "gui/configs" />
     <ResourceLocation path = "gui/layouts" />
     <ResourceLocation path = "gui/schemes" />

Modified: code/branches/masterserver/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/masterserver/src/libraries/core/GUIManager.cc	2010-12-03 13:38:42 UTC (rev 7716)
+++ code/branches/masterserver/src/libraries/core/GUIManager.cc	2010-12-03 13:38:46 UTC (rev 7717)
@@ -122,7 +122,7 @@
         // Note: No SceneManager specified yet
         guiRenderer_.reset(new OgreCEGUIRenderer(GraphicsManager::getInstance().getRenderWindow(), Ogre::RENDER_QUEUE_OVERLAY, false, 3000));
         resourceProvider_ = guiRenderer_->createResourceProvider();
-        resourceProvider_->setDefaultResourceGroup("GUI");
+        resourceProvider_->setDefaultResourceGroup("General");
 
         // Setup scripting
         luaState_.reset(new LuaState());

Modified: code/branches/masterserver/src/libraries/tools/ResourceLocation.cc
===================================================================
--- code/branches/masterserver/src/libraries/tools/ResourceLocation.cc	2010-12-03 13:38:42 UTC (rev 7716)
+++ code/branches/masterserver/src/libraries/tools/ResourceLocation.cc	2010-12-03 13:38:46 UTC (rev 7717)
@@ -48,7 +48,7 @@
 
         // Default values
         archiveType_ = "FileSystem";
-        bRecursive_  = true;
+        bRecursive_  = false;
     }
 
     ResourceLocation::~ResourceLocation()