# # ChangeLog for code/branches/resource2/src # # Generated by Trac 1.0.9 # Dec 14, 2024, 2:11:26 PM 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 ... 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 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: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 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 ... 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:10:44 GMT rgrieder [3370] * code/trunk (modified) * code/trunk/cmake/Media.cmake (modified) * code/trunk/cmake/PackageConfig.cmake (modified) * code/trunk/cmake/PackageConfigMSVC.cmake (modified) * code/trunk/src/SpecialConfig.h.in (modified) * code/trunk/src/core/CMakeLists.txt (modified) * code/trunk/src/core/Clock.h (modified) * code/trunk/src/core/ConfigFileManager.cc (modified) * code/trunk/src/core/ConfigFileManager.h (modified) * code/trunk/src/core/ConsoleCommandCompilation.cc (modified) * code/trunk/src/core/Core.cc (modified) * code/trunk/src/core/Core.h (modified) * code/trunk/src/core/CorePrereqs.h (modified) * code/trunk/src/core/GUIManager.cc (copied) * code/trunk/src/core/GUIManager.h (copied) * code/trunk/src/core/Game.cc (modified) * code/trunk/src/core/Game.h (modified) * code/trunk/src/core/GameMode.h (modified) * code/trunk/src/core/GameState.cc (modified) * code/trunk/src/core/GameState.h (modified) * code/trunk/src/core/GraphicsManager.cc (copied) * code/trunk/src/core/GraphicsManager.h (copied) * code/trunk/src/core/IRC.cc (modified) * code/trunk/src/core/Identifier.h (modified) * code/trunk/src/core/Language.cc (modified) * code/trunk/src/core/Language.h (modified) * code/trunk/src/core/Loader.cc (modified) * code/trunk/src/core/Loader.h (modified) * code/trunk/src/core/LuaBind.cc (modified) * code/trunk/src/core/LuaBind.h (modified) * code/trunk/src/core/Shell.cc (modified) * code/trunk/src/core/Shell.h (modified) * code/trunk/src/core/TclBind.cc (modified) * code/trunk/src/core/TclBind.h (modified) * code/trunk/src/core/TclThreadManager.cc (modified) * code/trunk/src/core/TclThreadManager.h (modified) * code/trunk/src/core/input/InputManager.cc (modified) * code/trunk/src/core/input/InputManager.h (modified) * code/trunk/src/cpptcl/changes_orxonox.diff (modified) * code/trunk/src/cpptcl/cpptcl.cc (modified) * code/trunk/src/cpptcl/cpptcl.h (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/CameraManager.h (modified) * code/trunk/src/orxonox/GraphicsManager.cc (deleted) * code/trunk/src/orxonox/GraphicsManager.h (deleted) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/OrxonoxPrecompiledHeaders.h (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/PawnManager.cc (modified) * code/trunk/src/orxonox/PawnManager.h (modified) * code/trunk/src/orxonox/PlayerManager.cc (modified) * code/trunk/src/orxonox/PlayerManager.h (modified) * code/trunk/src/orxonox/gamestates/GSClient.cc (modified) * code/trunk/src/orxonox/gamestates/GSClient.h (modified) * code/trunk/src/orxonox/gamestates/GSDedicated.cc (modified) * code/trunk/src/orxonox/gamestates/GSDedicated.h (modified) * code/trunk/src/orxonox/gamestates/GSGraphics.cc (modified) * code/trunk/src/orxonox/gamestates/GSGraphics.h (modified) * code/trunk/src/orxonox/gamestates/GSIOConsole.cc (modified) * code/trunk/src/orxonox/gamestates/GSIOConsole.h (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.h (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.h (modified) * code/trunk/src/orxonox/gamestates/GSServer.cc (modified) * code/trunk/src/orxonox/gamestates/GSServer.h (modified) * code/trunk/src/orxonox/gamestates/GSStandalone.cc (modified) * code/trunk/src/orxonox/gamestates/GSStandalone.h (modified) * code/trunk/src/orxonox/gui (deleted) * code/trunk/src/orxonox/objects/pickup/BaseItem.h (modified) * code/trunk/src/orxonox/objects/pickup/PickupInventory.cc (modified) * code/trunk/src/orxonox/objects/pickup/PickupInventory.h (modified) * code/trunk/src/orxonox/objects/pickup/PickupSpawner.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestDescription.h (modified) * code/trunk/src/orxonox/objects/quest/QuestListener.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestManager.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestManager.h (modified) * code/trunk/src/orxonox/overlays/GUIOverlay.cc (modified) * code/trunk/src/orxonox/overlays/console/InGameConsole.cc (modified) * code/trunk/src/orxonox/overlays/console/InGameConsole.h (modified) * code/trunk/src/orxonox/overlays/notifications/NotificationManager.cc (modified) * code/trunk/src/orxonox/overlays/notifications/NotificationManager.h (modified) * code/trunk/src/orxonox/sound/SoundBase.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.h (modified) * code/trunk/src/orxonox/tools/ParticleInterface.cc (modified) * code/trunk/src/orxonox/tools/ParticleInterface.h (modified) * code/trunk/src/orxonox/tools/Shader.cc (modified) * code/trunk/src/util/ScopeGuard.h (modified) * code/trunk/src/util/SignalHandler.cc (modified) * code/trunk/src/util/SignalHandler.h (modified) * code/trunk/src/util/Singleton.h (copied) Merged resource branch back to the trunk. Changes: - Automated ...