# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # Nov 22, 2024, 6:45:34 PM Mon, 29 Mar 2010 21:27:36 GMT rgrieder [6655] * code/branches/gamestate/src/libraries/core/LuaState.cc (modified) Fixed a bug in LuaState that caused Lua Debugger to malfunction when ... Mon, 29 Mar 2010 21:03:31 GMT rgrieder [6653] * code/branches/ppspickups2/data/levels/includes/pickups_invisible.oxi (modified) * code/branches/ppspickups2/data/levels/templates/pickup_representation_templates_invisible.oxt (modified) svn:eol-style "native" for all text based files. Mon, 29 Mar 2010 21:01:51 GMT rgrieder [6652] * code/branches/chat/src/orxonox/ChatHistory.cc (modified) * code/branches/chat/src/orxonox/ChatHistory.h (modified) svn:eol-style "native" for all text based files. Mon, 29 Mar 2010 14:47:28 GMT smerkli [6649] * code/branches/chat/src/orxonox/ChatHistory.cc (modified) Minor commenting. Mon, 29 Mar 2010 14:44:54 GMT ebeier [6648] * code/branches/ppspickups1/svntest.txt (modified) Mon, 29 Mar 2010 14:44:24 GMT ebeier [6647] * code/branches/ppspickups1/svntest.txt (modified) Mon, 29 Mar 2010 14:43:20 GMT benedict [6646] * code/branches/ppspickups1/svntest.txt (modified) test 1 Mon, 29 Mar 2010 14:41:31 GMT ebeier [6645] * code/branches/ppspickups1/svntest.txt (added) a svn test Mon, 29 Mar 2010 14:41:19 GMT smerkli [6644] * code/branches/chat/src/orxonox/ChatHistory.cc (added) * code/branches/chat/src/orxonox/ChatHistory.h (added) Added initial chathistory cc file and header. Very basic, still, and ... Mon, 29 Mar 2010 14:39:25 GMT ebeier [6643] * code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt (modified) * code/branches/ppspickups1/src/modules/pickup/Pickup.cc (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/ppspickups1/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/ppspickups1/src/orxonox/items/Engine.h (modified) * code/branches/ppspickups1/src/orxonox/items/MultiStateEngine.cc (modified) engine stripes now working correctly Mon, 29 Mar 2010 14:35:06 GMT benedict [6642] * code/branches/ppspickups2/data/levels/includes/pickups_invisible.oxi (added) * code/branches/ppspickups2/data/levels/templates/pickup_representation_templates_invisible.oxt (added) added 2 files (pickup definitions) Mon, 29 Mar 2010 14:33:22 GMT benedict [6641] * code/branches/ppspickups2/data/levels/pickup_pps_invi.oxw (modified) * code/branches/ppspickups2/src/modules/pickup/Pickup.cc (modified) * code/branches/ppspickups2/src/modules/pickup/Pickup.h (modified) * code/branches/ppspickups2/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.h (modified) * code/branches/ppspickups2/src/orxonox/interfaces/PickupCarrier.h (modified) Invisibility works. Timer for invi works. Mon, 29 Mar 2010 14:23:08 GMT solex [6640] * code/branches/ai/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/ai/src/orxonox/worldentities/pawns/Pawn.h (modified) first bot master/slave behavior Mon, 29 Mar 2010 14:01:57 GMT edwind [6639] * code/branches/fps/cmake/LibraryConfig.cmake (modified) adding ogre bsp plugin Mon, 29 Mar 2010 12:00:30 GMT smerkli [6637] * code/branches/chat/src/orxonox/graphics/CMakeLists.txt (modified) Removed ChatBox and CEGuiSample from CMakeLists.txt Mon, 29 Mar 2010 11:52:33 GMT smerkli [6636] * code/branches/chat/src/orxonox/graphics/CEGuiSample.cc (added) * code/branches/chat/src/orxonox/graphics/CMakeLists.txt (modified) Added CEGuiSample.cc for testing of Chatbox class Mon, 29 Mar 2010 11:46:38 GMT scheusso [6635] * code/branches/chat/src/orxonox/graphics/ChatBox.cc (modified) ChatBox.cc compiles fine now Mon, 29 Mar 2010 11:44:13 GMT smerkli [6634] * code/branches/chat/src/orxonox/graphics/CMakeLists.txt (modified) * code/branches/chat/src/orxonox/graphics/ChatBox.cc (modified) ChatBox Changes, DemoSample correctly named ChatBox now Mon, 29 Mar 2010 11:29:48 GMT scheusso [6633] * code/branches/chat/src/orxonox/graphics/CMakeLists.txt (modified) * code/branches/chat/src/orxonox/graphics/ChatBox.cc (modified) * code/branches/chat/src/orxonox/graphics/ChatBox.h (modified) some adjustments (tabs to spaces, etc.) Mon, 29 Mar 2010 10:30:32 GMT dafrick [6632] * code/branches/pickup4/data/gui/layouts/PickupInventory.layout (modified) * code/branches/pickup4/data/gui/scripts/PickupInventory.lua (modified) * code/branches/pickup4/data/gui/scripts/QuestGUI.lua (modified) * code/branches/pickup4/data/overlays/hudtemplates3.oxo (modified) * code/branches/pickup4/src/modules/pickup/CMakeLists.txt (modified) * code/branches/pickup4/src/modules/pickup/PickupManager.cc (modified) * code/branches/pickup4/src/modules/pickup/PickupManager.h (modified) * code/branches/pickup4/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/pickup4/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/pickup4/src/modules/pickup/PickupRepresentation.h (modified) * code/branches/pickup4/src/orxonox/CMakeLists.txt (modified) * code/branches/pickup4/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/branches/pickup4/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/pickup4/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/pickup4/src/orxonox/worldentities/pawns/Pawn.h (modified) Working towards a functioning PickupInventory. Mon, 29 Mar 2010 09:28:59 GMT sfluecki [6631] * code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout (modified) * code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua (modified) damit semi alles hat Sun, 28 Mar 2010 20:47:27 GMT rgrieder [6630] * code/branches/gamestate/data/lua/Strict.lua (added) Added Strict.lua: When activated with require("Strict"), it will ... Sun, 28 Mar 2010 20:46:07 GMT rgrieder [6629] * code/branches/gamestate/data/lua/LuaStateInit.lua (modified) * code/branches/gamestate/src/libraries/core/LuaState.cc (modified) Fixed LuaState::doFile return value issue. Sun, 28 Mar 2010 18:54:46 GMT rgrieder [6628] * code/branches/gamestate/data/lua/LuaStateInit.lua (modified) Lua Debugger is not written for Lua 5.0. Only include it for 5.1 and ... Sun, 28 Mar 2010 17:45:40 GMT rgrieder [6627] * code/branches/gamestate/src/libraries/core/LuaState.cc (modified) * code/branches/gamestate/src/libraries/core/LuaState.h (modified) Added Lua debugging support for XML embedded Lua code (even steps ... Sun, 28 Mar 2010 17:16:12 GMT rgrieder [6626] * code/branches/gamestate/data/lua/Debugger.lua (modified) * code/branches/gamestate/src/libraries/core/LuaState.cc (modified) * code/branches/gamestate/src/libraries/core/LuaState.h (modified) Modified Debugger.lua so we can debug any Lua files from our ... Sun, 28 Mar 2010 13:21:44 GMT rgrieder [6625] * code/branches/gamestate/src/libraries/core/LuaState.cc (modified) * code/branches/gamestate/src/libraries/core/Resource.cc (modified) * code/branches/gamestate/src/libraries/core/Resource.h (modified) Lua debugger working perfectly by supplying the fully qualified ... Sat, 27 Mar 2010 16:51:54 GMT rgrieder [6624] * code/branches/gamestate/data/lua/Debugger.lua (added) * code/branches/gamestate/data/lua/LuaStateInit.lua (modified) Added Debugger.lua by Dave Nichols of Match-IT Limited. It is a ... Sat, 27 Mar 2010 16:48:34 GMT rgrieder [6623] * code/branches/gamestate/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/SettingsMenu.lua (modified) * code/branches/gamestate/data/lua/LuaStateInit.lua (modified) The lua "print" function was previously stored in "debug" --> changed ... Sat, 27 Mar 2010 16:39:26 GMT rgrieder [6622] * code/branches/gamestate/src/libraries/core/Core.cc (modified) * code/branches/gamestate/src/libraries/core/Core.h (modified) Made IOConsole optional: use "--noIOConsole" or set config value ... Fri, 26 Mar 2010 19:51:37 GMT rgrieder [6621] * code/branches/gamestate/data/gui/scripts/AudioMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/BasicGUI.lua (modified) * code/branches/gamestate/data/gui/scripts/ControlsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/CreditsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/DecisionPopup.lua (modified) * code/branches/gamestate/data/gui/scripts/GUITools.lua (modified) * code/branches/gamestate/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/InGameMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/InfoPopup.lua (modified) * code/branches/gamestate/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/MainMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/MouseControlsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/MultiplayerOptionsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/PickupInventory.lua (modified) * code/branches/gamestate/data/gui/scripts/QuestGUI.lua (modified) * code/branches/gamestate/data/gui/scripts/SettingsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/SingleplayerMenu.lua (modified) Simplified GUI sheet creation (first lines in the lua file) a lot by ... Thu, 25 Mar 2010 19:03:17 GMT rgrieder [6619] * code/branches/skybox2/src/modules/designtools/CMakeLists.txt (modified) * code/branches/skybox2/src/modules/designtools/DesignToolsPrereqs.h (modified) * code/branches/skybox2/src/modules/designtools/SkyboxGenerator.cc (modified) * code/branches/skybox2/src/modules/designtools/SkyboxGenerator.h (modified) svn:eol-style "native" for all text based files. Thu, 25 Mar 2010 14:34:00 GMT gionc [6616] * code/branches/skybox2/src/modules/designtools/CMakeLists.txt (modified) * code/branches/skybox2/src/modules/designtools/SkyboxGenerator.cc (added) * code/branches/skybox2/src/modules/designtools/SkyboxGenerator.h (added) Added SkyboxGenerator class, implemented console command Wed, 24 Mar 2010 08:39:54 GMT sfluecki [6615] * code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout (modified) * code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua (modified) Grössenangaben / Ausrichtung von Close_button & Titelbar im PickupHUD ... Wed, 24 Mar 2010 08:11:12 GMT scurcio [6614] * code/branches/hudelements/data/gui/layouts/InGameMenu.layout (modified) * code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout (modified) * code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua (modified) close button pickup Tue, 23 Mar 2010 15:50:04 GMT rgrieder [6611] * code/branches/png/data/overlays/hudtemplates3.oxo (modified) * code/branches/png/data/overlays/underattackhud.oxo (modified) * code/branches/png/data/particle/smoke1.particle (modified) Replaced *.tga with *.png Tue, 23 Mar 2010 15:48:10 GMT rgrieder [6610] * code/branches/png (copied) Creating TGA -> PNG test branch. Mon, 22 Mar 2010 21:45:09 GMT ebeier [6607] * code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt (modified) * code/branches/ppspickups1/src/modules/pickup/Pickup.cc (modified) * code/branches/ppspickups1/src/modules/pickup/Pickup.h (modified) * code/branches/ppspickups1/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (modified) * code/branches/ppspickups1/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/ppspickups1/src/orxonox/items/Engine.cc (modified) * code/branches/ppspickups1/src/orxonox/items/Engine.h (modified) * code/branches/ppspickups1/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/ppspickups1/src/orxonox/worldentities/pawns/SpaceShip.h (modified) first working version of the SpeedPickup, needs some more work for ... Mon, 22 Mar 2010 19:00:37 GMT rgrieder [6606] * code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout (modified) * code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua (modified) svn:eol-style "native" for all text based files. Mon, 22 Mar 2010 18:59:39 GMT rgrieder [6605] * code/branches/chat/data/gui/layouts/ChatBox.layout (modified) * code/branches/chat/src/orxonox/graphics/CEGuiSample.h (modified) * code/branches/chat/src/orxonox/graphics/ChatBox.cc (modified) * code/branches/chat/src/orxonox/graphics/ChatBox.h (modified) svn:eol-style "native" for all text based files. Mon, 22 Mar 2010 18:52:44 GMT rgrieder [6603] * code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.h (modified) svn:eol-style "native" for all text based files. and no ... Mon, 22 Mar 2010 17:44:55 GMT sfluecki [6602] * code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout (modified) Fixed PickUp Window Mon, 22 Mar 2010 16:33:42 GMT solex [6601] * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/ai/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/branches/ai/src/orxonox/controllers/WaypointPatrolController.h (modified) ArtificialController: sameTeam hacking Mon, 22 Mar 2010 15:27:28 GMT sfluecki [6600] * code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout (added) * code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua (added) 2. Update Mon, 22 Mar 2010 15:22:35 GMT sfluecki [6599] * code/branches/hudelements/data/gui/layouts/InGameMenu.layout (modified) First commit wohoo Mon, 22 Mar 2010 14:41:51 GMT smerkli [6597] * code/branches/chat/src/orxonox/graphics/ChatBox.cc (added) * code/branches/chat/src/orxonox/graphics/ChatBox.h (modified) Split ChatBox.h into ChatBox.h and ChatBox.cc, comments to follow. Mon, 22 Mar 2010 14:28:40 GMT smerkli [6596] * code/branches/chat/data/gui/layouts/ChatBox.layout (added) * code/branches/chat/src/libraries/network/ChatListener.cc (modified) * code/branches/chat/src/orxonox/graphics/CEGuiSample.h (added) * code/branches/chat/src/orxonox/graphics/ChatBox.h (added) Adding chatbox related files 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 13:41:24 GMT dafrick [6593] * code/branches/pickup4 (copied) New pickup branch to work on pickup inventory/gui, yay! Mon, 22 Mar 2010 13:14:33 GMT solex [6592] * code/branches/ai (copied) created ai branch Mon, 22 Mar 2010 13:11:16 GMT rgrieder [6591] * code/branches/fps (copied) Created branch for work on First Person mode. Mon, 22 Mar 2010 12:48:58 GMT dafrick [6587] * code/branches/levels (copied) Created new branch for level creation. Mon, 22 Mar 2010 12:47:14 GMT jo [6586] * code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc (added) * code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.h (added) added Dynamicmatch.cc and Dynamicmatch.h for new gametype Mon, 22 Mar 2010 12:45:11 GMT scheusso [6585] * code/branches/lod (copied) lod branch Mon, 22 Mar 2010 12:36:28 GMT jo [6584] * code/branches/dynamicmatch (copied) created branch for new gametype Mon, 22 Mar 2010 12:27:10 GMT rgrieder [6583] * code/branches/hudelements (copied) hudelements Sun, 21 Mar 2010 23:13:41 GMT rgrieder [6579] * code/branches/ppspickups1/data/levels/pickup_ppstest1.oxw (modified) svn:eol-style "native" for all text based files. Sun, 21 Mar 2010 22:22:04 GMT smerkli [6577] * code/branches/chat/src/libraries/network/ChatListener.h (modified) * code/branches/chat/src/libraries/network/Host.h (modified) * code/branches/chat/src/libraries/network/packet/Chat.cc (modified) Nothing really, just skimming through code, adding comments... Sat, 20 Mar 2010 18:45:01 GMT ebeier [6575] * code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi (modified) * code/branches/ppspickups1/data/levels/pickup_ppstest1.oxw (modified) * code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (modified) SpeedPickup Class is now "working" (able to spawn/be picked up), but ... Sat, 20 Mar 2010 17:36:00 GMT ebeier [6574] * code/branches/ppspickups1/data/levels/pickup_ppstest1.oxw (moved) * code/branches/ppspickups1/data/levels/pickuptest.oxw (deleted) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (modified) adapted SpeedPickup from HealthPickup Fri, 19 Mar 2010 13:52:56 GMT rgrieder [6572] * code/branches/gamestate/data/gui/schemes/TaharezGreenHUDWidgets.scheme (copied) * code/branches/gamestate/data/gui/schemes/TaharezGreenLook.scheme (copied) * code/branches/gamestate/data/gui/schemes/TaharezGreenMenuWidgets.scheme (copied) * code/branches/gamestate/data/gui/scripts/InitialiseGUI.lua (modified) Added TaharezGreenLook scheme files and made the look default, so we ... Fri, 19 Mar 2010 13:51:39 GMT rgrieder [6571] * code/branches/gamestate/data/gui/scripts/AudioMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/gamestate/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/SingleplayerMenu.lua (modified) Removed last remains of hard coded Taharez references: Refer to the ... Fri, 19 Mar 2010 13:25:55 GMT rgrieder [6569] * code/branches/gamestate/data/gui/schemes/Looks.txt (added) * code/branches/gamestate/data/gui/schemes/SleekSpaceHUDWidgets.scheme (added) * code/branches/gamestate/data/gui/schemes/SleekSpaceLook.scheme (modified) * code/branches/gamestate/data/gui/schemes/SleekSpaceMenuWidgets.scheme (added) * code/branches/gamestate/data/gui/schemes/TaharezHUDWidgets.scheme (modified) * code/branches/gamestate/data/gui/schemes/TaharezLook.scheme (modified) * code/branches/gamestate/data/gui/schemes/TaharezMenuWidgets.scheme (modified) * code/branches/gamestate/data/gui/schemes/VanillaHUDWidgets.scheme (added) * code/branches/gamestate/data/gui/schemes/VanillaLook.scheme (moved) * code/branches/gamestate/data/gui/schemes/VanillaMenuWidgets.scheme (added) * code/branches/gamestate/data/gui/schemes/WindowsHUDWidgets.scheme (added) * code/branches/gamestate/data/gui/schemes/WindowsLook.scheme (modified) * code/branches/gamestate/data/gui/schemes/WindowsMenuWidgets.scheme (added) * code/branches/gamestate/data/gui/scripts/InitialiseGUI.lua (modified) Completed skin abstraction for Taharez, Windows, Vanilla and ... Thu, 18 Mar 2010 23:20:45 GMT rgrieder [6567] * code/branches/gamestate/data/gui/schemes/TaharezHUDWidgets.scheme (copied) * code/branches/gamestate/data/gui/scripts/InitialiseGUI.lua (modified) Added definitions for the HUD widgets. Thu, 18 Mar 2010 23:18:45 GMT rgrieder [6566] * code/branches/gamestate/data/gui/schemes/TaharezLook.scheme (modified) * code/branches/gamestate/data/gui/schemes/TaharezMenuWidgets.scheme (modified) * code/branches/gamestate/data/gui/schemes/TaharezMenuWidgetsAliases.scheme (deleted) * code/branches/gamestate/data/gui/scripts/InitialiseGUI.lua (modified) Changed the way windows are aliased: Instead of defining ... Thu, 18 Mar 2010 21:44:37 GMT smerkli [6565] * code/branches/chat/src/libraries/network/packet/Chat.h (modified) Test commit, added a couple of comments. Thu, 18 Mar 2010 21:07:48 GMT rgrieder [6564] * code/branches/gamestate/data/gui/layouts/AudioMenu.layout (modified) * code/branches/gamestate/data/gui/layouts/ControlsMenu.layout (modified) * code/branches/gamestate/data/gui/layouts/CreditsMenu.layout (modified) * code/branches/gamestate/data/gui/layouts/DecisionPopup.layout (modified) * code/branches/gamestate/data/gui/layouts/GameplayMenu.layout (modified) * code/branches/gamestate/data/gui/layouts/GraphicsMenu.layout (modified) * code/branches/gamestate/data/gui/layouts/InGameMenu.layout (modified) * code/branches/gamestate/data/gui/layouts/InGameTest.layout (modified) * code/branches/gamestate/data/gui/layouts/InfoPopup.layout (modified) * code/branches/gamestate/data/gui/layouts/KeyBindMenu.layout (modified) * code/branches/gamestate/data/gui/layouts/MainMenu.layout (modified) * code/branches/gamestate/data/gui/layouts/MainMenuBackground.layout (modified) * code/branches/gamestate/data/gui/layouts/MouseControlsMenu.layout (modified) * code/branches/gamestate/data/gui/layouts/MultiplayerMenu.layout (modified) * code/branches/gamestate/data/gui/layouts/MultiplayerOptionsMenu.layout (modified) * code/branches/gamestate/data/gui/layouts/PickupInventory.layout (modified) * code/branches/gamestate/data/gui/layouts/QuestGUI.layout (modified) * code/branches/gamestate/data/gui/layouts/SettingsMenu.layout (modified) * code/branches/gamestate/data/gui/layouts/SingleplayerMenu.layout (modified) * code/branches/gamestate/data/gui/schemes/TaharezMenuWidgets.scheme (added) * code/branches/gamestate/data/gui/schemes/TaharezMenuWidgetsAliases.scheme (added) * code/branches/gamestate/data/gui/schemes/WindowsLook.scheme (modified) * code/branches/gamestate/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/gamestate/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/gamestate/src/modules/questsystem/QuestGUI.cc (modified) * code/branches/gamestate/src/modules/questsystem/QuestGUINode.cc (modified) * code/branches/gamestate/src/orxonox/pickup/PickupInventory.cc (modified) Changed use of CEGUI widgets: Instead of addressing a type with ... Thu, 18 Mar 2010 14:48:49 GMT erwin [6562] * code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound5/src/orxonox/sound/SoundManager.cc (modified) * code/branches/sound5/src/orxonox/sound/SoundStreamer.cc (modified) More tries to fix the sound: there seems to be no context in the ... Thu, 18 Mar 2010 13:18:45 GMT scheusso [6559] * code/branches/skybox2/src/modules/CMakeLists.txt (modified) * code/branches/skybox2/src/modules/designtools (added) * code/branches/skybox2/src/modules/designtools/CMakeLists.txt (added) * code/branches/skybox2/src/modules/designtools/DesignToolsPrereqs.h (added) created new module designtools to put skyboxgenerator and also ... Thu, 18 Mar 2010 13:10:01 GMT scheusso [6558] * code/branches/skybox2 (copied) creating new skybox branch to continue work on skybox generator Thu, 18 Mar 2010 12:13:30 GMT dafrick [6557] * code/branches/pickup3 (deleted) Remove pickup3 branch, because it's no longer needed, as well... Thu, 18 Mar 2010 12:12:55 GMT dafrick [6556] * code/branches/pickup2 (deleted) Remove pickups 2 branch, since it's no longer needed. Thu, 18 Mar 2010 12:08:55 GMT scheusso [6555] * code/branches/ppspickups2 (modified) * code/branches/ppspickups2/data/levels/pickup_pps_invi.oxw (copied) * code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.cc (copied) * code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.h (copied) merging revisions 6526:6532 from ppspickups2 into new ppspickups2 Thu, 18 Mar 2010 12:07:57 GMT scheusso [6554] * code/branches/ppspickups2 (copied) recreating ppspickups2 from trunk Thu, 18 Mar 2010 12:07:32 GMT scheusso [6553] * code/branches/ppspickups2 (deleted) temporarily deleting this branch Thu, 18 Mar 2010 12:01:56 GMT scheusso [6552] * code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi (added) * code/branches/ppspickups1/data/levels/pickup_ppstest.oxw (added) * code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt (added) * code/branches/ppspickups1/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (added) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (added) merged revisions 6525:6543 from ppspickups1 into ppspickups1 Thu, 18 Mar 2010 11:46:49 GMT scheusso [6551] * code/branches/ppspickups1 (copied) recreating ppspickups1 branch Thu, 18 Mar 2010 11:46:24 GMT scheusso [6550] * code/branches/ppspickups1 (deleted) temporarily deleting this branch Thu, 18 Mar 2010 11:21:27 GMT rgrieder [6548] * code/branches/gamestate/data/gui/schemes/SleekSpaceLook.scheme (added) Added a new look from the CEGUI skin repository: sleekspace. (added ... Thu, 18 Mar 2010 09:58:18 GMT rgrieder [6546] * code/branches/gamestate/data/gui/schemes/TaharezLookSkin.scheme (deleted) Removed yet another obsolete cegui file. Wed, 17 Mar 2010 23:15:34 GMT rgrieder [6545] * code/branches/gamestate/data/gui/layouts/DecisionPopup.layout (modified) * code/branches/gamestate/data/gui/layouts/InGameMenu.layout (modified) * code/branches/gamestate/data/gui/layouts/InfoPopup.layout (modified) It seems we don't usually define the fonts used in widgets manually. ... Wed, 17 Mar 2010 23:13:57 GMT rgrieder [6544] * code/branches/gamestate/data/gui/configs/Falagard.xsd (deleted) * code/branches/gamestate/data/gui/configs/Font.xsd (deleted) * code/branches/gamestate/data/gui/configs/GUILayout.xsd (deleted) * code/branches/gamestate/data/gui/configs/GUIScheme.xsd (deleted) * code/branches/gamestate/data/gui/configs/Imageset.xsd (deleted) * code/branches/gamestate/data/gui/layouts/CompositorDemo.layout (deleted) * code/branches/gamestate/data/gui/layouts/Console.wnd (deleted) * code/branches/gamestate/data/gui/layouts/CrowdDemo.layout (deleted) * code/branches/gamestate/data/gui/layouts/Demo7Windows.layout (deleted) * code/branches/gamestate/data/gui/layouts/Demo8.layout (deleted) * code/branches/gamestate/data/gui/layouts/DragDropDemo.layout (deleted) * code/branches/gamestate/data/gui/layouts/FontDemo.layout (deleted) * code/branches/gamestate/data/gui/layouts/InstancingDemo.layout (deleted) * code/branches/gamestate/data/gui/layouts/TabControlDemo.layout (deleted) * code/branches/gamestate/data/gui/layouts/TabPage.layout (deleted) * code/branches/gamestate/data/gui/layouts/TabPage1.layout (deleted) * code/branches/gamestate/data/gui/layouts/TabPage2.layout (deleted) * code/branches/gamestate/data/gui/layouts/TextDemo.layout (deleted) * code/branches/gamestate/data/gui/layouts/TreeDemoTaharez.layout (deleted) * code/branches/gamestate/data/gui/layouts/VanillaConsole.layout (deleted) * code/branches/gamestate/data/gui/layouts/VanillaWindows.layout (deleted) * code/branches/gamestate/data/gui/layouts/cegui8.layout (deleted) * code/branches/gamestate/data/gui/layouts/facial.layout (deleted) * code/branches/gamestate/data/gui/layouts/ogregui.layout (deleted) * code/branches/gamestate/data/gui/layouts/shadows.layout (deleted) * code/branches/gamestate/data/gui/schemes/Demo8.scheme (deleted) * code/branches/gamestate/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/branches/gamestate/data/gui/schemes/TaharezLookWidgetAliases.scheme (deleted) * code/branches/gamestate/data/gui/schemes/TaharezLookWidgets.scheme (deleted) * code/branches/gamestate/data/gui/schemes/WindowsLookWidgets.scheme (deleted) * code/branches/gamestate/data/gui/scripts/InitialiseGUI.lua (modified) Removed loads of CEGUI related files that we really don't need. Most ... Wed, 17 Mar 2010 11:36:46 GMT rgrieder [6543] * code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi (modified) * code/branches/ppspickups1/data/levels/pickup_ppstest.oxw (modified) * code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (modified) svn:eol-style "native" for all text based files. Wed, 17 Mar 2010 11:14:42 GMT ebeier [6542] * code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi (modified) * code/branches/ppspickups1/data/levels/pickup_ppstest.oxw (modified) * code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt (modified) * code/branches/ppspickups1/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (added) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (added) made some changes, testlevel should be ready, ... Wed, 17 Mar 2010 09:40:31 GMT ebeier [6541] * code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi (added) * code/branches/ppspickups1/data/levels/pickup_ppstest.oxw (added) * code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt (added) added some files for new speed pickup Tue, 16 Mar 2010 12:49:16 GMT rgrieder [6537] * code/branches/gamestate/data/gui/scripts/BasicGUI.lua (modified) * code/branches/gamestate/data/gui/scripts/DecisionPopup.lua (modified) * code/branches/gamestate/data/gui/scripts/InGameMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/InfoPopup.lua (modified) * code/branches/gamestate/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/gamestate/src/libraries/core/Core.cc (modified) * code/branches/gamestate/src/libraries/core/GUIManager.cc (modified) * code/branches/gamestate/src/libraries/core/GUIManager.h (modified) * code/branches/gamestate/src/libraries/core/input/InputManager.cc (modified) * code/branches/gamestate/src/libraries/core/input/InputManager.h (modified) * code/branches/gamestate/src/libraries/core/input/InputState.cc (modified) * code/branches/gamestate/src/libraries/core/input/InputState.h (modified) * code/branches/gamestate/src/libraries/util/TriBool.h (added) * code/branches/gamestate/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/gamestate/src/orxonox/gamestates/GSMainMenu.cc (modified) Linked every GUI sheet to exactly one InputState. Also added ... Mon, 15 Mar 2010 16:20:26 GMT benedict [6532] * code/branches/ppspickups2/data/levels/pickup_pps_invi.oxw (modified) * code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.cc (added) * code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.h (added) created .h and .cc files for invi-pickup Mon, 15 Mar 2010 15:52:47 GMT benedict [6531] * code/branches/ppspickups2/data/levels/pickup_pps_invi.oxw (added) simple copy of pickuplevel Mon, 15 Mar 2010 15:49:02 GMT benedict [6530] * code/branches/ppspickups2/test (deleted) wider nur ein test Mon, 15 Mar 2010 15:29:29 GMT benedict [6529] * code/branches/ppspickups2/test (added) testcommit Mon, 15 Mar 2010 15:27:50 GMT ebeier [6528] * code/branches/ppspickups1/test.txt (added) Mon, 15 Mar 2010 15:23:54 GMT scheusso [6527] * code/branches/chat (copied) creating new chat branch Mon, 15 Mar 2010 15:01:25 GMT dafrick [6526] * code/branches/ppspickups2 (copied) Second new branch to create pickups. (Ignore the ... level from the ... Mon, 15 Mar 2010 14:59:57 GMT dafrick [6525] * code/branches/ppspickups1 (copied) New branch to create pickups level. Mon, 15 Mar 2010 14:07:21 GMT dafrick [6523] * code/branches/pickup3/src/orxonox/interfaces/Pickupable.h (modified) Whitespace removal. Mon, 15 Mar 2010 13:52:50 GMT rgrieder [6522] * code/branches/rocket (copied) Created branch for rocket aim improvements. Mon, 15 Mar 2010 06:33:11 GMT dafrick [6521] * code/branches/pickup3/src/libraries/core/Super.h (modified) * code/branches/pickup3/src/modules/pickup/Pickup.cc (modified) * code/branches/pickup3/src/modules/pickup/Pickup.h (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.h (modified) * code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.h (modified) Added changedPickedUp method to Pickupable to solve a problem in ... Sun, 14 Mar 2010 09:27:41 GMT dafrick [6520] * code/branches/pickup3/data/levels/pickup.oxw (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified) Small fix in HealthPickup. Sat, 13 Mar 2010 14:32:34 GMT dafrick [6519] * code/branches/pickup3/data/levels/includes/pickups.oxi (modified) * code/branches/pickup3/data/levels/pickup.oxw (modified) * code/branches/pickup3/data/levels/templates/pickup_representation_templates.oxt (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.h (modified) * code/branches/pickup3/src/modules/pickup/PickupCollectionIdentifier.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollectionIdentifier.h (modified) * code/branches/pickup3/src/modules/pickup/items/MetaPickup.cc (modified) * code/branches/pickup3/src/modules/pickup/items/MetaPickup.h (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.h (modified) Started documenting MetaPcikup, resolved some bugs in ...