# # ChangeLog for code/branches/resource2 # # Generated by Trac 1.0.9 # Nov 23, 2024, 4:03:48 AM Sat, 29 Aug 2009 21:30:36 GMT rgrieder [5694] * code/branches/resource2 (modified) Removed external repository again to prepare for merging. Sat, 29 Aug 2009 20:05:55 GMT rgrieder [5691] * code/branches/resource2/CMakeLists.txt (modified) * code/branches/resource2/cmake/CompilerConfigMSVC.cmake (modified) * code/branches/resource2/src/OrxonoxConfig.cmake (modified) Enable link time code generation for visual studio if ORXONOX_RELEASE ... Sat, 29 Aug 2009 20:04:43 GMT rgrieder [5690] * code/branches/resource2/src/core/ConfigValueContainer.h (modified) * code/branches/resource2/src/core/Identifier.cc (modified) * code/branches/resource2/src/core/Identifier.h (modified) * code/branches/resource2/src/core/TclThreadManager.cc (modified) * code/branches/resource2/src/network/ClientInformation.h (modified) * code/branches/resource2/src/util/Debug.h (modified) Where the hell did those 's's come from? ;) Sat, 29 Aug 2009 20:04:04 GMT rgrieder [5689] * code/branches/resource2/cmake/LibraryConfig.cmake (modified) * code/branches/resource2/data/particle/Example-Water.particle (modified) * code/branches/resource2/data/particle/Example.particle (modified) * code/branches/resource2/data/particle/ExplosionComp1.particle (modified) * code/branches/resource2/data/particle/ExplosionComp2.particle (modified) * code/branches/resource2/data/particle/ExplosionComp4.particle (modified) * code/branches/resource2/data/particle/FireComp2.particle (modified) * code/branches/resource2/data/particle/LaserGun.particle (modified) * code/branches/resource2/data/particle/ThrusterFire.particle (modified) * code/branches/resource2/data/particle/bigexplosion1part1.particle (modified) * code/branches/resource2/data/particle/bigexplosion1part2.particle (modified) * code/branches/resource2/data/particle/bigexplosion1part3.particle (modified) * code/branches/resource2/data/particle/emitted_emitter.particle (modified) * code/branches/resource2/data/particle/engineglow.particle (modified) * code/branches/resource2/data/particle/explosion1.particle (modified) * code/branches/resource2/data/particle/explosion2.particle (modified) * code/branches/resource2/data/particle/explosion2b.particle (modified) * code/branches/resource2/data/particle/explosion3.particle (modified) * code/branches/resource2/data/particle/fairytwirl.particle (modified) * code/branches/resource2/data/particle/fire3.particle (modified) * code/branches/resource2/data/particle/fire4.particle (modified) * code/branches/resource2/data/particle/forcefield.particle (modified) * code/branches/resource2/data/particle/ray1.particle (modified) * code/branches/resource2/data/particle/ray2.particle (modified) * code/branches/resource2/data/particle/repairGold.particle (modified) * code/branches/resource2/data/particle/repairSilver.particle (modified) * code/branches/resource2/data/particle/shot1.particle (modified) * code/branches/resource2/data/particle/shot2.particle (modified) * code/branches/resource2/data/particle/shot2_small.particle (modified) * code/branches/resource2/data/particle/shot3_small.particle (modified) * code/branches/resource2/data/particle/shotTest.particle (modified) * code/branches/resource2/data/particle/smoke1.particle (modified) * code/branches/resource2/data/particle/smoke2.particle (modified) * code/branches/resource2/data/particle/smoke3.particle (modified) * code/branches/resource2/data/particle/smoke4.particle (modified) * code/branches/resource2/data/particle/smoke5.particle (modified) * code/branches/resource2/data/particle/smoke6.particle (modified) * code/branches/resource2/data/particle/smoke7.particle (modified) * code/branches/resource2/data/particle/sparks.particle (modified) * code/branches/resource2/data/particle/thruster1.particle (modified) * code/branches/resource2/data/particle/thruster2.particle (modified) * code/branches/resource2/data/particle/thruster3.particle (modified) * code/branches/resource2/src/core/CMakeLists.txt (modified) * code/branches/resource2/src/core/CorePrereqs.h (modified) * code/branches/resource2/src/core/GraphicsManager.cc (modified) * code/branches/resource2/src/core/GraphicsManager.h (modified) * code/branches/resource2/src/core/MemoryArchive.cc (added) * code/branches/resource2/src/core/MemoryArchive.h (added) Experimental support for OGRE v1.6 "Shoggoth". I had to write a ... Sat, 29 Aug 2009 20:00:10 GMT rgrieder [5688] * code/branches/resource2/src/OrxonoxConfig.h.in (modified) Added the remaining boost smart pointers to OrxonoxConfig.h.in (just ... Wed, 26 Aug 2009 19:31:25 GMT rgrieder [5684] * code/branches/resource2/src/orxonox/tools/Mesh.cc (modified) Build fix for Ogre 1.6 Shoggoth. Everything runs except for the ... Wed, 26 Aug 2009 18:54:17 GMT rgrieder [5683] * code/branches/resource2/src/core/XMLFile.h (modified) Bugfix for XMLFile. No comment please... Tue, 25 Aug 2009 16:53:13 GMT rgrieder [5682] * code/branches/resource2/src/core/GraphicsManager.cc (modified) Bugfix (probably for the OpenGL renderer only). Mon, 24 Aug 2009 08:12:45 GMT rgrieder [5672] * code/branches/resource2/src/core/GUIManager.cc (modified) * code/branches/resource2/src/core/input/InputManager.cc (modified) Forgot to remove windows conditional compilation. Mon, 24 Aug 2009 08:10:05 GMT rgrieder [5671] * code/branches/resource2/src/core/input/InputManager.cc (modified) Non exclusive input should theoretically work too on Linux now. Mon, 24 Aug 2009 07:43:34 GMT rgrieder [5670] * code/branches/resource2/src/core/Core.cc (modified) * code/branches/resource2/src/core/GUIManager.cc (modified) * code/branches/resource2/src/core/GUIManager.h (modified) * code/branches/resource2/src/core/GraphicsManager.cc (modified) * code/branches/resource2/src/core/GraphicsManager.h (modified) * code/branches/resource2/src/core/input/InputManager.cc (modified) * code/branches/resource2/src/core/input/InputManager.h (modified) * code/branches/resource2/src/core/input/InputState.cc (modified) * code/branches/resource2/src/core/input/InputState.h (modified) * code/branches/resource2/src/orxonox/gamestates/GSMainMenu.cc (modified) Added support for non exclusive mouse mode on Windows. This means you ... Sat, 22 Aug 2009 22:45:46 GMT rgrieder [5669] * code/branches/resource2/src/ois/changes_orxonox.diff (modified) * code/branches/resource2/src/ois/linux/EventHelpers.cpp (modified) OIS build fix for linux. Sat, 22 Aug 2009 21:16:34 GMT rgrieder [5668] * code/branches/resource2/src/ois/OISEffect.cpp (modified) * code/branches/resource2/src/ois/OISEffect.h (modified) * code/branches/resource2/src/ois/OISForceFeedback.cpp (modified) * code/branches/resource2/src/ois/OISForceFeedback.h (modified) * code/branches/resource2/src/ois/OISJoyStick.h (modified) * code/branches/resource2/src/ois/OISPrereqs.h (modified) * code/branches/resource2/src/ois/linux/EventHelpers.cpp (modified) * code/branches/resource2/src/ois/linux/EventHelpers.h (modified) * code/branches/resource2/src/ois/linux/LinuxForceFeedback.cpp (modified) * code/branches/resource2/src/ois/linux/LinuxForceFeedback.h (modified) * code/branches/resource2/src/ois/linux/LinuxJoyStickEvents.cpp (modified) * code/branches/resource2/src/ois/win32/Win32ForceFeedback.cpp (modified) * code/branches/resource2/src/ois/win32/Win32ForceFeedback.h (modified) * code/branches/resource2/src/ois/win32/Win32InputManager.cpp (modified) * code/branches/resource2/src/ois/win32/Win32InputManager.h (modified) * code/branches/resource2/src/ois/win32/Win32JoyStick.cpp (modified) * code/branches/resource2/src/ois/win32/Win32JoyStick.h (modified) * code/branches/resource2/src/ois/win32/Win32KeyBoard.cpp (modified) Updated OIS library (still 1.2, but CVS version). There have been ... Sat, 22 Aug 2009 20:51:21 GMT rgrieder [5667] * code/branches/resource2/cmake/InstallConfig.cmake (modified) * code/branches/resource2/cmake/PackageConfig.cmake (modified) * code/branches/resource2/cmake/TargetUtilities.cmake (modified) - New option for developers: Define ORXONOX_DEV as environment ... Thu, 20 Aug 2009 21:49:37 GMT rgrieder [5664] * code/branches/resource2/CMakeLists.txt (modified) * code/branches/resource2/cmake/CheckOGREPlugins.cmake (modified) * code/branches/resource2/cmake/CompilerConfig.cmake (copied) * code/branches/resource2/cmake/CompilerConfigGCC.cmake (moved) * code/branches/resource2/cmake/CompilerConfigMSVC.cmake (moved) * code/branches/resource2/cmake/InstallConfig.cmake (moved) * code/branches/resource2/cmake/LibraryConfig.cmake (modified) * code/branches/resource2/src/CMakeLists.txt (modified) * code/branches/resource2/src/OrxonoxConfig.cmake (copied) - Moved all (as far as possible) build related CMake options and ... Wed, 19 Aug 2009 19:30:05 GMT rgrieder [5663] * code/branches/resource2/src/core/input/Button.cc (modified) * code/branches/resource2/src/core/input/KeyBinder.cc (modified) * code/branches/resource2/src/core/input/KeyBinder.h (modified) * code/branches/resource2/src/core/input/KeyDetector.cc (modified) Fixed a known bug that occurred when reloading the inputmanager with ... Wed, 19 Aug 2009 10:27:59 GMT rgrieder [5662] * code/branches/resource2/data/CMakeLists.txt (modified) * code/branches/resource2/src/core/Game.cc (modified) * code/branches/resource2/src/core/GraphicsManager.cc (modified) * code/branches/resource2/src/orxonox/tools/ResourceCollection.cc (modified) Fixed build and a few issues and removed a warning. Tue, 18 Aug 2009 22:19:11 GMT rgrieder [5661] * code/branches/resource2/data/gui/layouts/MainMenu.layout (moved) * code/branches/resource2/data/gui/scripts/BasicGUI.lua (moved) * code/branches/resource2/data/gui/scripts/IConsole.lua (deleted) * code/branches/resource2/data/gui/scripts/InitialiseGUI.lua (moved) * code/branches/resource2/data/gui/scripts/InstancedInit.lua (deleted) * code/branches/resource2/data/gui/scripts/MainMenu.lua (moved) * code/branches/resource2/data/gui/scripts/PickupInventory.lua (modified) * code/branches/resource2/data/gui/scripts/demo8.lua (deleted) * code/branches/resource2/data/gui/scripts/inGameTest.lua (deleted) * code/branches/resource2/data/gui/scripts/loadGUI.lua (deleted) * code/branches/resource2/data/gui/scripts/loadGUI_2.lua (deleted) * code/branches/resource2/data/gui/scripts/mainmenu.lua (deleted) * code/branches/resource2/data/gui/scripts/mainmenu_2.lua (deleted) * code/branches/resource2/data/gui/scripts/mainmenu_3.lua (deleted) * code/branches/resource2/data/lua/LuaStateInit.lua (modified) * code/branches/resource2/src/core/GUIManager.cc (modified) * code/branches/resource2/src/core/GUIManager.h (modified) * code/branches/resource2/src/core/LuaState.cc (modified) * code/branches/resource2/src/core/LuaState.h (modified) * code/branches/resource2/src/orxonox/gamestates/GSMainMenu.cc (modified) Cleaned out the lua script files for the GUI. Also replaced ... Tue, 18 Aug 2009 10:06:41 GMT rgrieder [5660] * code/branches/resource2/src/core/GraphicsManager.cc (modified) * code/branches/resource2/src/core/Loader.cc (modified) * code/branches/resource2/src/core/LuaState.cc (modified) * code/branches/resource2/src/core/XMLFile.h (modified) * code/branches/resource2/src/orxonox/LevelManager.cc (modified) Added bLuaSupport_ to XMLFile so we can load the resource locations ... Tue, 18 Aug 2009 09:41:56 GMT rgrieder [5659] * code/branches/resource2/src/orxonox/LevelManager.cc (modified) Convinced LevelManager to use the Resources rather than the file ... Tue, 18 Aug 2009 09:14:25 GMT rgrieder [5658] * code/branches/resource2/src/core/Core.cc (modified) * code/branches/resource2/src/core/Core.h (modified) * code/branches/resource2/src/core/GUIManager.cc (modified) * code/branches/resource2/src/core/Game.cc (modified) * code/branches/resource2/src/core/Game.h (modified) * code/branches/resource2/src/core/GraphicsManager.cc (modified) Fixed two bugs: - Incomplete exception safety in Core::loadGraphics ... Mon, 17 Aug 2009 19:12:54 GMT rgrieder [5657] * code/branches/resource2/data/resources.oxr (modified) * code/branches/resource2/data/resources_graphics.oxr (deleted) * code/branches/resource2/src/core/GraphicsManager.cc (modified) * code/branches/resource2/src/core/GraphicsManager.h (modified) * data/branches/media_stripped/resources.oxr (modified) * data/branches/media_stripped/resources_graphics.oxr (deleted) Dividing the resource locations isn't necessary after all: The trick ... Mon, 17 Aug 2009 18:50:41 GMT rgrieder [5656] * code/branches/resource2/data/overlays (moved) * code/branches/resource2/data/resources.oxr (modified) Renamed "overlay" folder to "overlays" to keep it consistent with ... Mon, 17 Aug 2009 14:41:03 GMT rgrieder [5655] * code/branches/resource2/src/core/Core.cc (modified) * code/branches/resource2/src/core/LuaState.cc (modified) * code/branches/resource2/src/core/LuaState.h (modified) * code/branches/resource2/src/core/ToluaInterface.h (added) * code/branches/resource2/src/orxonox/Main.cc (modified) * code/branches/resource2/src/orxonox/gamestates/GSRoot.cc (modified) Added static DeclareToluaInterface macro to ease up tolua intefaces ... Mon, 17 Aug 2009 14:37:10 GMT rgrieder [5654] * code/branches/resource2/data/levels/empty_level.oxw (modified) * code/branches/resource2/data/levels/gametype_asteroids.oxw (modified) * code/branches/resource2/data/levels/gametype_underattack.oxw (modified) * code/branches/resource2/data/levels/old/CuboidSpaceStation.oxw (modified) * code/branches/resource2/data/levels/old/physicstest2.oxw (modified) * code/branches/resource2/data/levels/old/planettest.oxw (modified) * code/branches/resource2/data/levels/old/presentation_physics.oxw (modified) * code/branches/resource2/data/levels/old/princessaeryn.oxw (modified) * code/branches/resource2/data/levels/old/questsystem.oxw (modified) * code/branches/resource2/data/levels/old/sample4.oxw (modified) * code/branches/resource2/data/levels/pickuptest.oxw (modified) * code/branches/resource2/data/levels/presentation.oxw (modified) * code/branches/resource2/data/levels/presentation09.oxw (modified) * code/branches/resource2/data/levels/presentation09b.oxw (modified) * code/branches/resource2/data/levels/presentation_dm.oxw (modified) * code/branches/resource2/data/levels/presentation_pong.oxw (modified) * code/branches/resource2/data/levels/teambasematchlevel.oxw (modified) * code/branches/resource2/data/levels/teamdeathmatch.oxw (modified) * code/branches/resource2/data/levels/templates/spaceship_H2.oxt (modified) * code/branches/resource2/data/levels/templates/spaceship_assff.oxt (modified) * code/branches/resource2/data/levels/templates/spaceship_pirate.oxt (modified) * code/branches/resource2/data/levels/tutorial.oxw (modified) * code/branches/resource2/data/levels/waypoints.oxw (modified) * code/branches/resource2/data/lua (added) * code/branches/resource2/data/lua/LuaStateInit.lua (added) * code/branches/resource2/data/resources.cfg (deleted) * code/branches/resource2/data/resources.oxr (modified) * code/branches/resource2/data/resources_graphics.oxr (copied) * code/branches/resource2/src/core/CMakeLists.txt (modified) * code/branches/resource2/src/core/Core.cc (modified) * code/branches/resource2/src/core/Core.h (modified) * code/branches/resource2/src/core/CorePrereqs.h (modified) * code/branches/resource2/src/core/GUIManager.cc (modified) * code/branches/resource2/src/core/GraphicsManager.cc (modified) * code/branches/resource2/src/core/GraphicsManager.h (modified) * code/branches/resource2/src/core/Loader.cc (modified) * code/branches/resource2/src/core/Loader.h (modified) * code/branches/resource2/src/core/LuaState.cc (moved) * code/branches/resource2/src/core/LuaState.h (moved) * code/branches/resource2/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/resource2/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/resource2/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/resource2/src/orxonox/objects/Level.cc (modified) * code/branches/resource2/src/orxonox/objects/Script.cc (modified) * code/branches/resource2/src/orxonox/objects/Script.h (modified) * code/branches/resource2/src/orxonox/sound/SoundBase.cc (modified) * code/branches/resource2/src/orxonox/sound/SoundBase.h (modified) * data/branches/media_stripped/resources.cfg (deleted) * data/branches/media_stripped/resources.oxr (modified) * data/branches/media_stripped/resources_graphics.oxr (copied) - Implemented file management via resource manager and loading of ... Mon, 17 Aug 2009 13:42:39 GMT rgrieder [5653] * code/branches/resource2/src/core/CMakeLists.txt (modified) * code/branches/resource2/src/core/CorePrereqs.h (modified) * code/branches/resource2/src/core/Resource.cc (added) * code/branches/resource2/src/core/Resource.h (added) * code/branches/resource2/src/core/XMLFile.h (modified) * code/branches/resource2/src/orxonox/objects/Level.cc (modified) Added class to handle handle resources more easily via ... Mon, 17 Aug 2009 13:35:34 GMT rgrieder [5652] * code/branches/resource2/src/core/Clock.h (modified) * code/branches/resource2/src/core/ConfigFileManager.cc (modified) * code/branches/resource2/src/core/ConfigFileManager.h (modified) * code/branches/resource2/src/orxonox/gamestates/GSDedicated.cc (modified) * code/branches/resource2/src/orxonox/tools/ResourceCollection.cc (modified) * code/branches/resource2/src/orxonox/tools/ResourceLocation.cc (modified) Modified ResourceLocation to actually find the given paths. Plus a ... Mon, 17 Aug 2009 13:17:15 GMT rgrieder [5651] * code/branches/resource2/src/OrxonoxConfig.h.in (modified) * code/branches/resource2/src/core/Core.h (modified) * code/branches/resource2/src/core/GUIManager.h (modified) * code/branches/resource2/src/core/Game.cc (modified) * code/branches/resource2/src/core/Game.h (modified) * code/branches/resource2/src/core/GraphicsManager.h (modified) Added using declaration for boost::shared_ptr, weak_ptr and ... Mon, 17 Aug 2009 13:14:16 GMT rgrieder [5650] * code/branches/resource2/src/ceguilua/CMakeLists.txt (modified) Minor build fix. Thu, 13 Aug 2009 20:54:59 GMT rgrieder [5646] * code/branches/resource2/data (moved) It seems that TortoiseSVN made a terrible mess of the media folder. I ... Thu, 13 Aug 2009 20:50:07 GMT rgrieder [5645] * code/branches/resource2 (modified) * code/branches/resource2/CMakeLists.txt (modified) * code/branches/resource2/cmake/BuildConfig.cmake (modified) * code/branches/resource2/media/CMakeLists.txt (modified) * code/branches/resource2/media/DataInstallScript.cmake (moved) * code/branches/resource2/src/SpecialConfig.h.in (modified) * code/branches/resource2/src/core/ConfigFileManager.cc (modified) * code/branches/resource2/src/core/Core.cc (modified) * code/branches/resource2/src/core/Core.h (modified) * code/branches/resource2/src/core/GUIManager.cc (modified) * code/branches/resource2/src/core/LuaBind.cc (modified) * code/branches/resource2/src/orxonox/LevelManager.cc (modified) * code/branches/resource2/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/resource2/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/resource2/src/orxonox/objects/Level.cc (modified) * code/branches/resource2/src/orxonox/sound/SoundBase.cc (modified) Renamed media to data to restore consistency with game/data/trunk ... Thu, 13 Aug 2009 20:08:52 GMT rgrieder [5644] * code/branches/resource2/media/resources.oxr (added) * data/branches/media_stripped/resources.oxr (added) Added new XML style resource declaration files (just stubs, not even ... Thu, 13 Aug 2009 19:12:24 GMT rgrieder [5641] * code/branches/resource2/CMakeLists.txt (modified) * code/branches/resource2/bin/CMakeLists.txt (modified) * code/branches/resource2/bin/client1.bat.in (modified) * code/branches/resource2/bin/client2.bat.in (modified) * code/branches/resource2/bin/dedicated.bat.in (modified) * code/branches/resource2/bin/run.bat.in (modified) * code/branches/resource2/bin/server.bat.in (modified) * code/branches/resource2/bin/standalone.bat.in (modified) * code/branches/resource2/cmake/BuildConfig.cmake (modified) * code/branches/resource2/cmake/GenerateToluaBindings.cmake (modified) * code/branches/resource2/cmake/Media.cmake (deleted) * code/branches/resource2/cmake/PackageConfig.cmake (modified) * code/branches/resource2/cmake/PackageConfigMSVC.cmake (modified) * code/branches/resource2/cmake/PackageConfigMinGW.cmake (modified) * code/branches/resource2/cmake/TargetUtilities.cmake (modified) * code/branches/resource2/doc/api/CMakeLists.txt (modified) * code/branches/resource2/media/CMakeLists.txt (added) * code/branches/resource2/media/MediaInstallScript.cmake (added) * code/branches/resource2/src/SpecialConfig.h.in (modified) * code/branches/resource2/src/core/Core.cc (modified) * code/branches/resource2/src/core/Core.h (modified) * code/branches/resource2/src/core/GraphicsManager.cc (modified) * code/branches/resource2/src/core/GraphicsManager.h (modified) * code/branches/resource2/src/core/TclBind.cc (modified) * code/branches/resource2/src/orxonox/orxonox.vcproj.user.in (modified) Prepared build system for an external media directory. This revision ... Tue, 11 Aug 2009 13:05:02 GMT rgrieder [5624] * code/branches/resource2/src/orxonox/tools/CMakeLists.txt (modified) * code/branches/resource2/src/orxonox/tools/ResourceCollection.cc (added) * code/branches/resource2/src/orxonox/tools/ResourceCollection.h (added) * code/branches/resource2/src/orxonox/tools/ResourceLocation.cc (added) * code/branches/resource2/src/orxonox/tools/ResourceLocation.h (added) Added two classes to allow resource declaration via XML. Mon, 10 Aug 2009 15:36:45 GMT rgrieder [5614] * code/branches/resource2/src/core/Core.cc (modified) * code/branches/resource2/src/core/GraphicsManager.cc (modified) * code/branches/resource2/src/core/GraphicsManager.h (modified) * code/branches/resource2/src/orxonox/gamestates/GSLevel.cc (modified) Creating Ogre::Root in non graphics mode as well. This allows to ... Wed, 05 Aug 2009 15:20:06 GMT rgrieder [5611] * code/branches/resource2/src/core/ClassFactory.h (modified) * code/branches/resource2/src/core/Factory.cc (modified) * code/branches/resource2/src/core/Factory.h (modified) Stupid TSVN bug: All items in a commit list are always checked by ... Wed, 05 Aug 2009 15:15:35 GMT rgrieder [5610] * code/branches/resource2/cmake/ParseMacroArguments.cmake (modified) * code/branches/resource2/src/core/ClassFactory.h (modified) * code/branches/resource2/src/core/Factory.cc (modified) * code/branches/resource2/src/core/Factory.h (modified) * code/branches/resource2/src/network/CMakeLists.txt (modified) * code/branches/resource2/src/network/packet/CMakeLists.txt (modified) * code/branches/resource2/src/network/synchronisable/CMakeLists.txt (modified) * code/branches/resource2/src/util/CMakeLists.txt (modified) Improved CMake performance for runs after the first one. There are ... Sun, 02 Aug 2009 15:56:52 GMT rgrieder [5597] * code/branches/resource2 (modified) Added the data repository for time of the resource2 branch. Sun, 02 Aug 2009 14:29:41 GMT rgrieder [5594] * code/branches/resource2/media/defaultConfig (copied) * code/branches/resource2/media/gui/configs (copied) * code/branches/resource2/media/gui/layouts (copied) * code/branches/resource2/media/gui/schemes (copied) * code/branches/resource2/media/gui/scripts (copied) * code/branches/resource2/media/levels (copied) * code/branches/resource2/media/overlay (copied) * code/branches/resource2/media/particle (copied) * code/branches/resource2/media/resources.cfg (copied) * code/branches/resource2/media/tcl (copied) Replaced text based media files with the ones keeping the svn history ... Thu, 30 Jul 2009 22:52:09 GMT rgrieder [3374] * code/branches/resource2/media (added) * code/branches/resource2/media/defaultConfig (added) * code/branches/resource2/media/defaultConfig/keybindings.ini (added) * code/branches/resource2/media/defaultConfig/masterKeybindings.ini (added) * code/branches/resource2/media/gui (added) * code/branches/resource2/media/gui/configs (added) * code/branches/resource2/media/gui/configs/CEGUIConfig.xsd (added) * code/branches/resource2/media/gui/layouts (added) * code/branches/resource2/media/gui/layouts/CompositorDemo.layout (added) * code/branches/resource2/media/gui/layouts/Console.wnd (added) * code/branches/resource2/media/gui/layouts/CrowdDemo.layout (added) * code/branches/resource2/media/gui/layouts/Demo7Windows.layout (added) * code/branches/resource2/media/gui/layouts/Demo8.layout (added) * code/branches/resource2/media/gui/layouts/DragDropDemo.layout (added) * code/branches/resource2/media/gui/layouts/FontDemo.layout (added) * code/branches/resource2/media/gui/layouts/GUILayout.xsd (added) * code/branches/resource2/media/gui/layouts/InGameTest.layout (added) * code/branches/resource2/media/gui/layouts/InstancingDemo.layout (added) * code/branches/resource2/media/gui/layouts/MainMenu.layout (added) * code/branches/resource2/media/gui/layouts/MainMenu_2.layout (added) * code/branches/resource2/media/gui/layouts/PickupInventory.layout (added) * code/branches/resource2/media/gui/layouts/TabControlDemo.layout (added) * code/branches/resource2/media/gui/layouts/TabPage.layout (added) * code/branches/resource2/media/gui/layouts/TabPage1.layout (added) * code/branches/resource2/media/gui/layouts/TabPage2.layout (added) * code/branches/resource2/media/gui/layouts/TextDemo.layout (added) * code/branches/resource2/media/gui/layouts/TreeDemoTaharez.layout (added) * code/branches/resource2/media/gui/layouts/VanillaConsole.layout (added) * code/branches/resource2/media/gui/layouts/VanillaWindows.layout (added) * code/branches/resource2/media/gui/layouts/cegui8.layout (added) * code/branches/resource2/media/gui/layouts/facial.layout (added) * code/branches/resource2/media/gui/layouts/ogregui.layout (added) * code/branches/resource2/media/gui/layouts/shadows.layout (added) * code/branches/resource2/media/gui/schemes (added) * code/branches/resource2/media/gui/schemes/Demo8.scheme (added) * code/branches/resource2/media/gui/schemes/GUIScheme.xsd (added) * code/branches/resource2/media/gui/schemes/OrxonoxGUIScheme.scheme (added) * code/branches/resource2/media/gui/schemes/TaharezLook.scheme (added) * code/branches/resource2/media/gui/schemes/TaharezLookSkin.scheme (added) * code/branches/resource2/media/gui/schemes/TaharezLookWidgetAliases.scheme (added) * code/branches/resource2/media/gui/schemes/TaharezLookWidgets.scheme (added) * code/branches/resource2/media/gui/schemes/VanillaSkin.scheme (added) * code/branches/resource2/media/gui/schemes/WindowsLook.scheme (added) * code/branches/resource2/media/gui/schemes/WindowsLookWidgets.scheme (added) * code/branches/resource2/media/gui/scripts (added) * code/branches/resource2/media/gui/scripts/IConsole.lua (added) * code/branches/resource2/media/gui/scripts/InstancedInit.lua (added) * code/branches/resource2/media/gui/scripts/PickupInventory.lua (added) * code/branches/resource2/media/gui/scripts/demo8.lua (added) * code/branches/resource2/media/gui/scripts/gui.lua (added) * code/branches/resource2/media/gui/scripts/inGameTest.lua (added) * code/branches/resource2/media/gui/scripts/loadGUI.lua (added) * code/branches/resource2/media/gui/scripts/loadGUI_2.lua (added) * code/branches/resource2/media/gui/scripts/loadGUI_3.lua (added) * code/branches/resource2/media/gui/scripts/mainmenu.lua (added) * code/branches/resource2/media/gui/scripts/mainmenu_2.lua (added) * code/branches/resource2/media/gui/scripts/mainmenu_3.lua (added) * code/branches/resource2/media/gui/scripts/mainmenu_4.lua (added) * code/branches/resource2/media/levels (added) * code/branches/resource2/media/levels/empty_level.oxw (added) * code/branches/resource2/media/levels/gametype_asteroids.oxw (added) * code/branches/resource2/media/levels/gametype_underattack.oxw (added) * code/branches/resource2/media/levels/includes (added) * code/branches/resource2/media/levels/includes/CuboidSpaceStation.lua (added) * code/branches/resource2/media/levels/includes/weaponsettings1.oxi (added) * code/branches/resource2/media/levels/includes/weaponsettings2.oxi (added) * code/branches/resource2/media/levels/includes/weaponsettings3.oxi (added) * code/branches/resource2/media/levels/includes/weaponsettings_H2.oxi (added) * code/branches/resource2/media/levels/includes/weaponsettings_pirate.oxi (added) * code/branches/resource2/media/levels/old (added) * code/branches/resource2/media/levels/old/CuboidSpaceStation.oxw (added) * code/branches/resource2/media/levels/old/physicstest.oxw (added) * code/branches/resource2/media/levels/old/physicstest2.oxw (added) * code/branches/resource2/media/levels/old/planettest.oxw (added) * code/branches/resource2/media/levels/old/presentation_physics.oxw (added) * code/branches/resource2/media/levels/old/princessaeryn.oxw (added) * code/branches/resource2/media/levels/old/questsystem.oxw (added) * code/branches/resource2/media/levels/old/sample4.oxw (added) * code/branches/resource2/media/levels/old/spaceshiptemplates_physics.oxw (added) * code/branches/resource2/media/levels/old/tutorial_hs08.oxw (added) * code/branches/resource2/media/levels/pickuptest.oxw (added) * code/branches/resource2/media/levels/presentation.oxw (added) * code/branches/resource2/media/levels/presentation09.oxw (added) * code/branches/resource2/media/levels/presentation09b.oxw (added) * code/branches/resource2/media/levels/presentation_dm.oxw (added) * code/branches/resource2/media/levels/presentation_pong.oxw (added) * code/branches/resource2/media/levels/teambasematchlevel.oxw (added) * code/branches/resource2/media/levels/teamdeathmatch.oxw (added) * code/branches/resource2/media/levels/templates (added) * code/branches/resource2/media/levels/templates/spaceship_H2.oxt (added) * code/branches/resource2/media/levels/templates/spaceship_assff.oxt (added) * code/branches/resource2/media/levels/templates/spaceship_pirate.oxt (added) * code/branches/resource2/media/levels/tutorial.oxw (added) * code/branches/resource2/media/levels/waypoints.oxw (added) * code/branches/resource2/media/overlay (added) * code/branches/resource2/media/overlay/OrxonoxLoading.overlay (added) * code/branches/resource2/media/overlay/debug.oxo (added) * code/branches/resource2/media/overlay/hud.oxo (added) * code/branches/resource2/media/overlay/hudtemplates3.oxo (added) * code/branches/resource2/media/overlay/ponghud.oxo (added) * code/branches/resource2/media/overlay/stats.oxo (added) * code/branches/resource2/media/overlay/teambasematchhud.oxo (added) * code/branches/resource2/media/overlay/underattackhud.oxo (added) * code/branches/resource2/media/particle (added) * code/branches/resource2/media/particle/Example-Water.particle (added) * code/branches/resource2/media/particle/Example.particle (added) * code/branches/resource2/media/particle/ExplosionComp1.particle (added) * code/branches/resource2/media/particle/ExplosionComp2.particle (added) * code/branches/resource2/media/particle/ExplosionComp4.particle (added) * code/branches/resource2/media/particle/FireComp2.particle (added) * code/branches/resource2/media/particle/LaserGun.particle (added) * code/branches/resource2/media/particle/ThrusterFire.particle (added) * code/branches/resource2/media/particle/bigexplosion1part1.particle (added) * code/branches/resource2/media/particle/bigexplosion1part2.particle (added) * code/branches/resource2/media/particle/bigexplosion1part3.particle (added) * code/branches/resource2/media/particle/emitted_emitter.particle (added) * code/branches/resource2/media/particle/engineglow.particle (added) * code/branches/resource2/media/particle/explosion1.particle (added) * code/branches/resource2/media/particle/explosion2.particle (added) * code/branches/resource2/media/particle/explosion2b.particle (added) * code/branches/resource2/media/particle/explosion3.particle (added) * code/branches/resource2/media/particle/fairytwirl.particle (added) * code/branches/resource2/media/particle/fire3.particle (added) * code/branches/resource2/media/particle/fire4.particle (added) * code/branches/resource2/media/particle/forcefield.particle (added) * code/branches/resource2/media/particle/ray1.particle (added) * code/branches/resource2/media/particle/ray2.particle (added) * code/branches/resource2/media/particle/repairGold.particle (added) * code/branches/resource2/media/particle/repairSilver.particle (added) * code/branches/resource2/media/particle/shot1.particle (added) * code/branches/resource2/media/particle/shot2.particle (added) * code/branches/resource2/media/particle/shot2_small.particle (added) * code/branches/resource2/media/particle/shot3_small.particle (added) * code/branches/resource2/media/particle/shotTest.particle (added) * code/branches/resource2/media/particle/smoke1.particle (added) * code/branches/resource2/media/particle/smoke2.particle (added) * code/branches/resource2/media/particle/smoke3.particle (added) * code/branches/resource2/media/particle/smoke4.particle (added) * code/branches/resource2/media/particle/smoke5.particle (added) * code/branches/resource2/media/particle/smoke6.particle (added) * code/branches/resource2/media/particle/smoke7.particle (added) * code/branches/resource2/media/particle/sparks.particle (added) * code/branches/resource2/media/particle/thruster1.particle (added) * code/branches/resource2/media/particle/thruster2.particle (added) * code/branches/resource2/media/particle/thruster3.particle (added) * code/branches/resource2/media/resources.cfg (added) * code/branches/resource2/media/tcl (added) * code/branches/resource2/media/tcl/init.tcl (added) * code/branches/resource2/media/tcl/irc.tcl (added) * code/branches/resource2/media/tcl/irk (added) * code/branches/resource2/media/tcl/irk/README (added) * code/branches/resource2/media/tcl/irk/docs (added) * code/branches/resource2/media/tcl/irk/docs/changes.txt (added) * code/branches/resource2/media/tcl/irk/docs/todo.txt (added) * code/branches/resource2/media/tcl/irk/docs/usage.txt (added) * code/branches/resource2/media/tcl/irk/examples (added) * code/branches/resource2/media/tcl/irk/examples/fortunebot.tcl (added) * code/branches/resource2/media/tcl/irk/examples/mysaint.tcl (added) * code/branches/resource2/media/tcl/irk/irk.tcl (added) * code/branches/resource2/media/tcl/irk/lib (added) * code/branches/resource2/media/tcl/irk/lib/irkauth.tcl (added) * code/branches/resource2/media/tcl/irk/lib/irkcommand.tcl (added) * code/branches/resource2/media/tcl/irk/lib/irkconnect.tcl (added) * code/branches/resource2/media/tcl/irk/lib/irkctcptcl.tcl (added) * code/branches/resource2/media/tcl/irk/lib/irkdispatch.tcl (added) * code/branches/resource2/media/tcl/irk/lib/irkflow.tcl (added) * code/branches/resource2/media/tcl/irk/lib/irkqueue.tcl (added) * code/branches/resource2/media/tcl/irk/lib/irkreceive.tcl (added) * code/branches/resource2/media/tcl/irk/lib/irkservers.tcl (added) * code/branches/resource2/media/tcl/irk/lib/irkstate.tcl (added) * code/branches/resource2/media/tcl/irk/lib/irkutil.tcl (added) * code/branches/resource2/media/tcl/irk/pkgIndex.tcl (added) * code/branches/resource2/media/tcl/irk/socks (added) * code/branches/resource2/media/tcl/irk/socks/socks.tcl (added) * code/branches/resource2/media/tcl/remote.tcl (added) * code/branches/resource2/media/tcl/telnet_server.tcl (added) Added most of the text based files of the media directory (the file I ... Thu, 30 Jul 2009 13:38:10 GMT rgrieder [3373] * code/branches/resource2 (copied) Created new resource branch to actually work on resource management. Thu, 30 Jul 2009 12:22:07 GMT rgrieder [3371] * code/trunk/cmake/TargetUtilities.cmake (modified) Build fix for the revision before the merge.