[Orxonox-commit 972] r5695 - in code/trunk: . bin cmake data data/defaultConfig data/gui data/gui/configs data/gui/layouts data/gui/schemes data/gui/scripts data/levels data/levels/includes data/levels/old data/levels/templates data/lua data/overlays data/particle data/tcl data/tcl/irk data/tcl/irk/docs data/tcl/irk/examples data/tcl/irk/lib data/tcl/irk/socks doc/api src src/ceguilua src/core src/core/input src/network src/network/packet src/network/synchronisable src/ois src/ois/linux src/ois/win32 src/orxonox src/orxonox/gamestates src/orxonox/objects src/orxonox/sound src/orxonox/tools src/util

Fabian 'x3n' Landau x3n at orxonox.net
Sun Aug 30 02:28:34 CEST 2009 

Author: rgrieder
Date: 2009-08-30 02:22:00 +0200 (Sun, 30 Aug 2009)
New Revision: 5695

Added:
    code/trunk/cmake/CompilerConfig.cmake
    code/trunk/cmake/CompilerConfigGCC.cmake
    code/trunk/cmake/CompilerConfigMSVC.cmake
    code/trunk/cmake/InstallConfig.cmake
    code/trunk/data/
    code/trunk/data/CMakeLists.txt
    code/trunk/data/DataInstallScript.cmake
    code/trunk/data/defaultConfig/
    code/trunk/data/defaultConfig/keybindings.ini
    code/trunk/data/defaultConfig/masterKeybindings.ini
    code/trunk/data/gui/
    code/trunk/data/gui/configs/
    code/trunk/data/gui/configs/CEGUIConfig.xsd
    code/trunk/data/gui/configs/Falagard.xsd
    code/trunk/data/gui/configs/Font.xsd
    code/trunk/data/gui/configs/GUILayout.xsd
    code/trunk/data/gui/configs/GUIScheme.xsd
    code/trunk/data/gui/configs/Imageset.xsd
    code/trunk/data/gui/layouts/
    code/trunk/data/gui/layouts/CompositorDemo.layout
    code/trunk/data/gui/layouts/Console.wnd
    code/trunk/data/gui/layouts/CrowdDemo.layout
    code/trunk/data/gui/layouts/Demo7Windows.layout
    code/trunk/data/gui/layouts/Demo8.layout
    code/trunk/data/gui/layouts/DragDropDemo.layout
    code/trunk/data/gui/layouts/FontDemo.layout
    code/trunk/data/gui/layouts/GUILayout.xsd
    code/trunk/data/gui/layouts/InGameTest.layout
    code/trunk/data/gui/layouts/InstancingDemo.layout
    code/trunk/data/gui/layouts/MainMenu.layout
    code/trunk/data/gui/layouts/PickupInventory.layout
    code/trunk/data/gui/layouts/TabControlDemo.layout
    code/trunk/data/gui/layouts/TabPage.layout
    code/trunk/data/gui/layouts/TabPage1.layout
    code/trunk/data/gui/layouts/TabPage2.layout
    code/trunk/data/gui/layouts/TextDemo.layout
    code/trunk/data/gui/layouts/TreeDemoTaharez.layout
    code/trunk/data/gui/layouts/VanillaConsole.layout
    code/trunk/data/gui/layouts/VanillaWindows.layout
    code/trunk/data/gui/layouts/cegui8.layout
    code/trunk/data/gui/layouts/facial.layout
    code/trunk/data/gui/layouts/ogregui.layout
    code/trunk/data/gui/layouts/shadows.layout
    code/trunk/data/gui/schemes/
    code/trunk/data/gui/schemes/Demo8.scheme
    code/trunk/data/gui/schemes/GUIScheme.xsd
    code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme
    code/trunk/data/gui/schemes/TaharezLook.scheme
    code/trunk/data/gui/schemes/TaharezLookSkin.scheme
    code/trunk/data/gui/schemes/TaharezLookWidgetAliases.scheme
    code/trunk/data/gui/schemes/TaharezLookWidgets.scheme
    code/trunk/data/gui/schemes/VanillaSkin.scheme
    code/trunk/data/gui/schemes/WindowsLook.scheme
    code/trunk/data/gui/schemes/WindowsLookWidgets.scheme
    code/trunk/data/gui/scripts/
    code/trunk/data/gui/scripts/BasicGUI.lua
    code/trunk/data/gui/scripts/InitialiseGUI.lua
    code/trunk/data/gui/scripts/MainMenu.lua
    code/trunk/data/gui/scripts/PickupInventory.lua
    code/trunk/data/levels/
    code/trunk/data/levels/empty_level.oxw
    code/trunk/data/levels/gametype_asteroids.oxw
    code/trunk/data/levels/gametype_underattack.oxw
    code/trunk/data/levels/includes/
    code/trunk/data/levels/includes/CuboidSpaceStation.lua
    code/trunk/data/levels/includes/weaponsettings1.oxi
    code/trunk/data/levels/includes/weaponsettings2.oxi
    code/trunk/data/levels/includes/weaponsettings3.oxi
    code/trunk/data/levels/includes/weaponsettings_H2.oxi
    code/trunk/data/levels/includes/weaponsettings_pirate.oxi
    code/trunk/data/levels/old/
    code/trunk/data/levels/old/CuboidSpaceStation.oxw
    code/trunk/data/levels/old/physicstest.oxw
    code/trunk/data/levels/old/physicstest2.oxw
    code/trunk/data/levels/old/planettest.oxw
    code/trunk/data/levels/old/presentation_physics.oxw
    code/trunk/data/levels/old/princessaeryn.oxw
    code/trunk/data/levels/old/questsystem.oxw
    code/trunk/data/levels/old/sample4.oxw
    code/trunk/data/levels/old/spaceshiptemplates_physics.oxw
    code/trunk/data/levels/old/tutorial_hs08.oxw
    code/trunk/data/levels/pickuptest.oxw
    code/trunk/data/levels/presentation.oxw
    code/trunk/data/levels/presentation09.oxw
    code/trunk/data/levels/presentation09b.oxw
    code/trunk/data/levels/presentation_dm.oxw
    code/trunk/data/levels/presentation_pong.oxw
    code/trunk/data/levels/teambasematchlevel.oxw
    code/trunk/data/levels/teamdeathmatch.oxw
    code/trunk/data/levels/templates/
    code/trunk/data/levels/templates/spaceship_H2.oxt
    code/trunk/data/levels/templates/spaceship_assff.oxt
    code/trunk/data/levels/templates/spaceship_pirate.oxt
    code/trunk/data/levels/tutorial.oxw
    code/trunk/data/levels/waypoints.oxw
    code/trunk/data/lua/
    code/trunk/data/lua/LuaStateInit.lua
    code/trunk/data/overlays/
    code/trunk/data/overlays/OrxonoxLoading.overlay
    code/trunk/data/overlays/debug.oxo
    code/trunk/data/overlays/hud.oxo
    code/trunk/data/overlays/hudtemplates3.oxo
    code/trunk/data/overlays/ponghud.oxo
    code/trunk/data/overlays/stats.oxo
    code/trunk/data/overlays/teambasematchhud.oxo
    code/trunk/data/overlays/underattackhud.oxo
    code/trunk/data/particle/
    code/trunk/data/particle/Example-Water.particle
    code/trunk/data/particle/Example.particle
    code/trunk/data/particle/ExplosionComp1.particle
    code/trunk/data/particle/ExplosionComp2.particle
    code/trunk/data/particle/ExplosionComp4.particle
    code/trunk/data/particle/FireComp2.particle
    code/trunk/data/particle/LaserGun.particle
    code/trunk/data/particle/ThrusterFire.particle
    code/trunk/data/particle/bigexplosion1part1.particle
    code/trunk/data/particle/bigexplosion1part2.particle
    code/trunk/data/particle/bigexplosion1part3.particle
    code/trunk/data/particle/emitted_emitter.particle
    code/trunk/data/particle/engineglow.particle
    code/trunk/data/particle/explosion1.particle
    code/trunk/data/particle/explosion2.particle
    code/trunk/data/particle/explosion2b.particle
    code/trunk/data/particle/explosion3.particle
    code/trunk/data/particle/fairytwirl.particle
    code/trunk/data/particle/fire3.particle
    code/trunk/data/particle/fire4.particle
    code/trunk/data/particle/forcefield.particle
    code/trunk/data/particle/ray1.particle
    code/trunk/data/particle/ray2.particle
    code/trunk/data/particle/repairGold.particle
    code/trunk/data/particle/repairSilver.particle
    code/trunk/data/particle/shot1.particle
    code/trunk/data/particle/shot2.particle
    code/trunk/data/particle/shot2_small.particle
    code/trunk/data/particle/shot3_small.particle
    code/trunk/data/particle/shotTest.particle
    code/trunk/data/particle/smoke1.particle
    code/trunk/data/particle/smoke2.particle
    code/trunk/data/particle/smoke3.particle
    code/trunk/data/particle/smoke4.particle
    code/trunk/data/particle/smoke5.particle
    code/trunk/data/particle/smoke6.particle
    code/trunk/data/particle/smoke7.particle
    code/trunk/data/particle/sparks.particle
    code/trunk/data/particle/thruster1.particle
    code/trunk/data/particle/thruster2.particle
    code/trunk/data/particle/thruster3.particle
    code/trunk/data/resources.oxr
    code/trunk/data/tcl/
    code/trunk/data/tcl/init.tcl
    code/trunk/data/tcl/irc.tcl
    code/trunk/data/tcl/irk/
    code/trunk/data/tcl/irk/README
    code/trunk/data/tcl/irk/docs/
    code/trunk/data/tcl/irk/docs/changes.txt
    code/trunk/data/tcl/irk/docs/todo.txt
    code/trunk/data/tcl/irk/docs/usage.txt
    code/trunk/data/tcl/irk/examples/
    code/trunk/data/tcl/irk/examples/fortunebot.tcl
    code/trunk/data/tcl/irk/examples/mysaint.tcl
    code/trunk/data/tcl/irk/irk.tcl
    code/trunk/data/tcl/irk/lib/
    code/trunk/data/tcl/irk/lib/irkauth.tcl
    code/trunk/data/tcl/irk/lib/irkcommand.tcl
    code/trunk/data/tcl/irk/lib/irkconnect.tcl
    code/trunk/data/tcl/irk/lib/irkctcptcl.tcl
    code/trunk/data/tcl/irk/lib/irkdispatch.tcl
    code/trunk/data/tcl/irk/lib/irkflow.tcl
    code/trunk/data/tcl/irk/lib/irkqueue.tcl
    code/trunk/data/tcl/irk/lib/irkreceive.tcl
    code/trunk/data/tcl/irk/lib/irkservers.tcl
    code/trunk/data/tcl/irk/lib/irkstate.tcl
    code/trunk/data/tcl/irk/lib/irkutil.tcl
    code/trunk/data/tcl/irk/pkgIndex.tcl
    code/trunk/data/tcl/irk/socks/
    code/trunk/data/tcl/irk/socks/socks.tcl
    code/trunk/data/tcl/remote.tcl
    code/trunk/data/tcl/telnet_server.tcl
    code/trunk/src/OrxonoxConfig.cmake
    code/trunk/src/core/LuaState.cc
    code/trunk/src/core/LuaState.h
    code/trunk/src/core/MemoryArchive.cc
    code/trunk/src/core/MemoryArchive.h
    code/trunk/src/core/Resource.cc
    code/trunk/src/core/Resource.h
    code/trunk/src/core/ToluaInterface.h
    code/trunk/src/orxonox/tools/ResourceCollection.cc
    code/trunk/src/orxonox/tools/ResourceCollection.h
    code/trunk/src/orxonox/tools/ResourceLocation.cc
    code/trunk/src/orxonox/tools/ResourceLocation.h
Removed:
    code/trunk/cmake/BuildConfig.cmake
    code/trunk/cmake/BuildConfigGCC.cmake
    code/trunk/cmake/BuildConfigMSVC.cmake
    code/trunk/cmake/Media.cmake
    code/trunk/data/CMakeLists.txt
    code/trunk/data/DataInstallScript.cmake
    code/trunk/data/defaultConfig/
    code/trunk/data/defaultConfig/keybindings.ini
    code/trunk/data/defaultConfig/masterKeybindings.ini
    code/trunk/data/gui/
    code/trunk/data/gui/configs/
    code/trunk/data/gui/configs/CEGUIConfig.xsd
    code/trunk/data/gui/configs/Falagard.xsd
    code/trunk/data/gui/configs/Font.xsd
    code/trunk/data/gui/configs/GUILayout.xsd
    code/trunk/data/gui/configs/GUIScheme.xsd
    code/trunk/data/gui/configs/Imageset.xsd
    code/trunk/data/gui/layouts/
    code/trunk/data/gui/layouts/CompositorDemo.layout
    code/trunk/data/gui/layouts/Console.wnd
    code/trunk/data/gui/layouts/CrowdDemo.layout
    code/trunk/data/gui/layouts/Demo7Windows.layout
    code/trunk/data/gui/layouts/Demo8.layout
    code/trunk/data/gui/layouts/DragDropDemo.layout
    code/trunk/data/gui/layouts/FontDemo.layout
    code/trunk/data/gui/layouts/GUILayout.xsd
    code/trunk/data/gui/layouts/InGameTest.layout
    code/trunk/data/gui/layouts/InstancingDemo.layout
    code/trunk/data/gui/layouts/MainMenu.layout
    code/trunk/data/gui/layouts/PickupInventory.layout
    code/trunk/data/gui/layouts/TabControlDemo.layout
    code/trunk/data/gui/layouts/TabPage.layout
    code/trunk/data/gui/layouts/TabPage1.layout
    code/trunk/data/gui/layouts/TabPage2.layout
    code/trunk/data/gui/layouts/TextDemo.layout
    code/trunk/data/gui/layouts/TreeDemoTaharez.layout
    code/trunk/data/gui/layouts/VanillaConsole.layout
    code/trunk/data/gui/layouts/VanillaWindows.layout
    code/trunk/data/gui/layouts/cegui8.layout
    code/trunk/data/gui/layouts/facial.layout
    code/trunk/data/gui/layouts/ogregui.layout
    code/trunk/data/gui/layouts/shadows.layout
    code/trunk/data/gui/schemes/
    code/trunk/data/gui/schemes/Demo8.scheme
    code/trunk/data/gui/schemes/GUIScheme.xsd
    code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme
    code/trunk/data/gui/schemes/TaharezLook.scheme
    code/trunk/data/gui/schemes/TaharezLookSkin.scheme
    code/trunk/data/gui/schemes/TaharezLookWidgetAliases.scheme
    code/trunk/data/gui/schemes/TaharezLookWidgets.scheme
    code/trunk/data/gui/schemes/VanillaSkin.scheme
    code/trunk/data/gui/schemes/WindowsLook.scheme
    code/trunk/data/gui/schemes/WindowsLookWidgets.scheme
    code/trunk/data/gui/scripts/
    code/trunk/data/gui/scripts/BasicGUI.lua
    code/trunk/data/gui/scripts/InitialiseGUI.lua
    code/trunk/data/gui/scripts/MainMenu.lua
    code/trunk/data/gui/scripts/PickupInventory.lua
    code/trunk/data/levels/
    code/trunk/data/levels/empty_level.oxw
    code/trunk/data/levels/gametype_asteroids.oxw
    code/trunk/data/levels/gametype_underattack.oxw
    code/trunk/data/levels/includes/
    code/trunk/data/levels/includes/CuboidSpaceStation.lua
    code/trunk/data/levels/includes/weaponsettings1.oxi
    code/trunk/data/levels/includes/weaponsettings2.oxi
    code/trunk/data/levels/includes/weaponsettings3.oxi
    code/trunk/data/levels/includes/weaponsettings_H2.oxi
    code/trunk/data/levels/includes/weaponsettings_pirate.oxi
    code/trunk/data/levels/old/
    code/trunk/data/levels/old/CuboidSpaceStation.oxw
    code/trunk/data/levels/old/physicstest.oxw
    code/trunk/data/levels/old/physicstest2.oxw
    code/trunk/data/levels/old/planettest.oxw
    code/trunk/data/levels/old/presentation_physics.oxw
    code/trunk/data/levels/old/princessaeryn.oxw
    code/trunk/data/levels/old/questsystem.oxw
    code/trunk/data/levels/old/sample4.oxw
    code/trunk/data/levels/old/spaceshiptemplates_physics.oxw
    code/trunk/data/levels/old/tutorial_hs08.oxw
    code/trunk/data/levels/pickuptest.oxw
    code/trunk/data/levels/presentation.oxw
    code/trunk/data/levels/presentation09.oxw
    code/trunk/data/levels/presentation09b.oxw
    code/trunk/data/levels/presentation_dm.oxw
    code/trunk/data/levels/presentation_pong.oxw
    code/trunk/data/levels/teambasematchlevel.oxw
    code/trunk/data/levels/teamdeathmatch.oxw
    code/trunk/data/levels/templates/
    code/trunk/data/levels/templates/spaceship_H2.oxt
    code/trunk/data/levels/templates/spaceship_assff.oxt
    code/trunk/data/levels/templates/spaceship_pirate.oxt
    code/trunk/data/levels/tutorial.oxw
    code/trunk/data/levels/waypoints.oxw
    code/trunk/data/lua/
    code/trunk/data/lua/LuaStateInit.lua
    code/trunk/data/overlays/
    code/trunk/data/overlays/OrxonoxLoading.overlay
    code/trunk/data/overlays/debug.oxo
    code/trunk/data/overlays/hud.oxo
    code/trunk/data/overlays/hudtemplates3.oxo
    code/trunk/data/overlays/ponghud.oxo
    code/trunk/data/overlays/stats.oxo
    code/trunk/data/overlays/teambasematchhud.oxo
    code/trunk/data/overlays/underattackhud.oxo
    code/trunk/data/particle/
    code/trunk/data/particle/Example-Water.particle
    code/trunk/data/particle/Example.particle
    code/trunk/data/particle/ExplosionComp1.particle
    code/trunk/data/particle/ExplosionComp2.particle
    code/trunk/data/particle/ExplosionComp4.particle
    code/trunk/data/particle/FireComp2.particle
    code/trunk/data/particle/LaserGun.particle
    code/trunk/data/particle/ThrusterFire.particle
    code/trunk/data/particle/bigexplosion1part1.particle
    code/trunk/data/particle/bigexplosion1part2.particle
    code/trunk/data/particle/bigexplosion1part3.particle
    code/trunk/data/particle/emitted_emitter.particle
    code/trunk/data/particle/engineglow.particle
    code/trunk/data/particle/explosion1.particle
    code/trunk/data/particle/explosion2.particle
    code/trunk/data/particle/explosion2b.particle
    code/trunk/data/particle/explosion3.particle
    code/trunk/data/particle/fairytwirl.particle
    code/trunk/data/particle/fire3.particle
    code/trunk/data/particle/fire4.particle
    code/trunk/data/particle/forcefield.particle
    code/trunk/data/particle/ray1.particle
    code/trunk/data/particle/ray2.particle
    code/trunk/data/particle/repairGold.particle
    code/trunk/data/particle/repairSilver.particle
    code/trunk/data/particle/shot1.particle
    code/trunk/data/particle/shot2.particle
    code/trunk/data/particle/shot2_small.particle
    code/trunk/data/particle/shot3_small.particle
    code/trunk/data/particle/shotTest.particle
    code/trunk/data/particle/smoke1.particle
    code/trunk/data/particle/smoke2.particle
    code/trunk/data/particle/smoke3.particle
    code/trunk/data/particle/smoke4.particle
    code/trunk/data/particle/smoke5.particle
    code/trunk/data/particle/smoke6.particle
    code/trunk/data/particle/smoke7.particle
    code/trunk/data/particle/sparks.particle
    code/trunk/data/particle/thruster1.particle
    code/trunk/data/particle/thruster2.particle
    code/trunk/data/particle/thruster3.particle
    code/trunk/data/resources.oxr
    code/trunk/data/tcl/
    code/trunk/data/tcl/init.tcl
    code/trunk/data/tcl/irc.tcl
    code/trunk/data/tcl/irk/
    code/trunk/data/tcl/irk/README
    code/trunk/data/tcl/irk/docs/
    code/trunk/data/tcl/irk/docs/changes.txt
    code/trunk/data/tcl/irk/docs/todo.txt
    code/trunk/data/tcl/irk/docs/usage.txt
    code/trunk/data/tcl/irk/examples/
    code/trunk/data/tcl/irk/examples/fortunebot.tcl
    code/trunk/data/tcl/irk/examples/mysaint.tcl
    code/trunk/data/tcl/irk/irk.tcl
    code/trunk/data/tcl/irk/lib/
    code/trunk/data/tcl/irk/lib/irkauth.tcl
    code/trunk/data/tcl/irk/lib/irkcommand.tcl
    code/trunk/data/tcl/irk/lib/irkconnect.tcl
    code/trunk/data/tcl/irk/lib/irkctcptcl.tcl
    code/trunk/data/tcl/irk/lib/irkdispatch.tcl
    code/trunk/data/tcl/irk/lib/irkflow.tcl
    code/trunk/data/tcl/irk/lib/irkqueue.tcl
    code/trunk/data/tcl/irk/lib/irkreceive.tcl
    code/trunk/data/tcl/irk/lib/irkservers.tcl
    code/trunk/data/tcl/irk/lib/irkstate.tcl
    code/trunk/data/tcl/irk/lib/irkutil.tcl
    code/trunk/data/tcl/irk/pkgIndex.tcl
    code/trunk/data/tcl/irk/socks/
    code/trunk/data/tcl/irk/socks/socks.tcl
    code/trunk/data/tcl/remote.tcl
    code/trunk/data/tcl/telnet_server.tcl
    code/trunk/src/core/LuaBind.cc
    code/trunk/src/core/LuaBind.h
Modified:
    code/trunk/
    code/trunk/CMakeLists.txt
    code/trunk/bin/CMakeLists.txt
    code/trunk/bin/client1.bat.in
    code/trunk/bin/client2.bat.in
    code/trunk/bin/dedicated.bat.in
    code/trunk/bin/run.bat.in
    code/trunk/bin/server.bat.in
    code/trunk/bin/standalone.bat.in
    code/trunk/cmake/CheckOGREPlugins.cmake
    code/trunk/cmake/GenerateToluaBindings.cmake
    code/trunk/cmake/LibraryConfig.cmake
    code/trunk/cmake/PackageConfig.cmake
    code/trunk/cmake/PackageConfigMSVC.cmake
    code/trunk/cmake/PackageConfigMinGW.cmake
    code/trunk/cmake/ParseMacroArguments.cmake
    code/trunk/cmake/TargetUtilities.cmake
    code/trunk/doc/api/CMakeLists.txt
    code/trunk/src/CMakeLists.txt
    code/trunk/src/OrxonoxConfig.h.in
    code/trunk/src/SpecialConfig.h.in
    code/trunk/src/ceguilua/CMakeLists.txt
    code/trunk/src/core/CMakeLists.txt
    code/trunk/src/core/Clock.h
    code/trunk/src/core/ConfigFileManager.cc
    code/trunk/src/core/ConfigFileManager.h
    code/trunk/src/core/ConfigValueContainer.h
    code/trunk/src/core/Core.cc
    code/trunk/src/core/Core.h
    code/trunk/src/core/CorePrereqs.h
    code/trunk/src/core/DynLibManager.h
    code/trunk/src/core/GUIManager.cc
    code/trunk/src/core/GUIManager.h
    code/trunk/src/core/Game.cc
    code/trunk/src/core/Game.h
    code/trunk/src/core/GraphicsManager.cc
    code/trunk/src/core/GraphicsManager.h
    code/trunk/src/core/Identifier.cc
    code/trunk/src/core/Identifier.h
    code/trunk/src/core/Loader.cc
    code/trunk/src/core/Loader.h
    code/trunk/src/core/TclBind.cc
    code/trunk/src/core/TclThreadManager.cc
    code/trunk/src/core/XMLFile.h
    code/trunk/src/core/input/Button.cc
    code/trunk/src/core/input/InputManager.cc
    code/trunk/src/core/input/InputManager.h
    code/trunk/src/core/input/InputState.cc
    code/trunk/src/core/input/InputState.h
    code/trunk/src/core/input/KeyBinder.cc
    code/trunk/src/core/input/KeyBinder.h
    code/trunk/src/core/input/KeyDetector.cc
    code/trunk/src/network/CMakeLists.txt
    code/trunk/src/network/ClientInformation.h
    code/trunk/src/network/TODO
    code/trunk/src/network/packet/CMakeLists.txt
    code/trunk/src/network/synchronisable/CMakeLists.txt
    code/trunk/src/ois/OISEffect.cpp
    code/trunk/src/ois/OISEffect.h
    code/trunk/src/ois/OISForceFeedback.cpp
    code/trunk/src/ois/OISForceFeedback.h
    code/trunk/src/ois/OISJoyStick.h
    code/trunk/src/ois/OISPrereqs.h
    code/trunk/src/ois/changes_orxonox.diff
    code/trunk/src/ois/linux/EventHelpers.cpp
    code/trunk/src/ois/linux/EventHelpers.h
    code/trunk/src/ois/linux/LinuxForceFeedback.cpp
    code/trunk/src/ois/linux/LinuxForceFeedback.h
    code/trunk/src/ois/linux/LinuxJoyStickEvents.cpp
    code/trunk/src/ois/win32/Win32ForceFeedback.cpp
    code/trunk/src/ois/win32/Win32ForceFeedback.h
    code/trunk/src/ois/win32/Win32InputManager.cpp
    code/trunk/src/ois/win32/Win32InputManager.h
    code/trunk/src/ois/win32/Win32JoyStick.cpp
    code/trunk/src/ois/win32/Win32JoyStick.h
    code/trunk/src/ois/win32/Win32KeyBoard.cpp
    code/trunk/src/orxonox/LevelManager.cc
    code/trunk/src/orxonox/Main.cc
    code/trunk/src/orxonox/gamestates/GSDedicated.cc
    code/trunk/src/orxonox/gamestates/GSGraphics.cc
    code/trunk/src/orxonox/gamestates/GSLevel.cc
    code/trunk/src/orxonox/gamestates/GSMainMenu.cc
    code/trunk/src/orxonox/gamestates/GSRoot.cc
    code/trunk/src/orxonox/objects/Level.cc
    code/trunk/src/orxonox/objects/Script.cc
    code/trunk/src/orxonox/objects/Script.h
    code/trunk/src/orxonox/orxonox-main.vcproj.user.in
    code/trunk/src/orxonox/sound/SoundBase.cc
    code/trunk/src/orxonox/sound/SoundBase.h
    code/trunk/src/orxonox/tools/CMakeLists.txt
    code/trunk/src/orxonox/tools/Mesh.cc
    code/trunk/src/util/CMakeLists.txt
    code/trunk/src/util/Debug.h
Log:
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!!!

More information about the Orxonox-commit mailing list