Changeset 5695 for code/trunk/data

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/CMakeLists.txt (copied) (copied from code/branches/resource2/data/CMakeLists.txt)
• data/DataInstallScript.cmake (copied) (copied from code/branches/resource2/data/DataInstallScript.cmake)
• data/defaultConfig (copied) (copied from code/branches/resource2/data/defaultConfig)
• data/defaultConfig/keybindings.ini (copied) (copied from code/branches/resource2/data/defaultConfig/keybindings.ini)
• data/defaultConfig/masterKeybindings.ini (copied) (copied from code/branches/resource2/data/defaultConfig/masterKeybindings.ini)
• 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)
• data/levels (copied) (copied from code/branches/resource2/data/levels)
• data/levels/empty_level.oxw (copied) (copied from code/branches/resource2/data/levels/empty_level.oxw)
• data/levels/gametype_asteroids.oxw (copied) (copied from code/branches/resource2/data/levels/gametype_asteroids.oxw)
• data/levels/gametype_underattack.oxw (copied) (copied from code/branches/resource2/data/levels/gametype_underattack.oxw)
• data/levels/includes (copied) (copied from code/branches/resource2/data/levels/includes)
• data/levels/includes/CuboidSpaceStation.lua (copied) (copied from code/branches/resource2/data/levels/includes/CuboidSpaceStation.lua)
• data/levels/includes/weaponsettings1.oxi (copied) (copied from code/branches/resource2/data/levels/includes/weaponsettings1.oxi)
• data/levels/includes/weaponsettings2.oxi (copied) (copied from code/branches/resource2/data/levels/includes/weaponsettings2.oxi)
• data/levels/includes/weaponsettings3.oxi (copied) (copied from code/branches/resource2/data/levels/includes/weaponsettings3.oxi)
• data/levels/includes/weaponsettings_H2.oxi (copied) (copied from code/branches/resource2/data/levels/includes/weaponsettings_H2.oxi)
• data/levels/includes/weaponsettings_pirate.oxi (copied) (copied from code/branches/resource2/data/levels/includes/weaponsettings_pirate.oxi)
• data/levels/old (copied) (copied from code/branches/resource2/data/levels/old)
• data/levels/old/CuboidSpaceStation.oxw (copied) (copied from code/branches/resource2/data/levels/old/CuboidSpaceStation.oxw)
• data/levels/old/physicstest.oxw (copied) (copied from code/branches/resource2/data/levels/old/physicstest.oxw)
• data/levels/old/physicstest2.oxw (copied) (copied from code/branches/resource2/data/levels/old/physicstest2.oxw)
• data/levels/old/planettest.oxw (copied) (copied from code/branches/resource2/data/levels/old/planettest.oxw)
• data/levels/old/presentation_physics.oxw (copied) (copied from code/branches/resource2/data/levels/old/presentation_physics.oxw)
• data/levels/old/princessaeryn.oxw (copied) (copied from code/branches/resource2/data/levels/old/princessaeryn.oxw)
• data/levels/old/questsystem.oxw (copied) (copied from code/branches/resource2/data/levels/old/questsystem.oxw)
• data/levels/old/sample4.oxw (copied) (copied from code/branches/resource2/data/levels/old/sample4.oxw)
• data/levels/old/spaceshiptemplates_physics.oxw (copied) (copied from code/branches/resource2/data/levels/old/spaceshiptemplates_physics.oxw)
• data/levels/old/tutorial_hs08.oxw (copied) (copied from code/branches/resource2/data/levels/old/tutorial_hs08.oxw)
• data/levels/pickuptest.oxw (copied) (copied from code/branches/resource2/data/levels/pickuptest.oxw)
• data/levels/presentation.oxw (copied) (copied from code/branches/resource2/data/levels/presentation.oxw)
• data/levels/presentation09.oxw (copied) (copied from code/branches/resource2/data/levels/presentation09.oxw)
• data/levels/presentation09b.oxw (copied) (copied from code/branches/resource2/data/levels/presentation09b.oxw)
• data/levels/presentation_dm.oxw (copied) (copied from code/branches/resource2/data/levels/presentation_dm.oxw)
• data/levels/presentation_pong.oxw (copied) (copied from code/branches/resource2/data/levels/presentation_pong.oxw)
• data/levels/teambasematchlevel.oxw (copied) (copied from code/branches/resource2/data/levels/teambasematchlevel.oxw)
• data/levels/teamdeathmatch.oxw (copied) (copied from code/branches/resource2/data/levels/teamdeathmatch.oxw)
• data/levels/templates (copied) (copied from code/branches/resource2/data/levels/templates)
• data/levels/templates/spaceship_H2.oxt (copied) (copied from code/branches/resource2/data/levels/templates/spaceship_H2.oxt)
• data/levels/templates/spaceship_assff.oxt (copied) (copied from code/branches/resource2/data/levels/templates/spaceship_assff.oxt)
• data/levels/templates/spaceship_pirate.oxt (copied) (copied from code/branches/resource2/data/levels/templates/spaceship_pirate.oxt)
• data/levels/tutorial.oxw (copied) (copied from code/branches/resource2/data/levels/tutorial.oxw)
• data/levels/waypoints.oxw (copied) (copied from code/branches/resource2/data/levels/waypoints.oxw)
• data/lua (copied) (copied from code/branches/resource2/data/lua)
• data/lua/LuaStateInit.lua (copied) (copied from code/branches/resource2/data/lua/LuaStateInit.lua)
• data/overlays (copied) (copied from code/branches/resource2/data/overlays)
• data/overlays/OrxonoxLoading.overlay (copied) (copied from code/branches/resource2/data/overlays/OrxonoxLoading.overlay)
• data/overlays/debug.oxo (copied) (copied from code/branches/resource2/data/overlays/debug.oxo)
• data/overlays/hud.oxo (copied) (copied from code/branches/resource2/data/overlays/hud.oxo)
• data/overlays/hudtemplates3.oxo (copied) (copied from code/branches/resource2/data/overlays/hudtemplates3.oxo)
• data/overlays/ponghud.oxo (copied) (copied from code/branches/resource2/data/overlays/ponghud.oxo)
• data/overlays/stats.oxo (copied) (copied from code/branches/resource2/data/overlays/stats.oxo)
• data/overlays/teambasematchhud.oxo (copied) (copied from code/branches/resource2/data/overlays/teambasematchhud.oxo)
• data/overlays/underattackhud.oxo (copied) (copied from code/branches/resource2/data/overlays/underattackhud.oxo)
• data/particle (copied) (copied from code/branches/resource2/data/particle)
• data/particle/Example-Water.particle (copied) (copied from code/branches/resource2/data/particle/Example-Water.particle)
• data/particle/Example.particle (copied) (copied from code/branches/resource2/data/particle/Example.particle)
• data/particle/ExplosionComp1.particle (copied) (copied from code/branches/resource2/data/particle/ExplosionComp1.particle)
• data/particle/ExplosionComp2.particle (copied) (copied from code/branches/resource2/data/particle/ExplosionComp2.particle)
• data/particle/ExplosionComp4.particle (copied) (copied from code/branches/resource2/data/particle/ExplosionComp4.particle)
• data/particle/FireComp2.particle (copied) (copied from code/branches/resource2/data/particle/FireComp2.particle)
• data/particle/LaserGun.particle (copied) (copied from code/branches/resource2/data/particle/LaserGun.particle)
• data/particle/ThrusterFire.particle (copied) (copied from code/branches/resource2/data/particle/ThrusterFire.particle)
• data/particle/bigexplosion1part1.particle (copied) (copied from code/branches/resource2/data/particle/bigexplosion1part1.particle)
• data/particle/bigexplosion1part2.particle (copied) (copied from code/branches/resource2/data/particle/bigexplosion1part2.particle)
• data/particle/bigexplosion1part3.particle (copied) (copied from code/branches/resource2/data/particle/bigexplosion1part3.particle)
• data/particle/emitted_emitter.particle (copied) (copied from code/branches/resource2/data/particle/emitted_emitter.particle)
• data/particle/engineglow.particle (copied) (copied from code/branches/resource2/data/particle/engineglow.particle)
• data/particle/explosion1.particle (copied) (copied from code/branches/resource2/data/particle/explosion1.particle)
• data/particle/explosion2.particle (copied) (copied from code/branches/resource2/data/particle/explosion2.particle)
• data/particle/explosion2b.particle (copied) (copied from code/branches/resource2/data/particle/explosion2b.particle)
• data/particle/explosion3.particle (copied) (copied from code/branches/resource2/data/particle/explosion3.particle)
• data/particle/fairytwirl.particle (copied) (copied from code/branches/resource2/data/particle/fairytwirl.particle)
• data/particle/fire3.particle (copied) (copied from code/branches/resource2/data/particle/fire3.particle)
• data/particle/fire4.particle (copied) (copied from code/branches/resource2/data/particle/fire4.particle)
• data/particle/forcefield.particle (copied) (copied from code/branches/resource2/data/particle/forcefield.particle)
• data/particle/ray1.particle (copied) (copied from code/branches/resource2/data/particle/ray1.particle)
• data/particle/ray2.particle (copied) (copied from code/branches/resource2/data/particle/ray2.particle)
• data/particle/repairGold.particle (copied) (copied from code/branches/resource2/data/particle/repairGold.particle)
• data/particle/repairSilver.particle (copied) (copied from code/branches/resource2/data/particle/repairSilver.particle)
• data/particle/shot1.particle (copied) (copied from code/branches/resource2/data/particle/shot1.particle)
• data/particle/shot2.particle (copied) (copied from code/branches/resource2/data/particle/shot2.particle)
• data/particle/shot2_small.particle (copied) (copied from code/branches/resource2/data/particle/shot2_small.particle)
• data/particle/shot3_small.particle (copied) (copied from code/branches/resource2/data/particle/shot3_small.particle)
• data/particle/shotTest.particle (copied) (copied from code/branches/resource2/data/particle/shotTest.particle)
• data/particle/smoke1.particle (copied) (copied from code/branches/resource2/data/particle/smoke1.particle)
• data/particle/smoke2.particle (copied) (copied from code/branches/resource2/data/particle/smoke2.particle)
• data/particle/smoke3.particle (copied) (copied from code/branches/resource2/data/particle/smoke3.particle)
• data/particle/smoke4.particle (copied) (copied from code/branches/resource2/data/particle/smoke4.particle)
• data/particle/smoke5.particle (copied) (copied from code/branches/resource2/data/particle/smoke5.particle)
• data/particle/smoke6.particle (copied) (copied from code/branches/resource2/data/particle/smoke6.particle)
• data/particle/smoke7.particle (copied) (copied from code/branches/resource2/data/particle/smoke7.particle)
• data/particle/sparks.particle (copied) (copied from code/branches/resource2/data/particle/sparks.particle)
• data/particle/thruster1.particle (copied) (copied from code/branches/resource2/data/particle/thruster1.particle)
• data/particle/thruster2.particle (copied) (copied from code/branches/resource2/data/particle/thruster2.particle)
• data/particle/thruster3.particle (copied) (copied from code/branches/resource2/data/particle/thruster3.particle)
• data/resources.oxr (copied) (copied from code/branches/resource2/data/resources.oxr)
• data/tcl (copied) (copied from code/branches/resource2/data/tcl)
• data/tcl/init.tcl (copied) (copied from code/branches/resource2/data/tcl/init.tcl)
• data/tcl/irc.tcl (copied) (copied from code/branches/resource2/data/tcl/irc.tcl)
• data/tcl/irk (copied) (copied from code/branches/resource2/data/tcl/irk)
• data/tcl/irk/README (copied) (copied from code/branches/resource2/data/tcl/irk/README)
• data/tcl/irk/docs (copied) (copied from code/branches/resource2/data/tcl/irk/docs)
• data/tcl/irk/docs/changes.txt (copied) (copied from code/branches/resource2/data/tcl/irk/docs/changes.txt)
• data/tcl/irk/docs/todo.txt (copied) (copied from code/branches/resource2/data/tcl/irk/docs/todo.txt)
• data/tcl/irk/docs/usage.txt (copied) (copied from code/branches/resource2/data/tcl/irk/docs/usage.txt)
• data/tcl/irk/examples (copied) (copied from code/branches/resource2/data/tcl/irk/examples)
• data/tcl/irk/examples/fortunebot.tcl (copied) (copied from code/branches/resource2/data/tcl/irk/examples/fortunebot.tcl)
• data/tcl/irk/examples/mysaint.tcl (copied) (copied from code/branches/resource2/data/tcl/irk/examples/mysaint.tcl)
• data/tcl/irk/irk.tcl (copied) (copied from code/branches/resource2/data/tcl/irk/irk.tcl)
• data/tcl/irk/lib (copied) (copied from code/branches/resource2/data/tcl/irk/lib)
• data/tcl/irk/lib/irkauth.tcl (copied) (copied from code/branches/resource2/data/tcl/irk/lib/irkauth.tcl)
• data/tcl/irk/lib/irkcommand.tcl (copied) (copied from code/branches/resource2/data/tcl/irk/lib/irkcommand.tcl)
• data/tcl/irk/lib/irkconnect.tcl (copied) (copied from code/branches/resource2/data/tcl/irk/lib/irkconnect.tcl)
• data/tcl/irk/lib/irkctcptcl.tcl (copied) (copied from code/branches/resource2/data/tcl/irk/lib/irkctcptcl.tcl)
• data/tcl/irk/lib/irkdispatch.tcl (copied) (copied from code/branches/resource2/data/tcl/irk/lib/irkdispatch.tcl)
• data/tcl/irk/lib/irkflow.tcl (copied) (copied from code/branches/resource2/data/tcl/irk/lib/irkflow.tcl)
• data/tcl/irk/lib/irkqueue.tcl (copied) (copied from code/branches/resource2/data/tcl/irk/lib/irkqueue.tcl)
• data/tcl/irk/lib/irkreceive.tcl (copied) (copied from code/branches/resource2/data/tcl/irk/lib/irkreceive.tcl)
• data/tcl/irk/lib/irkservers.tcl (copied) (copied from code/branches/resource2/data/tcl/irk/lib/irkservers.tcl)
• data/tcl/irk/lib/irkstate.tcl (copied) (copied from code/branches/resource2/data/tcl/irk/lib/irkstate.tcl)
• data/tcl/irk/lib/irkutil.tcl (copied) (copied from code/branches/resource2/data/tcl/irk/lib/irkutil.tcl)
• data/tcl/irk/pkgIndex.tcl (copied) (copied from code/branches/resource2/data/tcl/irk/pkgIndex.tcl)
• data/tcl/irk/socks (copied) (copied from code/branches/resource2/data/tcl/irk/socks)
• data/tcl/irk/socks/socks.tcl (copied) (copied from code/branches/resource2/data/tcl/irk/socks/socks.tcl)
• data/tcl/remote.tcl (copied) (copied from code/branches/resource2/data/tcl/remote.tcl)
• data/tcl/telnet_server.tcl (copied) (copied from code/branches/resource2/data/tcl/telnet_server.tcl)