# # ChangeLog for / # # Generated by Trac 1.0.9 # Nov 25, 2024, 2:54:48 PM Mon, 12 Apr 2010 12:21:39 GMT benedict [6685] * code/branches/ppspickups2/data/levels/templates/pickup_representation_templates_invisible.oxt (modified) created small, medium and huge invisibility pickup tempaltes Mon, 12 Apr 2010 11:55:31 GMT benedict [6684] * code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.cc (modified) minor changes in intendation & commenting Mon, 12 Apr 2010 11:24:24 GMT solex [6683] * 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) master/slave behavior enhancments Mon, 12 Apr 2010 11:11:26 GMT smerkli [6682] * code/branches/chat/src/libraries/network/ChatListener.cc (modified) added chatlistener method for debugging (ChatListener.cc) Sun, 11 Apr 2010 14:29:06 GMT ebeier [6681] * code/branches/ppspickups1/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/ppspickups1/src/modules/pickup/items/HealthPickup.h (modified) * code/branches/ppspickups1/src/modules/pickup/items/MetaPickup.cc (modified) * code/branches/ppspickups1/src/modules/pickup/items/MetaPickup.h (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (modified) added svn:eol-style native Sun, 11 Apr 2010 14:21:22 GMT ebeier [6680] * data/trunk/materials/scripts/Eye.material (added) * data/trunk/materials/scripts/Shield.material (added) * data/trunk/materials/textures/eye.tga (added) * data/trunk/materials/textures/shield.tga (added) Added two more images/materials for Pickups (Shield/Invisibility) Fri, 09 Apr 2010 18:30:12 GMT dafrick [6679] * code/branches/pickup4/data/gui/scripts/PickupInventory.lua (modified) Fixed annoying bug in PickupInventory (typos ;) ), use and drop ... Tue, 06 Apr 2010 13:04:56 GMT scheusso [6678] * data/trunk/materials/scripts/Orxonox.material (modified) disable mipmapping for hudtextures/materials Tue, 06 Apr 2010 13:04:26 GMT scheusso [6677] * code/trunk/src/modules/overlays/hud/HUDBar.cc (modified) this removes problems with the HUDSpeedBar on some machines (by ... Tue, 06 Apr 2010 09:00:44 GMT rgrieder [6676] * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) Removed some msvc float warnings. Fri, 02 Apr 2010 15:35:14 GMT dafrick [6675] * code/branches/pickup4/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/branches/pickup4/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/pickup4/data/gui/scripts/PickupInventory.lua (modified) * code/branches/pickup4/data/levels/includes/pickups.oxi (modified) * code/branches/pickup4/data/levels/pickup.oxw (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/PickupRepresentation.cc (modified) * code/branches/pickup4/src/modules/pickup/PickupRepresentation.h (modified) * code/branches/pickup4/src/orxonox/worldentities/pawns/Pawn.cc (modified) Lua bugs fixed. Renamed name and description in PickupRepresentation ... Thu, 01 Apr 2010 14:24:59 GMT erwin [6674] * code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound5/src/orxonox/sound/AmbientSound.h (modified) * code/branches/sound5/src/orxonox/sound/SoundStreamer.cc (modified) A few new tries to fix the sound problem: no success Thu, 01 Apr 2010 14:20:47 GMT gionc [6673] * code/branches/skybox2/src/modules/designtools/SkyboxGenerator.cc (modified) * code/branches/skybox2/src/modules/designtools/SkyboxGenerator.h (modified) * code/branches/skybox2/src/orxonox/worldentities/ControllableEntity.h (modified) First version of SkyboxGenerator Thu, 01 Apr 2010 13:34:02 GMT hallerja [6672] * data/contentcreation/pps/JanHaller/1.blend (modified) * data/contentcreation/pps/JanHaller/Raster.png (modified) Texture model 1 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 ... Thu, 01 Apr 2010 08:21:35 GMT dafrick [6669] * code/branches/pickup4/data/gui/scripts/PickupInventory.lua (modified) * code/branches/pickup4/src/modules/pickup/PickupManager.cc (modified) * code/branches/pickup4/src/modules/pickup/PickupManager.h (modified) Committing recent changes in PickupInventory, to be able to try out ... Wed, 31 Mar 2010 22:11:49 GMT hallerja [6668] * data/contentcreation/pps/JanHaller/1.blend (added) * data/contentcreation/pps/JanHaller/Raster.png (added) Model 1 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. Tue, 30 Mar 2010 22:54:35 GMT rgrieder [6661] * code/branches/gamestate/data/lua/LuaStateInit.lua (modified) Fixed Lua stack trace output if Debugger could not be started. Tue, 30 Mar 2010 22:04:30 GMT rgrieder [6660] * code/branches/gamestate/data/lua/Debugger.lua (modified) * code/branches/gamestate/data/lua/LuaStateInit.lua (modified) * code/branches/gamestate/src/libraries/core/LuaState.cc (modified) * code/branches/gamestate/src/libraries/core/LuaState.h (modified) Improved Lua error handling: Clearer messages and debugger hook. So, ... Tue, 30 Mar 2010 14:34:01 GMT rgrieder [6659] * 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/KeyBindMenu.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/PickupInventory.lua (modified) * code/branches/gamestate/data/gui/scripts/QuestGUI.lua (modified) * code/branches/gamestate/data/gui/scripts/SingleplayerMenu.lua (modified) Use "P." instead of "P:" when using our sheets as objects, not ... Tue, 30 Mar 2010 13:41:15 GMT rgrieder [6658] * code/branches/gamestate/data/gui/scripts/InitialiseGUI.lua (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.h (modified) * code/branches/gamestate/src/orxonox/gamestates/GSMainMenu.cc (modified) Restructured InitialiseGUI.lua a little bit. Also sorted out cursor ... Tue, 30 Mar 2010 10:13:33 GMT rgrieder [6657] * code/branches/gamestate/src/libraries/core/input/InputDevice.h (modified) * code/branches/gamestate/src/libraries/core/input/InputHandler.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.h (modified) * code/branches/gamestate/src/libraries/util/Singleton.h (modified) Implemented indirect function calls for input events. It simply means ... Tue, 30 Mar 2010 09:28:21 GMT rgrieder [6656] * code/branches/gamestate/src/libraries/core/input/InputManager.h (modified) * code/branches/gamestate/src/libraries/core/input/InputPrereqs.h (modified) * code/branches/gamestate/src/libraries/core/input/InputState.h (modified) Moved InputStatePriority from InputState.h to InputPrereqs.h 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:04:31 GMT rgrieder [6654] * data/trunk/materials/scripts/3arrowsup.material (modified) svn:eol-style "native" for all text based files. 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 20:06:43 GMT ebeier [6651] * data/trunk/materials/scripts/3arrowsup.material (modified) * data/trunk/materials/textures/3arrowsup.tga (modified) fixed added files *oops* Mon, 29 Mar 2010 19:49:37 GMT ebeier [6650] * data/trunk/materials/scripts/3arrowsup.material (added) * data/trunk/materials/textures/3arrowsup.tga (added) added pic for speedpickup 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:35:26 GMT rgrieder [6638] * data/contentcreation/pps/MoritzVifian (added) Added PPS artist folder for Moritz. 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 22:03:20 GMT rgrieder [6620] * code/trunk/src/external/tinyxml/VERSION (modified) * code/trunk/src/external/tinyxml/tinyxml.cpp (modified) * code/trunk/src/external/tinyxml/tinyxml.h (modified) * code/trunk/src/external/tinyxml/tinyxmlparser.cpp (modified) Updated TinyXML++ to the latest trunk revision. Only adds a function ... 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 15:43:59 GMT rgrieder [6618] * data/branches/png/materials/textures/bar2.png (modified) Testing why tardis complains about my PNGs. --> converted bar2.png ... Thu, 25 Mar 2010 14:54:46 GMT hallerja [6617] * data/contentcreation/pps/JanHaller (added) Creating directory for content 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 20:55:59 GMT rgrieder [6613] * data/branches/png/gui/imagesets/FairChar.png (modified) * data/branches/png/gui/imagesets/GPN-2000-001437.png (modified) * data/branches/png/gui/imagesets/TaharezGreenLook.png (modified) * data/branches/png/gui/imagesets/TaharezLook.png (modified) * data/branches/png/gui/imagesets/WindowsLook.png (modified) * data/branches/png/gui/imagesets/vanilla.png (modified) * data/branches/png/materials/textures/GLX_icon.png (modified) * data/branches/png/materials/textures/LightningBall_1.png (modified) * data/branches/png/materials/textures/LightningBall_2.png (modified) * data/branches/png/materials/textures/LightningBall_3.png (modified) * data/branches/png/materials/textures/LightningBall_4.png (modified) * data/branches/png/materials/textures/LightningBall_5.png (modified) * data/branches/png/materials/textures/LightningBall_6.png (modified) * data/branches/png/materials/textures/LightningBall_7.png (modified) * data/branches/png/materials/textures/LightningBall_8.png (modified) * data/branches/png/materials/textures/LightningGun.png (modified) * data/branches/png/materials/textures/Lightning_gun4.png (modified) * data/branches/png/materials/textures/Lightning_gun_pic2.png (modified) * data/branches/png/materials/textures/OrxonoxBlack.png (modified) * data/branches/png/materials/textures/OrxonoxGREEN.png (modified) * data/branches/png/materials/textures/OrxonoxORANGE.png (modified) * data/branches/png/materials/textures/OrxonoxRED.png (modified) * data/branches/png/materials/textures/OrxonoxYELLOW.png (modified) * data/branches/png/materials/textures/RadarDot.png (modified) * data/branches/png/materials/textures/RadarSquare.png (modified) * data/branches/png/materials/textures/RadarTriangle.png (modified) * data/branches/png/materials/textures/Sepia1D.png (modified) * data/branches/png/materials/textures/arrows.png (modified) * data/branches/png/materials/textures/asterix.png (modified) * data/branches/png/materials/textures/asteroid.png (modified) * data/branches/png/materials/textures/asteroid_ice.png (modified) * data/branches/png/materials/textures/atmospheretype1.png (modified) * data/branches/png/materials/textures/atmospheretype2.png (modified) * data/branches/png/materials/textures/atmospheretype3.png (modified) * data/branches/png/materials/textures/atmospheretype4.png (modified) * data/branches/png/materials/textures/atmospheretype5.png (modified) * data/branches/png/materials/textures/backGround.png (modified) * data/branches/png/materials/textures/backlightflare.png (modified) * data/branches/png/materials/textures/backlighttrail.png (modified) * data/branches/png/materials/textures/bar1.png (modified) * data/branches/png/materials/textures/bar2.png (modified) * data/branches/png/materials/textures/bar2a.png (modified) * data/branches/png/materials/textures/bar2b.png (modified) * data/branches/png/materials/textures/bar2c.png (modified) * data/branches/png/materials/textures/bigflame.png (modified) * data/branches/png/materials/textures/bigflare1.png (modified) * data/branches/png/materials/textures/can.png (modified) * data/branches/png/materials/textures/console2.png (modified) * data/branches/png/materials/textures/console3.png (modified) * data/branches/png/materials/textures/console4.png (modified) * data/branches/png/materials/textures/console5.png (modified) * data/branches/png/materials/textures/crate.png (modified) * data/branches/png/materials/textures/cross.png (modified) * data/branches/png/materials/textures/crosshair.png (modified) * data/branches/png/materials/textures/crosshair2.png (modified) * data/branches/png/materials/textures/cursor.png (modified) * data/branches/png/materials/textures/cursor_console.png (modified) * data/branches/png/materials/textures/drone.png (modified) * data/branches/png/materials/textures/explosion.png (modified) * data/branches/png/materials/textures/explosion3.png (modified) * data/branches/png/materials/textures/final_gold.png (modified) * data/branches/png/materials/textures/flare.png (modified) * data/branches/png/materials/textures/flare2.png (modified) * data/branches/png/materials/textures/flare2_1.png (modified) * data/branches/png/materials/textures/flaretrail.png (modified) * data/branches/png/materials/textures/healthbar_bar.png (modified) * data/branches/png/materials/textures/healthbar_bg.png (modified) * data/branches/png/materials/textures/hs-w01.png (modified) * data/branches/png/materials/textures/hs-w01s.png (modified) * data/branches/png/materials/textures/iceplanet.png (modified) * data/branches/png/materials/textures/laserbeam.png (modified) * data/branches/png/materials/textures/mapgrid.png (modified) * data/branches/png/materials/textures/ogrelogo.png (modified) * data/branches/png/materials/textures/plasmaSilver_Tube.png (modified) * data/branches/png/materials/textures/radar.png (modified) * data/branches/png/materials/textures/ring_flare.png (modified) * data/branches/png/materials/textures/ring_flare2.png (modified) * data/branches/png/materials/textures/rock.png (modified) * data/branches/png/materials/textures/rust.png (modified) * data/branches/png/materials/textures/smoke.png (modified) * data/branches/png/materials/textures/smoke2.png (modified) * data/branches/png/materials/textures/smoke3.png (modified) * data/branches/png/materials/textures/smokecolors.png (modified) * data/branches/png/materials/textures/spacesruiser.png (modified) * data/branches/png/materials/textures/sphere.png (modified) * data/branches/png/materials/textures/starship.png (modified) * data/branches/png/materials/textures/streak.png (modified) * data/branches/png/materials/textures/tdc.png (modified) * data/branches/png/materials/textures/white.png (modified) Don't use IrfanView to batch convert TGA -> PNG: it doesn't support ... Tue, 23 Mar 2010 15:50:37 GMT rgrieder [6612] * data/branches/png/AUTHORS (modified) * data/branches/png/gui/imagesets/FairChar.imageset (modified) * data/branches/png/gui/imagesets/ReadMe.txt (modified) * data/branches/png/gui/imagesets/TaharezGreenLook.imageset (modified) * data/branches/png/gui/imagesets/TaharezLook.imageset (modified) * data/branches/png/gui/imagesets/Vanilla.imageset (modified) * data/branches/png/gui/imagesets/WindowsLook.imageset (modified) * data/branches/png/materials/scripts/Asterix.material (modified) * data/branches/png/materials/scripts/Bump_Specular.material (modified) * data/branches/png/materials/scripts/Cone.material (modified) * data/branches/png/materials/scripts/Console.material (modified) * data/branches/png/materials/scripts/Cross.material (modified) * data/branches/png/materials/scripts/Example.material (modified) * data/branches/png/materials/scripts/Flares.material (modified) * data/branches/png/materials/scripts/Glass.material (modified) * data/branches/png/materials/scripts/HXY.material (modified) * data/branches/png/materials/scripts/LightningGun-s.material (modified) * data/branches/png/materials/scripts/LightningGun.material (modified) * data/branches/png/materials/scripts/Map.material (modified) * data/branches/png/materials/scripts/Ogre.material (modified) * data/branches/png/materials/scripts/OldMovie.material (modified) * data/branches/png/materials/scripts/Orxonox.material (modified) * data/branches/png/materials/scripts/OrxonoxSky.material (modified) * data/branches/png/materials/scripts/PE_materials.material (modified) * data/branches/png/materials/scripts/Scene.material (modified) * data/branches/png/materials/scripts/Sphere2.material (modified) * data/branches/png/materials/scripts/Stats.material (modified) * data/branches/png/materials/scripts/Trail.material (modified) * data/branches/png/materials/scripts/Transporter.material (modified) * data/branches/png/materials/scripts/assf.material (modified) * data/branches/png/materials/scripts/assf5.material (modified) * data/branches/png/materials/scripts/asteroid_ice.material (modified) * data/branches/png/materials/scripts/asteroids.material (modified) * data/branches/png/materials/scripts/can.material (modified) * data/branches/png/materials/scripts/crate.material (modified) * data/branches/png/materials/scripts/cube.material (modified) * data/branches/png/materials/scripts/drone.material (modified) * data/branches/png/materials/scripts/h2_green.material (modified) * data/branches/png/materials/scripts/hoover.material (modified) * data/branches/png/materials/scripts/hs-w01.material (modified) * data/branches/png/materials/scripts/hs-w01s.material (modified) * data/branches/png/materials/scripts/iceplanet.material (modified) * data/branches/png/materials/scripts/laserbeam.material (modified) * data/branches/png/materials/scripts/planet.material (modified) * data/branches/png/materials/scripts/rock.material (modified) * data/branches/png/materials/scripts/spacecruiser.material (modified) * data/branches/png/materials/scripts/sphere.material (modified) * data/branches/png/materials/scripts/starship.material (modified) Replaced *.tga with *.png 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. Tue, 23 Mar 2010 14:39:36 GMT rgrieder [6609] * data/branches/png/gui/imagesets/FairChar.png (added) * data/branches/png/gui/imagesets/FairChar.tga (deleted) * data/branches/png/gui/imagesets/GPN-2000-001437.png (added) * data/branches/png/gui/imagesets/GPN-2000-001437.tga (deleted) * data/branches/png/gui/imagesets/TaharezGreenLook.png (added) * data/branches/png/gui/imagesets/TaharezGreenLook.tga (deleted) * data/branches/png/gui/imagesets/TaharezLook.png (added) * data/branches/png/gui/imagesets/TaharezLook.tga (deleted) * data/branches/png/gui/imagesets/WindowsLook.png (added) * data/branches/png/gui/imagesets/WindowsLook.tga (deleted) * data/branches/png/gui/imagesets/vanilla.png (added) * data/branches/png/gui/imagesets/vanilla.tga (deleted) * data/branches/png/materials/scripts/LightningGun-s.tga (deleted) * data/branches/png/materials/textures/GLX_icon.tga (deleted) * data/branches/png/materials/textures/LightningBall_1.png (added) * data/branches/png/materials/textures/LightningBall_1.tga (deleted) * data/branches/png/materials/textures/LightningBall_2.png (added) * data/branches/png/materials/textures/LightningBall_2.tga (deleted) * data/branches/png/materials/textures/LightningBall_3.png (added) * data/branches/png/materials/textures/LightningBall_3.tga (deleted) * data/branches/png/materials/textures/LightningBall_4.png (added) * data/branches/png/materials/textures/LightningBall_4.tga (deleted) * data/branches/png/materials/textures/LightningBall_5.png (added) * data/branches/png/materials/textures/LightningBall_5.tga (deleted) * data/branches/png/materials/textures/LightningBall_6.png (added) * data/branches/png/materials/textures/LightningBall_6.tga (deleted) * data/branches/png/materials/textures/LightningBall_7.png (added) * data/branches/png/materials/textures/LightningBall_7.tga (deleted) * data/branches/png/materials/textures/LightningBall_8.png (added) * data/branches/png/materials/textures/LightningBall_8.tga (deleted) * data/branches/png/materials/textures/LightningGun-s.png (added) * data/branches/png/materials/textures/LightningGun.png (added) * data/branches/png/materials/textures/LightningGun.tga (deleted) * data/branches/png/materials/textures/Lightning_gun4.png (added) * data/branches/png/materials/textures/Lightning_gun4.tga (deleted) * data/branches/png/materials/textures/Lightning_gun_pic2.png (added) * data/branches/png/materials/textures/Lightning_gun_pic2.tga (deleted) * data/branches/png/materials/textures/OrxonoxBlack.png (added) * data/branches/png/materials/textures/OrxonoxBlack.tga (deleted) * data/branches/png/materials/textures/OrxonoxGREEN.png (added) * data/branches/png/materials/textures/OrxonoxGREEN.tga (deleted) * data/branches/png/materials/textures/OrxonoxORANGE.png (added) * data/branches/png/materials/textures/OrxonoxORANGE.tga (deleted) * data/branches/png/materials/textures/OrxonoxRED.png (added) * data/branches/png/materials/textures/OrxonoxRED.tga (deleted) * data/branches/png/materials/textures/OrxonoxYELLOW.png (added) * data/branches/png/materials/textures/OrxonoxYELLOW.tga (deleted) * data/branches/png/materials/textures/RadarDot.png (added) * data/branches/png/materials/textures/RadarDot.tga (deleted) * data/branches/png/materials/textures/RadarSquare.png (added) * data/branches/png/materials/textures/RadarSquare.tga (deleted) * data/branches/png/materials/textures/RadarTriangle.png (added) * data/branches/png/materials/textures/RadarTriangle.tga (deleted) * data/branches/png/materials/textures/Sepia1D.png (added) * data/branches/png/materials/textures/Sepia1D.tga (deleted) * data/branches/png/materials/textures/arrows.png (added) * data/branches/png/materials/textures/arrows.tga (deleted) * data/branches/png/materials/textures/asterix.png (added) * data/branches/png/materials/textures/asterix.tga (deleted) * data/branches/png/materials/textures/asteroid.png (added) * data/branches/png/materials/textures/asteroid.tga (deleted) * data/branches/png/materials/textures/asteroid_ice.png (added) * data/branches/png/materials/textures/asteroid_ice.tga (deleted) * data/branches/png/materials/textures/atmospheretype1.png (added) * data/branches/png/materials/textures/atmospheretype1.tga (deleted) * data/branches/png/materials/textures/atmospheretype2.png (added) * data/branches/png/materials/textures/atmospheretype2.tga (deleted) * data/branches/png/materials/textures/atmospheretype3.png (added) * data/branches/png/materials/textures/atmospheretype3.tga (deleted) * data/branches/png/materials/textures/atmospheretype4.png (added) * data/branches/png/materials/textures/atmospheretype4.tga (deleted) * data/branches/png/materials/textures/atmospheretype5.png (added) * data/branches/png/materials/textures/atmospheretype5.tga (deleted) * data/branches/png/materials/textures/backGround.png (added) * data/branches/png/materials/textures/backGround.tga (deleted) * data/branches/png/materials/textures/backlightflare.png (added) * data/branches/png/materials/textures/backlightflare.tga (deleted) * data/branches/png/materials/textures/backlighttrail.png (added) * data/branches/png/materials/textures/backlighttrail.tga (deleted) * data/branches/png/materials/textures/bar1.png (added) * data/branches/png/materials/textures/bar1.tga (deleted) * data/branches/png/materials/textures/bar2.png (added) * data/branches/png/materials/textures/bar2.tga (deleted) * data/branches/png/materials/textures/bar2a.png (added) * data/branches/png/materials/textures/bar2a.tga (deleted) * data/branches/png/materials/textures/bar2b.png (added) * data/branches/png/materials/textures/bar2b.tga (deleted) * data/branches/png/materials/textures/bar2c.png (added) * data/branches/png/materials/textures/bar2c.tga (deleted) * data/branches/png/materials/textures/bigflame.png (added) * data/branches/png/materials/textures/bigflame.tga (deleted) * data/branches/png/materials/textures/bigflare1.png (added) * data/branches/png/materials/textures/bigflare1.tga (deleted) * data/branches/png/materials/textures/can.png (added) * data/branches/png/materials/textures/can.tga (deleted) * data/branches/png/materials/textures/console2.png (added) * data/branches/png/materials/textures/console2.tga (deleted) * data/branches/png/materials/textures/console3.png (added) * data/branches/png/materials/textures/console3.tga (deleted) * data/branches/png/materials/textures/console4.png (added) * data/branches/png/materials/textures/console4.tga (deleted) * data/branches/png/materials/textures/console5.png (added) * data/branches/png/materials/textures/console5.tga (deleted) * data/branches/png/materials/textures/crate.png (added) * data/branches/png/materials/textures/crate.tga (deleted) * data/branches/png/materials/textures/cross.png (added) * data/branches/png/materials/textures/cross.tga (deleted) * data/branches/png/materials/textures/crosshair.png (added) * data/branches/png/materials/textures/crosshair.tga (deleted) * data/branches/png/materials/textures/crosshair2.png (added) * data/branches/png/materials/textures/crosshair2.tga (deleted) * data/branches/png/materials/textures/cursor.png (added) * data/branches/png/materials/textures/cursor.tga (deleted) * data/branches/png/materials/textures/cursor_console.png (added) * data/branches/png/materials/textures/cursor_console.tga (deleted) * data/branches/png/materials/textures/drone.png (added) * data/branches/png/materials/textures/drone.tga (deleted) * data/branches/png/materials/textures/explosion.png (added) * data/branches/png/materials/textures/explosion.tga (deleted) * data/branches/png/materials/textures/explosion3.png (added) * data/branches/png/materials/textures/explosion3.tga (deleted) * data/branches/png/materials/textures/final_gold.png (added) * data/branches/png/materials/textures/final_gold.tga (deleted) * data/branches/png/materials/textures/flare.png (added) * data/branches/png/materials/textures/flare.tga (deleted) * data/branches/png/materials/textures/flare2.png (added) * data/branches/png/materials/textures/flare2.tga (deleted) * data/branches/png/materials/textures/flare2_1.png (added) * data/branches/png/materials/textures/flare2_1.tga (deleted) * data/branches/png/materials/textures/flaretrail.png (added) * data/branches/png/materials/textures/flaretrail.tga (deleted) * data/branches/png/materials/textures/healthbar_bar.png (added) * data/branches/png/materials/textures/healthbar_bar.tga (deleted) * data/branches/png/materials/textures/healthbar_bg.png (added) * data/branches/png/materials/textures/healthbar_bg.tga (deleted) * data/branches/png/materials/textures/hs-w01.png (added) * data/branches/png/materials/textures/hs-w01.tga (deleted) * data/branches/png/materials/textures/hs-w01s.png (added) * data/branches/png/materials/textures/hs-w01s.tga (deleted) * data/branches/png/materials/textures/iceplanet.png (added) * data/branches/png/materials/textures/iceplanet.tga (deleted) * data/branches/png/materials/textures/laserbeam.png (added) * data/branches/png/materials/textures/laserbeam.tga (deleted) * data/branches/png/materials/textures/mapgrid.png (added) * data/branches/png/materials/textures/mapgrid.tga (deleted) * data/branches/png/materials/textures/ogrelogo.png (added) * data/branches/png/materials/textures/ogrelogo.tga (deleted) * data/branches/png/materials/textures/plasmaSilver_Tube.png (added) * data/branches/png/materials/textures/plasmaSilver_Tube.tga (deleted) * data/branches/png/materials/textures/radar.png (added) * data/branches/png/materials/textures/radar.tga (deleted) * data/branches/png/materials/textures/ring_flare.png (added) * data/branches/png/materials/textures/ring_flare.tga (deleted) * data/branches/png/materials/textures/ring_flare2.png (added) * data/branches/png/materials/textures/ring_flare2.tga (deleted) * data/branches/png/materials/textures/rock.png (added) * data/branches/png/materials/textures/rock.tga (deleted) * data/branches/png/materials/textures/rust.png (added) * data/branches/png/materials/textures/rust.tga (deleted) * data/branches/png/materials/textures/smoke.tga (deleted) * data/branches/png/materials/textures/smoke1.png (added) * data/branches/png/materials/textures/smoke2.png (added) * data/branches/png/materials/textures/smoke2.tga (deleted) * data/branches/png/materials/textures/smoke3.png (added) * data/branches/png/materials/textures/smoke3.tga (deleted) * data/branches/png/materials/textures/smokecolors.png (added) * data/branches/png/materials/textures/smokecolors.tga (deleted) * data/branches/png/materials/textures/spacesruiser.png (added) * data/branches/png/materials/textures/spacesruiser.tga (deleted) * data/branches/png/materials/textures/sphere.png (added) * data/branches/png/materials/textures/sphere.tga (deleted) * data/branches/png/materials/textures/starship.png (added) * data/branches/png/materials/textures/starship.tga (deleted) * data/branches/png/materials/textures/streak.png (added) * data/branches/png/materials/textures/streak.tga (deleted) * data/branches/png/materials/textures/tdc.png (added) * data/branches/png/materials/textures/tdc.tga (deleted) * data/branches/png/materials/textures/white.png (added) * data/branches/png/materials/textures/white.tga (deleted) Replaced all TGA files with optimized PNG files (not yet linked in ... Tue, 23 Mar 2010 13:25:17 GMT rgrieder [6608] * data/trunk/materials/textures/GLX_icon.png (modified) * data/trunk/materials/textures/centeroverlay.png (modified) * data/trunk/materials/textures/smoke.png (modified) More PNG optimisations. 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:56:02 GMT rgrieder [6604] * data/trunk/AUTHORS (modified) * data/trunk/LICENSE (modified) * data/trunk/gui/imagesets/SleekSpace.imageset (modified) * data/trunk/gui/looknfeel/SleekSpace.looknfeel (modified) * data/trunk/materials/scripts/Asterix.material (modified) * data/trunk/materials/scripts/Cross.material (modified) * data/trunk/materials/scripts/HXY.material (modified) * data/trunk/materials/scripts/Scene.material (modified) * data/trunk/materials/scripts/Sphere2.material (modified) * data/trunk/materials/scripts/Test.material (modified) * data/trunk/materials/scripts/Transporter.material (modified) * data/trunk/materials/scripts/asteroid_ice.material (modified) * data/trunk/materials/scripts/asteroid_y.material (modified) * data/trunk/materials/scripts/ghost.material (modified) * data/trunk/materials/scripts/hs-w01_reduced.material (modified) * data/trunk/materials/scripts/rocket.material (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:51:58 GMT scheusso [6598] * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) someone forgot to delete these overlays 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:52:13 GMT rgrieder [6590] * code/trunk/cmake/LibraryConfigTardis.cmake (modified) Switching to OGRE v1.6 on Tardis Mon, 22 Mar 2010 12:51:58 GMT decapitb [6589] * data/trunk/materials/scripts/hs-w01_reduced.material (added) * data/trunk/materials/textures/hs-w01_reduced.png (added) reduced hs-w01 texture and material script Mon, 22 Mar 2010 12:51:33 GMT decapitb [6588] * data/trunk/models/hs-w01_reduced.mesh (added) reduced hs-w01 mesh 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