Changeset 7719 for code/branches

Timestamp:

Dec 3, 2010, 2:38:57 PM (14 years ago)

Author:

dafrick

Message:

Updating branch for changes in the data repository. Please also update your data repository, or else it won't work.

Location:

code/branches/ois_update

Files:

• data/DefaultResources.oxr (modified) (1 diff)
• src/libraries/core/GUIManager.cc (modified) (1 diff)
• src/libraries/tools/ResourceLocation.cc (modified) (1 diff)

code/branches/ois_update/data/DefaultResources.oxr

@@ -1 +1 @@
 <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" />

code/branches/ois_update/src/libraries/core/GUIManager.cc

@@ -123 +123 @@
         guiRenderer_.reset(new OgreCEGUIRenderer(GraphicsManager::getInstance().getRenderWindow(), Ogre::RENDER_QUEUE_OVERLAY, false, 3000));
         resourceProvider_ = guiRenderer_->createResourceProvider();
-        resourceProvider_->setDefaultResourceGroup("GUI");
+        resourceProvider_->setDefaultResourceGroup("General");
 
         // Setup scripting

code/branches/ois_update/src/libraries/tools/ResourceLocation.cc

@@ -49 +49 @@
         // Default values
         archiveType_ = "FileSystem";
-        bRecursive_  = true;
+        bRecursive_  = false;
     }