Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 3, 2010, 2:36:50 PM (15 years ago)
Author:
dafrick
Message:

Merging cleanup branch. You will need to update your data repository as well as your local copy of the code.

Location:
data/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • data/trunk

  • data/trunk/resources.oxr

    r5701 r7708  
    11<ResourceCollection resourceGroup = "General" >
    2     <ResourceLocation path = "audio" />
    3     <ResourceLocation path = "fonts" />
    4     <ResourceLocation path = "materials/programs" />
    5     <ResourceLocation path = "materials/scripts" />
    6     <ResourceLocation path = "materials/textures" />
    7     <ResourceLocation path = "models" />
    8     <ResourceLocation path = "gui/fonts" />
    9     <ResourceLocation path = "packs/cubemap.zip" archiveType = "Zip" />
    10     <ResourceLocation path = "packs/skybox.zip"  archiveType = "Zip" />
     2    <ResourceLocation path = "audio"            />
     3    <ResourceLocation path = "fonts"            />
     4    <ResourceLocation path = "images"           />
     5    <ResourceLocation path = "images/decals"    />
     6    <ResourceLocation path = "images/effects"   />
     7    <ResourceLocation path = "images/gui"       />
     8    <ResourceLocation path = "images/overlay"   />
     9    <ResourceLocation path = "images/skyboxes"  />
     10    <ResourceLocation path = "images/textures"  />
     11    <ResourceLocation path = "images/textures/seamless"/>
     12    <ResourceLocation path = "materials"        />
     13    <ResourceLocation path = "models"           />
     14    <ResourceLocation path = "packs/cubemap.zip" archiveType = "Zip"/>
     15    <ResourceLocation path = "packs/skybox.zip"  archiveType = "Zip"/>
     16    <ResourceLocation path = "programs"         />
     17
     18    <ResourceLocation path = "gui/fonts"        />
     19    <ResourceLocation path = "gui/imagesets"    />
     20    <ResourceLocation path = "gui/looknfeels"   />
    1121</ResourceCollection>
    12 
    13 <ResourceCollection resourceGroup = "GUI" >
    14     <ResourceLocation path = "gui/fonts" />
    15     <ResourceLocation path = "gui/imagesets" />
    16     <ResourceLocation path = "gui/looknfeel" />
    17 </ResourceCollection>
Note: See TracChangeset for help on using the changeset viewer.