Changeset 5695 for code/trunk/data/gui

Timestamp:

Aug 30, 2009, 2:22:00 AM (16 years ago)

Author:

rgrieder

Message:

Merged resource2 branch back to trunk.

IMPORTANT NOTE:
Upon this merge you need to specifically call your data directory "data_extern" when checking it out (when you don't provide a name, it will be just called 'trunk').
The new CMake variable is EXTERNAL_DATA_DIRECTORY. DATA_DIRECTORY now points to the one the source part of the repository.
UPDATE YOUR DATA DIRECTORY AS WELL!!!

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data (copied) (copied from code/branches/resource2/data)
• data/gui (copied) (copied from code/branches/resource2/data/gui)
• data/gui/configs (copied) (copied from code/branches/resource2/data/gui/configs)
• data/gui/configs/CEGUIConfig.xsd (copied) (copied from code/branches/resource2/data/gui/configs/CEGUIConfig.xsd)
• data/gui/configs/Falagard.xsd (copied) (copied from code/branches/resource2/data/gui/configs/Falagard.xsd)
• data/gui/configs/Font.xsd (copied) (copied from code/branches/resource2/data/gui/configs/Font.xsd)
• data/gui/configs/GUILayout.xsd (copied) (copied from code/branches/resource2/data/gui/configs/GUILayout.xsd)
• data/gui/configs/GUIScheme.xsd (copied) (copied from code/branches/resource2/data/gui/configs/GUIScheme.xsd)
• data/gui/configs/Imageset.xsd (copied) (copied from code/branches/resource2/data/gui/configs/Imageset.xsd)
• data/gui/layouts (copied) (copied from code/branches/resource2/data/gui/layouts)
• data/gui/layouts/CompositorDemo.layout (copied) (copied from code/branches/resource2/data/gui/layouts/CompositorDemo.layout)
• data/gui/layouts/Console.wnd (copied) (copied from code/branches/resource2/data/gui/layouts/Console.wnd)
• data/gui/layouts/CrowdDemo.layout (copied) (copied from code/branches/resource2/data/gui/layouts/CrowdDemo.layout)
• data/gui/layouts/Demo7Windows.layout (copied) (copied from code/branches/resource2/data/gui/layouts/Demo7Windows.layout)
• data/gui/layouts/Demo8.layout (copied) (copied from code/branches/resource2/data/gui/layouts/Demo8.layout)
• data/gui/layouts/DragDropDemo.layout (copied) (copied from code/branches/resource2/data/gui/layouts/DragDropDemo.layout)
• data/gui/layouts/FontDemo.layout (copied) (copied from code/branches/resource2/data/gui/layouts/FontDemo.layout)
• data/gui/layouts/GUILayout.xsd (copied) (copied from code/branches/resource2/data/gui/layouts/GUILayout.xsd)
• data/gui/layouts/InGameTest.layout (copied) (copied from code/branches/resource2/data/gui/layouts/InGameTest.layout)
• data/gui/layouts/InstancingDemo.layout (copied) (copied from code/branches/resource2/data/gui/layouts/InstancingDemo.layout)
• data/gui/layouts/MainMenu.layout (copied) (copied from code/branches/resource2/data/gui/layouts/MainMenu.layout)
• data/gui/layouts/PickupInventory.layout (copied) (copied from code/branches/resource2/data/gui/layouts/PickupInventory.layout)
• data/gui/layouts/TabControlDemo.layout (copied) (copied from code/branches/resource2/data/gui/layouts/TabControlDemo.layout)
• data/gui/layouts/TabPage.layout (copied) (copied from code/branches/resource2/data/gui/layouts/TabPage.layout)
• data/gui/layouts/TabPage1.layout (copied) (copied from code/branches/resource2/data/gui/layouts/TabPage1.layout)
• data/gui/layouts/TabPage2.layout (copied) (copied from code/branches/resource2/data/gui/layouts/TabPage2.layout)
• data/gui/layouts/TextDemo.layout (copied) (copied from code/branches/resource2/data/gui/layouts/TextDemo.layout)
• data/gui/layouts/TreeDemoTaharez.layout (copied) (copied from code/branches/resource2/data/gui/layouts/TreeDemoTaharez.layout)
• data/gui/layouts/VanillaConsole.layout (copied) (copied from code/branches/resource2/data/gui/layouts/VanillaConsole.layout)
• data/gui/layouts/VanillaWindows.layout (copied) (copied from code/branches/resource2/data/gui/layouts/VanillaWindows.layout)
• data/gui/layouts/cegui8.layout (copied) (copied from code/branches/resource2/data/gui/layouts/cegui8.layout)
• data/gui/layouts/facial.layout (copied) (copied from code/branches/resource2/data/gui/layouts/facial.layout)
• data/gui/layouts/ogregui.layout (copied) (copied from code/branches/resource2/data/gui/layouts/ogregui.layout)
• data/gui/layouts/shadows.layout (copied) (copied from code/branches/resource2/data/gui/layouts/shadows.layout)
• data/gui/schemes (copied) (copied from code/branches/resource2/data/gui/schemes)
• data/gui/schemes/Demo8.scheme (copied) (copied from code/branches/resource2/data/gui/schemes/Demo8.scheme)
• data/gui/schemes/GUIScheme.xsd (copied) (copied from code/branches/resource2/data/gui/schemes/GUIScheme.xsd)
• data/gui/schemes/OrxonoxGUIScheme.scheme (copied) (copied from code/branches/resource2/data/gui/schemes/OrxonoxGUIScheme.scheme)
• data/gui/schemes/TaharezLook.scheme (copied) (copied from code/branches/resource2/data/gui/schemes/TaharezLook.scheme)
• data/gui/schemes/TaharezLookSkin.scheme (copied) (copied from code/branches/resource2/data/gui/schemes/TaharezLookSkin.scheme)
• data/gui/schemes/TaharezLookWidgetAliases.scheme (copied) (copied from code/branches/resource2/data/gui/schemes/TaharezLookWidgetAliases.scheme)
• data/gui/schemes/TaharezLookWidgets.scheme (copied) (copied from code/branches/resource2/data/gui/schemes/TaharezLookWidgets.scheme)
• data/gui/schemes/VanillaSkin.scheme (copied) (copied from code/branches/resource2/data/gui/schemes/VanillaSkin.scheme)
• data/gui/schemes/WindowsLook.scheme (copied) (copied from code/branches/resource2/data/gui/schemes/WindowsLook.scheme)
• data/gui/schemes/WindowsLookWidgets.scheme (copied) (copied from code/branches/resource2/data/gui/schemes/WindowsLookWidgets.scheme)
• data/gui/scripts (copied) (copied from code/branches/resource2/data/gui/scripts)
• data/gui/scripts/BasicGUI.lua (copied) (copied from code/branches/resource2/data/gui/scripts/BasicGUI.lua)
• data/gui/scripts/InitialiseGUI.lua (copied) (copied from code/branches/resource2/data/gui/scripts/InitialiseGUI.lua)
• data/gui/scripts/MainMenu.lua (copied) (copied from code/branches/resource2/data/gui/scripts/MainMenu.lua)
• data/gui/scripts/PickupInventory.lua (copied) (copied from code/branches/resource2/data/gui/scripts/PickupInventory.lua)