# # ChangeLog for code/branches/gamestates2 # # Generated by Trac 1.0.9 # Nov 14, 2024, 5:46:51 AM Fri, 16 Apr 2010 11:42:28 GMT rgrieder [6745] * code/branches/gamestates2/src/libraries/core/input/InputDevice.h (modified) * code/branches/gamestates2/src/libraries/core/input/InputHandler.h (modified) * code/branches/gamestates2/src/libraries/core/input/InputState.h (modified) Branch now compiling with GCC as well: Added an removed a few ... Fri, 16 Apr 2010 11:41:25 GMT rgrieder [6744] * code/branches/gamestates2/cmake/LibraryConfigTardis.cmake (modified) Boost_VERSION was missing on Tardis because of manual configuration Fri, 16 Apr 2010 11:07:57 GMT rgrieder [6743] * code/branches/gamestates2/data/gui/scripts/MenuSheet.lua (modified) * code/branches/gamestates2/data/gui/scripts/SheetManager.lua (modified) * code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc (modified) - Bugfix in keyESC. - Default behaviour for GUI sheet InputStates is ... Fri, 16 Apr 2010 10:53:16 GMT rgrieder [6742] * code/branches/gamestates2/data/lua/Tools.lua (modified) Fixed typo. Fri, 16 Apr 2010 10:50:52 GMT rgrieder [6741] * code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.h (modified) Removed obsolete InputState from GSMainMenu. Fri, 16 Apr 2010 10:48:24 GMT rgrieder [6740] * code/branches/gamestates2/src/libraries/core/GUIManager.cc (modified) Trivial bug fix. Fri, 16 Apr 2010 10:24:56 GMT rgrieder [6739] * code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc (modified) Applied background image changes to GSMainMenu.cc Fri, 16 Apr 2010 10:22:52 GMT rgrieder [6738] * code/branches/gamestates2/src/libraries/core/input/InputManager.cc (modified) Cosmetic changes in InputManager. Fri, 16 Apr 2010 10:22:12 GMT rgrieder [6737] * code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/SheetManager.lua (copied) * code/branches/gamestates2/src/libraries/core/GUIManager.cc (modified) * code/branches/gamestates2/src/libraries/core/GUIManager.h (modified) * code/branches/gamestates2/src/orxonox/overlays/GUISheet.cc (modified) * code/branches/gamestates2/src/orxonox/overlays/GUISheet.h (modified) Background image of the GUI is now managed by GUIManager and kept in ... Fri, 16 Apr 2010 10:11:57 GMT rgrieder [6736] * code/branches/gamestates2/src/libraries/core/GUIManager.cc (modified) * code/branches/gamestates2/src/libraries/core/GUIManager.h (modified) All CEGUI calls that can execute Lua code should be protected against ... Fri, 16 Apr 2010 10:06:45 GMT rgrieder [6735] * code/branches/gamestates2/src/orxonox/CameraManager.h (modified) * code/branches/gamestates2/src/orxonox/Level.cc (modified) * code/branches/gamestates2/src/orxonox/LevelManager.h (modified) * code/branches/gamestates2/src/orxonox/PlayerManager.cc (modified) Removed getInstancePtr() from all Singletons. Use "exists()" (check) ... Tue, 13 Apr 2010 16:17:51 GMT rgrieder [6722] * code/branches/gamestates2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/DecisionPopup.lua (modified) * code/branches/gamestates2/data/gui/scripts/GUITools.lua (modified) * code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/InGameMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/InfoPopup.lua (modified) * code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MainMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/gamestates2/src/libraries/core/GUIManager.cc (modified) * code/branches/gamestates2/src/libraries/core/GUIManager.h (modified) * code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/gamestates2/src/orxonox/overlays/GUISheet.cc (modified) Renamed showGUI and hideGUI to showMenuSheet and hideMenuSheet. Tue, 13 Apr 2010 15:58:55 GMT rgrieder [6721] * code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua (modified) Fixed cross hair showing in in game menu. Tue, 13 Apr 2010 13:58:56 GMT rgrieder [6720] * code/branches/gamestates2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/GUISheet.lua (modified) * code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua (modified) "init" lua function --> "onLoad" to make it clear that it is a user ... Tue, 13 Apr 2010 13:56:17 GMT rgrieder [6719] * code/branches/gamestates2/src/libraries/core/LuaState.cc (modified) Fixed error reporting problem in LuaState.cc when parsing ... Tue, 13 Apr 2010 13:55:30 GMT rgrieder [6718] * code/branches/gamestates2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/DecisionPopup.lua (modified) * code/branches/gamestates2/data/gui/scripts/GUISheet.lua (moved) * code/branches/gamestates2/data/gui/scripts/GUITools.lua (modified) * code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/HUDSheet.lua (added) * code/branches/gamestates2/data/gui/scripts/InGameMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/InfoPopup.lua (modified) * code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MainMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MenuSheet.lua (added) * code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/PickupInventory.lua (modified) * code/branches/gamestates2/data/gui/scripts/QuestGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/gamestates2/data/lua/Tools.lua (modified) Moved BasicGUI.lua to GUISheet.lua and derived MenuSheet.lua as well ... Mon, 12 Apr 2010 21:23:45 GMT rgrieder [6704] * code/branches/gamestates2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/BasicGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/InfoPopup.lua (modified) * code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/QuestGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua (modified) "filename" --> "name" table entry for GUI sheets. Thu, 01 Apr 2010 11:52:24 GMT rgrieder [6671] * code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/gamestates2/data/lua/Tools.lua (added) Added Tools.lua and moved 'find' in InitialiseGUI.lua to ... Thu, 01 Apr 2010 11:46:53 GMT rgrieder [6670] * code/branches/gamestates2/data/lua/LuaStateInit.lua (modified) * code/branches/gamestates2/src/libraries/core/LuaState.cc (modified) Lua errors in 'doFile', 'includeFile' or 'require' should not be ... Wed, 31 Mar 2010 10:46:09 GMT rgrieder [6667] * code/branches/gamestates2/src/libraries/core/LuaState.cc (modified) Found the darn bug! The Lua error handling function may have been ... Wed, 31 Mar 2010 00:37:45 GMT rgrieder [6666] * code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/GUITools.lua (modified) Fixed problem that can occur when BasicGUI cannot be loaded. Wed, 31 Mar 2010 00:36:48 GMT rgrieder [6665] * code/branches/gamestates2/data/lua/LuaStateInit.lua (modified) Fixed problems with the return value of require() Tue, 30 Mar 2010 23:11:21 GMT rgrieder [6664] * code/branches/gamestates2/data/gui/schemes/SleekSpaceHUDWidgets.scheme (modified) * code/branches/gamestates2/data/gui/schemes/SleekSpaceLook.scheme (modified) * code/branches/gamestates2/data/gui/schemes/SleekSpaceMenuWidgets.scheme (modified) * code/branches/gamestates2/data/gui/schemes/TaharezGreenHUDWidgets.scheme (modified) * code/branches/gamestates2/data/gui/schemes/TaharezGreenMenuWidgets.scheme (modified) * code/branches/gamestates2/data/gui/schemes/TaharezHUDWidgets.scheme (modified) * code/branches/gamestates2/data/gui/schemes/TaharezMenuWidgets.scheme (modified) * code/branches/gamestates2/data/gui/schemes/VanillaHUDWidgets.scheme (modified) * code/branches/gamestates2/data/gui/schemes/VanillaMenuWidgets.scheme (modified) * code/branches/gamestates2/data/gui/schemes/WindowsHUDWidgets.scheme (modified) * code/branches/gamestates2/data/gui/schemes/WindowsMenuWidgets.scheme (modified) svn:eol-style "native" for all text based files. Tue, 30 Mar 2010 23:06:55 GMT rgrieder [6663] * code/branches/gamestates2/data/lua/Debugger.lua (modified) * code/branches/gamestates2/data/lua/Strict.lua (modified) svn:eol-style "native" for all text based files. Tue, 30 Mar 2010 23:05:28 GMT rgrieder [6662] * code/branches/gamestates2 (modified) * code/branches/gamestates2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/BasicGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/DecisionPopup.lua (modified) * code/branches/gamestates2/data/gui/scripts/GUITools.lua (modified) * code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/InGameMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/InfoPopup.lua (modified) * code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MainMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/PickupInventory.lua (modified) * code/branches/gamestates2/data/gui/scripts/QuestGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/gamestates2/data/lua/Debugger.lua (copied) * code/branches/gamestates2/data/lua/LuaStateInit.lua (modified) * code/branches/gamestates2/data/lua/Strict.lua (copied) * code/branches/gamestates2/src/libraries/core/Core.cc (modified) * code/branches/gamestates2/src/libraries/core/Core.h (modified) * code/branches/gamestates2/src/libraries/core/GUIManager.cc (modified) * code/branches/gamestates2/src/libraries/core/GUIManager.h (modified) * code/branches/gamestates2/src/libraries/core/LuaState.cc (modified) * code/branches/gamestates2/src/libraries/core/LuaState.h (modified) * code/branches/gamestates2/src/libraries/core/Resource.cc (modified) * code/branches/gamestates2/src/libraries/core/Resource.h (modified) * code/branches/gamestates2/src/libraries/core/input/InputDevice.h (modified) * code/branches/gamestates2/src/libraries/core/input/InputHandler.h (modified) * code/branches/gamestates2/src/libraries/core/input/InputManager.cc (modified) * code/branches/gamestates2/src/libraries/core/input/InputManager.h (modified) * code/branches/gamestates2/src/libraries/core/input/InputPrereqs.h (modified) * code/branches/gamestates2/src/libraries/core/input/InputState.h (modified) * code/branches/gamestates2/src/libraries/util/Singleton.h (modified) Merged revisions 6621-6661 to gamestates2. Mon, 22 Mar 2010 13:47:10 GMT rgrieder [6595] * code/branches/gamestates2 (modified) * code/branches/gamestates2/data/gui/configs/Falagard.xsd (deleted) * code/branches/gamestates2/data/gui/configs/Font.xsd (deleted) * code/branches/gamestates2/data/gui/configs/GUILayout.xsd (deleted) * code/branches/gamestates2/data/gui/configs/GUIScheme.xsd (deleted) * code/branches/gamestates2/data/gui/configs/Imageset.xsd (deleted) * code/branches/gamestates2/data/gui/layouts/AudioMenu.layout (modified) * code/branches/gamestates2/data/gui/layouts/CompositorDemo.layout (deleted) * code/branches/gamestates2/data/gui/layouts/Console.wnd (deleted) * code/branches/gamestates2/data/gui/layouts/ControlsMenu.layout (modified) * code/branches/gamestates2/data/gui/layouts/CreditsMenu.layout (modified) * code/branches/gamestates2/data/gui/layouts/CrowdDemo.layout (deleted) * code/branches/gamestates2/data/gui/layouts/DecisionPopup.layout (modified) * code/branches/gamestates2/data/gui/layouts/Demo7Windows.layout (deleted) * code/branches/gamestates2/data/gui/layouts/Demo8.layout (deleted) * code/branches/gamestates2/data/gui/layouts/DragDropDemo.layout (deleted) * code/branches/gamestates2/data/gui/layouts/FontDemo.layout (deleted) * code/branches/gamestates2/data/gui/layouts/GameplayMenu.layout (modified) * code/branches/gamestates2/data/gui/layouts/GraphicsMenu.layout (modified) * code/branches/gamestates2/data/gui/layouts/InGameMenu.layout (modified) * code/branches/gamestates2/data/gui/layouts/InGameTest.layout (modified) * code/branches/gamestates2/data/gui/layouts/InfoPopup.layout (modified) * code/branches/gamestates2/data/gui/layouts/InstancingDemo.layout (deleted) * code/branches/gamestates2/data/gui/layouts/KeyBindMenu.layout (modified) * code/branches/gamestates2/data/gui/layouts/MainMenu.layout (modified) * code/branches/gamestates2/data/gui/layouts/MainMenuBackground.layout (modified) * code/branches/gamestates2/data/gui/layouts/MouseControlsMenu.layout (modified) * code/branches/gamestates2/data/gui/layouts/MultiplayerMenu.layout (modified) * code/branches/gamestates2/data/gui/layouts/MultiplayerOptionsMenu.layout (modified) * code/branches/gamestates2/data/gui/layouts/PickupInventory.layout (modified) * code/branches/gamestates2/data/gui/layouts/QuestGUI.layout (modified) * code/branches/gamestates2/data/gui/layouts/SettingsMenu.layout (modified) * code/branches/gamestates2/data/gui/layouts/SingleplayerMenu.layout (modified) * code/branches/gamestates2/data/gui/layouts/TabControlDemo.layout (deleted) * code/branches/gamestates2/data/gui/layouts/TabPage.layout (deleted) * code/branches/gamestates2/data/gui/layouts/TabPage1.layout (deleted) * code/branches/gamestates2/data/gui/layouts/TabPage2.layout (deleted) * code/branches/gamestates2/data/gui/layouts/TextDemo.layout (deleted) * code/branches/gamestates2/data/gui/layouts/TreeDemoTaharez.layout (deleted) * code/branches/gamestates2/data/gui/layouts/VanillaConsole.layout (deleted) * code/branches/gamestates2/data/gui/layouts/VanillaWindows.layout (deleted) * code/branches/gamestates2/data/gui/layouts/cegui8.layout (deleted) * code/branches/gamestates2/data/gui/layouts/facial.layout (deleted) * code/branches/gamestates2/data/gui/layouts/ogregui.layout (deleted) * code/branches/gamestates2/data/gui/layouts/shadows.layout (deleted) * code/branches/gamestates2/data/gui/schemes/Demo8.scheme (deleted) * code/branches/gamestates2/data/gui/schemes/Looks.txt (copied) * code/branches/gamestates2/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/branches/gamestates2/data/gui/schemes/SleekSpaceHUDWidgets.scheme (copied) * code/branches/gamestates2/data/gui/schemes/SleekSpaceLook.scheme (copied) * code/branches/gamestates2/data/gui/schemes/SleekSpaceMenuWidgets.scheme (copied) * code/branches/gamestates2/data/gui/schemes/TaharezGreenHUDWidgets.scheme (copied) * code/branches/gamestates2/data/gui/schemes/TaharezGreenLook.scheme (copied) * code/branches/gamestates2/data/gui/schemes/TaharezGreenMenuWidgets.scheme (copied) * code/branches/gamestates2/data/gui/schemes/TaharezHUDWidgets.scheme (copied) * code/branches/gamestates2/data/gui/schemes/TaharezLook.scheme (modified) * code/branches/gamestates2/data/gui/schemes/TaharezLookSkin.scheme (deleted) * code/branches/gamestates2/data/gui/schemes/TaharezLookWidgetAliases.scheme (deleted) * code/branches/gamestates2/data/gui/schemes/TaharezLookWidgets.scheme (deleted) * code/branches/gamestates2/data/gui/schemes/TaharezMenuWidgets.scheme (copied) * code/branches/gamestates2/data/gui/schemes/VanillaHUDWidgets.scheme (copied) * code/branches/gamestates2/data/gui/schemes/VanillaLook.scheme (copied) * code/branches/gamestates2/data/gui/schemes/VanillaMenuWidgets.scheme (copied) * code/branches/gamestates2/data/gui/schemes/VanillaSkin.scheme (deleted) * code/branches/gamestates2/data/gui/schemes/WindowsHUDWidgets.scheme (copied) * code/branches/gamestates2/data/gui/schemes/WindowsLook.scheme (modified) * code/branches/gamestates2/data/gui/schemes/WindowsLookWidgets.scheme (deleted) * code/branches/gamestates2/data/gui/schemes/WindowsMenuWidgets.scheme (copied) * code/branches/gamestates2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/BasicGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/DecisionPopup.lua (modified) * code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/InGameMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/InfoPopup.lua (modified) * code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MainMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/PickupInventory.lua (modified) * code/branches/gamestates2/data/gui/scripts/QuestGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/gamestates2/src/libraries/core/Core.cc (modified) * code/branches/gamestates2/src/libraries/core/Core.h (modified) * code/branches/gamestates2/src/libraries/core/GUIManager.cc (modified) * code/branches/gamestates2/src/libraries/core/GUIManager.h (modified) * code/branches/gamestates2/src/libraries/core/Game.h (modified) * code/branches/gamestates2/src/libraries/core/IOConsole.cc (modified) * code/branches/gamestates2/src/libraries/core/IOConsole.h (modified) * code/branches/gamestates2/src/libraries/core/LuaState.h (modified) * code/branches/gamestates2/src/libraries/core/Template.cc (modified) * code/branches/gamestates2/src/libraries/core/input/InputManager.cc (modified) * code/branches/gamestates2/src/libraries/core/input/InputManager.h (modified) * code/branches/gamestates2/src/libraries/core/input/InputState.cc (modified) * code/branches/gamestates2/src/libraries/core/input/InputState.h (modified) * code/branches/gamestates2/src/libraries/network/TrafficControl.h (modified) * code/branches/gamestates2/src/libraries/util/Serialise.h (modified) * code/branches/gamestates2/src/libraries/util/TriBool.h (copied) * code/branches/gamestates2/src/modules/questsystem/QuestGUI.cc (modified) * code/branches/gamestates2/src/modules/questsystem/QuestGUINode.cc (modified) * code/branches/gamestates2/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/gamestates2/src/orxonox/overlays/CMakeLists.txt (modified) * code/branches/gamestates2/src/orxonox/overlays/GUISheet.cc (copied) * code/branches/gamestates2/src/orxonox/overlays/GUISheet.h (copied) Merged remaining revisions from gamestate to gamestates2. Mon, 22 Mar 2010 13:44:28 GMT rgrieder [6594] * code/branches/gamestates2 (copied) Creating new game state branch to merge the changes from the trunk. Mon, 22 Mar 2010 12:52:13 GMT rgrieder [6590] * code/trunk/cmake/LibraryConfigTardis.cmake (modified) Switching to OGRE v1.6 on Tardis