Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7713


Ignore:
Timestamp:
Dec 3, 2010, 2:38:23 PM (11 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/gamestates3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/gamestates3/data/DefaultResources.oxr

    r6417 r7713  
    11<ResourceCollection resourceGroup = "General" >
    2     <ResourceLocation path = "levels" />
     2    <ResourceLocation path = "levels" recursive=true/>
    33    <ResourceLocation path = "lua" />
    44    <ResourceLocation path = "overlays" />
    55    <ResourceLocation path = "particle" />
    66    <ResourceLocation path = "tcl" />
    7 </ResourceCollection>
    87
    9 <ResourceCollection resourceGroup = "GUI" >
    108    <ResourceLocation path = "gui/configs" />
    119    <ResourceLocation path = "gui/layouts" />
  • code/branches/gamestates3/src/libraries/core/GUIManager.cc

    r6763 r7713  
    125125        guiRenderer_.reset(new OgreCEGUIRenderer(GraphicsManager::getInstance().getRenderWindow(), Ogre::RENDER_QUEUE_OVERLAY, false, 3000));
    126126        resourceProvider_ = guiRenderer_->createResourceProvider();
    127         resourceProvider_->setDefaultResourceGroup("GUI");
     127        resourceProvider_->setDefaultResourceGroup("General");
    128128
    129129        // Setup scripting
  • code/branches/gamestates3/src/libraries/tools/ResourceLocation.cc

    r6417 r7713  
    4949        // Default values
    5050        archiveType_ = "FileSystem";
    51         bRecursive_  = true;
     51        bRecursive_  = false;
    5252    }
    5353
Note: See TracChangeset for help on using the changeset viewer.