# # ChangeLog for / # # Generated by Trac 1.0.9 # Nov 26, 2024, 5:17:03 AM Fri, 16 Apr 2010 18:09:17 GMT rgrieder [6748] * code/trunk/data/gui/scripts/ControlsMenu.lua (modified) * code/trunk/data/gui/scripts/GUISheet.lua (modified) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) * code/trunk/data/gui/scripts/KeyBindMenu.lua (modified) * code/trunk/data/gui/scripts/MainMenu.lua (modified) * code/trunk/data/gui/scripts/SettingsMenu.lua (modified) A GUISheet can assign its field "loadAlong" any strings designating ... Fri, 16 Apr 2010 13:01:06 GMT rgrieder [6747] * code/trunk/data/gui/scripts/GUISheet.lua (modified) * code/trunk/data/gui/scripts/PickupInventory.lua (modified) Added onShow and onHide as overridable methods to GUISheet.lua and ... Fri, 16 Apr 2010 12:50:16 GMT rgrieder [6746] * code/trunk (modified) * code/trunk/cmake/LibraryConfigTardis.cmake (modified) * code/trunk/data/gui/configs/Falagard.xsd (deleted) * code/trunk/data/gui/configs/Font.xsd (deleted) * code/trunk/data/gui/configs/GUILayout.xsd (deleted) * code/trunk/data/gui/configs/GUIScheme.xsd (deleted) * code/trunk/data/gui/configs/Imageset.xsd (deleted) * code/trunk/data/gui/layouts/AudioMenu.layout (modified) * code/trunk/data/gui/layouts/CompositorDemo.layout (deleted) * code/trunk/data/gui/layouts/Console.wnd (deleted) * code/trunk/data/gui/layouts/ControlsMenu.layout (modified) * code/trunk/data/gui/layouts/CreditsMenu.layout (modified) * code/trunk/data/gui/layouts/CrowdDemo.layout (deleted) * code/trunk/data/gui/layouts/DecisionPopup.layout (modified) * code/trunk/data/gui/layouts/Demo7Windows.layout (deleted) * code/trunk/data/gui/layouts/Demo8.layout (deleted) * code/trunk/data/gui/layouts/DragDropDemo.layout (deleted) * code/trunk/data/gui/layouts/FontDemo.layout (deleted) * code/trunk/data/gui/layouts/GameplayMenu.layout (modified) * code/trunk/data/gui/layouts/GraphicsMenu.layout (modified) * code/trunk/data/gui/layouts/InGameMenu.layout (modified) * code/trunk/data/gui/layouts/InGameTest.layout (modified) * code/trunk/data/gui/layouts/InfoPopup.layout (modified) * code/trunk/data/gui/layouts/InstancingDemo.layout (deleted) * code/trunk/data/gui/layouts/KeyBindMenu.layout (modified) * code/trunk/data/gui/layouts/MainMenu.layout (modified) * code/trunk/data/gui/layouts/MainMenuBackground.layout (modified) * code/trunk/data/gui/layouts/MouseControlsMenu.layout (modified) * code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified) * code/trunk/data/gui/layouts/MultiplayerOptionsMenu.layout (modified) * code/trunk/data/gui/layouts/PickupInventory.layout (modified) * code/trunk/data/gui/layouts/QuestGUI.layout (modified) * code/trunk/data/gui/layouts/SettingsMenu.layout (modified) * code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified) * code/trunk/data/gui/layouts/TabControlDemo.layout (deleted) * code/trunk/data/gui/layouts/TabPage.layout (deleted) * code/trunk/data/gui/layouts/TabPage1.layout (deleted) * code/trunk/data/gui/layouts/TabPage2.layout (deleted) * code/trunk/data/gui/layouts/TextDemo.layout (deleted) * code/trunk/data/gui/layouts/TreeDemoTaharez.layout (deleted) * code/trunk/data/gui/layouts/VanillaConsole.layout (deleted) * code/trunk/data/gui/layouts/VanillaWindows.layout (deleted) * code/trunk/data/gui/layouts/cegui8.layout (deleted) * code/trunk/data/gui/layouts/facial.layout (deleted) * code/trunk/data/gui/layouts/ogregui.layout (deleted) * code/trunk/data/gui/layouts/shadows.layout (deleted) * code/trunk/data/gui/schemes/Demo8.scheme (deleted) * code/trunk/data/gui/schemes/Looks.txt (copied) * code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/trunk/data/gui/schemes/SleekSpaceHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/SleekSpaceLook.scheme (copied) * code/trunk/data/gui/schemes/SleekSpaceMenuWidgets.scheme (copied) * code/trunk/data/gui/schemes/TaharezGreenHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/TaharezGreenLook.scheme (copied) * code/trunk/data/gui/schemes/TaharezGreenMenuWidgets.scheme (copied) * code/trunk/data/gui/schemes/TaharezHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/TaharezLook.scheme (modified) * code/trunk/data/gui/schemes/TaharezLookSkin.scheme (deleted) * code/trunk/data/gui/schemes/TaharezLookWidgetAliases.scheme (deleted) * code/trunk/data/gui/schemes/TaharezLookWidgets.scheme (deleted) * code/trunk/data/gui/schemes/TaharezMenuWidgets.scheme (copied) * code/trunk/data/gui/schemes/VanillaHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/VanillaLook.scheme (copied) * code/trunk/data/gui/schemes/VanillaMenuWidgets.scheme (copied) * code/trunk/data/gui/schemes/VanillaSkin.scheme (deleted) * code/trunk/data/gui/schemes/WindowsHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/WindowsLook.scheme (modified) * code/trunk/data/gui/schemes/WindowsLookWidgets.scheme (deleted) * code/trunk/data/gui/schemes/WindowsMenuWidgets.scheme (copied) * code/trunk/data/gui/scripts/AudioMenu.lua (modified) * code/trunk/data/gui/scripts/BasicGUI.lua (deleted) * code/trunk/data/gui/scripts/ControlsMenu.lua (modified) * code/trunk/data/gui/scripts/CreditsMenu.lua (modified) * code/trunk/data/gui/scripts/DecisionPopup.lua (modified) * code/trunk/data/gui/scripts/GUISheet.lua (copied) * code/trunk/data/gui/scripts/GUITools.lua (modified) * code/trunk/data/gui/scripts/GameplayMenu.lua (modified) * code/trunk/data/gui/scripts/GraphicsMenu.lua (modified) * code/trunk/data/gui/scripts/HUDSheet.lua (copied) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) * code/trunk/data/gui/scripts/InfoPopup.lua (modified) * code/trunk/data/gui/scripts/InitialiseGUI.lua (modified) * code/trunk/data/gui/scripts/KeyBindMenu.lua (modified) * code/trunk/data/gui/scripts/MainMenu.lua (modified) * code/trunk/data/gui/scripts/MenuSheet.lua (copied) * code/trunk/data/gui/scripts/MouseControlsMenu.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/MultiplayerOptionsMenu.lua (modified) * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) * code/trunk/data/gui/scripts/SettingsMenu.lua (modified) * code/trunk/data/gui/scripts/SheetManager.lua (copied) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/lua/Debugger.lua (copied) * code/trunk/data/lua/LuaStateInit.lua (modified) * code/trunk/data/lua/Strict.lua (copied) * code/trunk/data/lua/Tools.lua (copied) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.h (modified) * code/trunk/src/libraries/core/IOConsole.cc (modified) * code/trunk/src/libraries/core/IOConsole.h (modified) * code/trunk/src/libraries/core/LuaState.cc (modified) * code/trunk/src/libraries/core/LuaState.h (modified) * code/trunk/src/libraries/core/Resource.cc (modified) * code/trunk/src/libraries/core/Resource.h (modified) * code/trunk/src/libraries/core/Template.cc (modified) * code/trunk/src/libraries/core/input/InputDevice.h (modified) * code/trunk/src/libraries/core/input/InputHandler.h (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/core/input/InputManager.h (modified) * code/trunk/src/libraries/core/input/InputPrereqs.h (modified) * code/trunk/src/libraries/core/input/InputState.cc (modified) * code/trunk/src/libraries/core/input/InputState.h (modified) * code/trunk/src/libraries/network/TrafficControl.h (modified) * code/trunk/src/libraries/util/Serialise.h (modified) * code/trunk/src/libraries/util/Singleton.h (modified) * code/trunk/src/libraries/util/TriBool.h (copied) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/questsystem/QuestGUI.cc (modified) * code/trunk/src/modules/questsystem/QuestGUINode.cc (modified) * code/trunk/src/orxonox/CameraManager.h (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/PlayerManager.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified) * code/trunk/src/orxonox/overlays/CMakeLists.txt (modified) * code/trunk/src/orxonox/overlays/GUISheet.cc (copied) * code/trunk/src/orxonox/overlays/GUISheet.h (copied) Merged gamestates2 branch back to trunk. This brings in some heavy ... Fri, 16 Apr 2010 11:42:28 GMT rgrieder [6745] * code/branches/gamestates2/src/libraries/core/input/InputDevice.h (modified) * code/branches/gamestates2/src/libraries/core/input/InputHandler.h (modified) * code/branches/gamestates2/src/libraries/core/input/InputState.h (modified) Branch now compiling with GCC as well: Added an removed a few ... Fri, 16 Apr 2010 11:41:25 GMT rgrieder [6744] * code/branches/gamestates2/cmake/LibraryConfigTardis.cmake (modified) Boost_VERSION was missing on Tardis because of manual configuration Fri, 16 Apr 2010 11:07:57 GMT rgrieder [6743] * code/branches/gamestates2/data/gui/scripts/MenuSheet.lua (modified) * code/branches/gamestates2/data/gui/scripts/SheetManager.lua (modified) * code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc (modified) - Bugfix in keyESC. - Default behaviour for GUI sheet InputStates is ... Fri, 16 Apr 2010 10:53:16 GMT rgrieder [6742] * code/branches/gamestates2/data/lua/Tools.lua (modified) Fixed typo. Fri, 16 Apr 2010 10:50:52 GMT rgrieder [6741] * code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.h (modified) Removed obsolete InputState from GSMainMenu. Fri, 16 Apr 2010 10:48:24 GMT rgrieder [6740] * code/branches/gamestates2/src/libraries/core/GUIManager.cc (modified) Trivial bug fix. Fri, 16 Apr 2010 10:24:56 GMT rgrieder [6739] * code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc (modified) Applied background image changes to GSMainMenu.cc Fri, 16 Apr 2010 10:22:52 GMT rgrieder [6738] * code/branches/gamestates2/src/libraries/core/input/InputManager.cc (modified) Cosmetic changes in InputManager. Fri, 16 Apr 2010 10:22:12 GMT rgrieder [6737] * code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/SheetManager.lua (copied) * code/branches/gamestates2/src/libraries/core/GUIManager.cc (modified) * code/branches/gamestates2/src/libraries/core/GUIManager.h (modified) * code/branches/gamestates2/src/orxonox/overlays/GUISheet.cc (modified) * code/branches/gamestates2/src/orxonox/overlays/GUISheet.h (modified) Background image of the GUI is now managed by GUIManager and kept in ... Fri, 16 Apr 2010 10:11:57 GMT rgrieder [6736] * code/branches/gamestates2/src/libraries/core/GUIManager.cc (modified) * code/branches/gamestates2/src/libraries/core/GUIManager.h (modified) All CEGUI calls that can execute Lua code should be protected against ... Fri, 16 Apr 2010 10:06:45 GMT rgrieder [6735] * code/branches/gamestates2/src/orxonox/CameraManager.h (modified) * code/branches/gamestates2/src/orxonox/Level.cc (modified) * code/branches/gamestates2/src/orxonox/LevelManager.h (modified) * code/branches/gamestates2/src/orxonox/PlayerManager.cc (modified) Removed getInstancePtr() from all Singletons. Use "exists()" (check) ... Thu, 15 Apr 2010 14:06:27 GMT hallerja [6734] * data/contentcreation/pps/JanHaller/Missile.blend (added) * data/contentcreation/pps/JanHaller/PlasmaDrop.blend (added) Missile and plasma drop models Thu, 15 Apr 2010 13:42:24 GMT erwin [6733] * code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound5/src/orxonox/sound/SoundStreamer.cc (modified) Added some hacks, now the source is playing, but there are no ... Thu, 15 Apr 2010 13:35:31 GMT scheusso [6732] * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc (modified) correcting initial speed of projectiles Thu, 15 Apr 2010 12:47:39 GMT dafrick [6731] * code/trunk/data/levels/pickup.oxw (modified) * code/trunk/src/modules/pickup/PickupCollection.cc (modified) * code/trunk/src/modules/pickup/PickupCollection.h (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) PickupCollection is broken for now because to make it work drastic ... Thu, 15 Apr 2010 11:57:51 GMT erwin [6730] * code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified) Transfer changes again Thu, 15 Apr 2010 11:32:59 GMT erwin [6729] * code/branches/sound5/src/orxonox/sound/SoundStreamer.cc (modified) Commit changes to transfer to netbook Thu, 15 Apr 2010 11:15:11 GMT dafrick [6728] * code/trunk/data/levels/pickup.oxw (modified) * code/trunk/src/modules/pickup/Pickup.h (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) No more seg faults with pickups (at least that's what I hope. ;)) Wed, 14 Apr 2010 17:54:41 GMT scheusso [6727] * code/branches/hudelements/src/modules/objects/triggers/CheckPoint.cc (modified) * code/branches/hudelements/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/hudelements/src/modules/overlays/hud/HUDRadar.h (modified) * code/branches/hudelements/src/orxonox/Radar.cc (modified) * code/branches/hudelements/src/orxonox/Radar.h (modified) * code/branches/hudelements/src/orxonox/interfaces/RadarListener.h (modified) * code/branches/hudelements/src/orxonox/interfaces/RadarViewable.cc (modified) * code/branches/hudelements/src/orxonox/interfaces/RadarViewable.h (modified) * code/branches/hudelements/src/orxonox/worldentities/pawns/Pawn.cc (modified) HUDRadar now working again Wed, 14 Apr 2010 12:19:32 GMT erwin [6726] * code/branches/sound5/src/orxonox/sound/BaseSound.cc (modified) * code/branches/sound5/src/orxonox/sound/BaseSound.h (modified) * code/branches/sound5/src/orxonox/sound/SoundStreamer.cc (modified) Some more atempts to fix maybe it's platform specific... Tue, 13 Apr 2010 20:39:54 GMT dafrick [6725] * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/pickup/PickupIdentifier.cc (modified) Resolved bug, that caused orxonox to crash whenever a level with ... Tue, 13 Apr 2010 20:11:36 GMT rgrieder [6724] * code/branches/lod/data/levels/presentationLOD.oxw (modified) * code/branches/lod/data/levels/presentationLODdif.oxw (modified) * code/branches/lod/src/orxonox/graphics/MeshLodInformation.cc (modified) * code/branches/lod/src/orxonox/graphics/MeshLodInformation.h (modified) svn:eol-style "native" for all text-based files. Tue, 13 Apr 2010 20:09:00 GMT rgrieder [6723] * code/trunk/cmake/CompilerConfigMSVC.cmake (modified) Using /MP instead of /MP2 for MSVC. That way the number of processes ... Tue, 13 Apr 2010 16:17:51 GMT rgrieder [6722] * code/branches/gamestates2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/DecisionPopup.lua (modified) * code/branches/gamestates2/data/gui/scripts/GUITools.lua (modified) * code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/InGameMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/InfoPopup.lua (modified) * code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MainMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/gamestates2/src/libraries/core/GUIManager.cc (modified) * code/branches/gamestates2/src/libraries/core/GUIManager.h (modified) * code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/gamestates2/src/orxonox/overlays/GUISheet.cc (modified) Renamed showGUI and hideGUI to showMenuSheet and hideMenuSheet. Tue, 13 Apr 2010 15:58:55 GMT rgrieder [6721] * code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua (modified) Fixed cross hair showing in in game menu. Tue, 13 Apr 2010 13:58:56 GMT rgrieder [6720] * code/branches/gamestates2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/GUISheet.lua (modified) * code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua (modified) "init" lua function --> "onLoad" to make it clear that it is a user ... Tue, 13 Apr 2010 13:56:17 GMT rgrieder [6719] * code/branches/gamestates2/src/libraries/core/LuaState.cc (modified) Fixed error reporting problem in LuaState.cc when parsing ... Tue, 13 Apr 2010 13:55:30 GMT rgrieder [6718] * code/branches/gamestates2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/DecisionPopup.lua (modified) * code/branches/gamestates2/data/gui/scripts/GUISheet.lua (moved) * code/branches/gamestates2/data/gui/scripts/GUITools.lua (modified) * code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/HUDSheet.lua (added) * code/branches/gamestates2/data/gui/scripts/InGameMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/InfoPopup.lua (modified) * code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MainMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MenuSheet.lua (added) * code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/PickupInventory.lua (modified) * code/branches/gamestates2/data/gui/scripts/QuestGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/gamestates2/data/lua/Tools.lua (modified) Moved BasicGUI.lua to GUISheet.lua and derived MenuSheet.lua as well ... Tue, 13 Apr 2010 12:35:16 GMT scheusso [6717] * code/branches/hudelements/src/orxonox/interfaces/RadarViewable.cc (modified) * code/branches/hudelements/src/orxonox/interfaces/RadarViewable.h (modified) removing some includes Tue, 13 Apr 2010 12:31:14 GMT scheusso [6716] * code/branches/hudelements/src/orxonox/controllers/HumanController.cc (modified) * code/branches/hudelements/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/hudelements/src/orxonox/interfaces/RadarViewable.cc (modified) * code/branches/hudelements/src/orxonox/interfaces/RadarViewable.h (modified) removed some bindings to map Tue, 13 Apr 2010 12:14:27 GMT scheusso [6715] * code/branches/hudelements/src/orxonox/overlays/CMakeLists.txt (modified) * code/branches/hudelements/src/orxonox/overlays/Map.cc (deleted) * code/branches/hudelements/src/orxonox/overlays/Map.h (deleted) removing map files Tue, 13 Apr 2010 12:10:30 GMT scheusso [6714] * code/tags/map (copied) creating map tag in order to ditch it Tue, 13 Apr 2010 08:49:13 GMT dafrick [6713] * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) Adjusted SpeedPickup such that the Engine is the actual PickupCarrier ... Tue, 13 Apr 2010 08:46:39 GMT dafrick [6712] * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/data/levels/includes/pickups_invisible.oxi (deleted) * code/trunk/data/levels/includes/pickups_speed.oxi (deleted) * code/trunk/data/levels/pickup.oxw (modified) * code/trunk/data/levels/pickup_pps_invi.oxw (modified) * code/trunk/data/levels/pickup_ppstest1.oxw (modified) * code/trunk/data/levels/templates/pickup_representation_templates.oxt (modified) * code/trunk/data/levels/templates/pickup_representation_templates_invisible.oxt (deleted) * code/trunk/data/levels/templates/pickup_representation_templates_speed.oxt (deleted) Merged pickup_representation_templates into one. Merged pickups.oxi ... Tue, 13 Apr 2010 08:16:10 GMT dafrick [6711] * code/trunk (modified) * code/trunk/data/gui/layouts/PickupInventory.layout (modified) * code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/trunk/data/gui/scripts/InitialiseGUI.lua (modified) * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/data/levels/pickup.oxw (modified) * code/trunk/data/levels/templates/pickup_representation_templates.oxt (modified) * code/trunk/data/overlays/hudtemplates3.oxo (modified) * code/trunk/src/modules/pickup/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/PickupRepresentation.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merged pickup4 branch back to trunk. Tue, 13 Apr 2010 07:50:11 GMT dafrick [6710] * code/trunk (modified) * code/trunk/data/levels/includes/pickups_invisible.oxi (copied) * code/trunk/data/levels/pickup_pps_invi.oxw (copied) * code/trunk/data/levels/templates/pickup_representation_templates_invisible.oxt (copied) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/items/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (copied) * code/trunk/src/modules/pickup/items/InvisiblePickup.h (copied) * code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified) Merged ppspickups2 branch into trunk. Tue, 13 Apr 2010 07:32:08 GMT dafrick [6709] * code/trunk (modified) * code/trunk/data/levels/includes/pickups_speed.oxi (copied) * code/trunk/data/levels/pickup_ppstest1.oxw (copied) * code/trunk/data/levels/templates/pickup_representation_templates_speed.oxt (copied) * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/Pickup.h (modified) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/items/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/items/HealthPickup.cc (modified) * code/trunk/src/modules/pickup/items/HealthPickup.h (modified) * code/trunk/src/modules/pickup/items/MetaPickup.cc (modified) * code/trunk/src/modules/pickup/items/MetaPickup.h (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (copied) * code/trunk/src/modules/pickup/items/SpeedPickup.h (copied) * code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/items/MultiStateEngine.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merged ppspickups1 into trunk. Tue, 13 Apr 2010 07:07:08 GMT dafrick [6708] * code/branches/ppspickups2/src/modules/pickup/Pickup.cc (modified) * code/branches/ppspickups2/src/modules/pickup/Pickup.h (modified) * code/branches/ppspickups2/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/ppspickups2/src/modules/pickup/PickupSpawner.cc (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) Some cleanup. Tue, 13 Apr 2010 06:46:20 GMT dafrick [6707] * code/branches/pickup4/src/modules/pickup/PickupSpawner.cc (modified) Found bug in PickupSpawner. Mon, 12 Apr 2010 22:41:52 GMT dafrick [6706] * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (modified) Small adaptations in SpeedPickup. Mon, 12 Apr 2010 22:09:10 GMT dafrick [6705] * code/branches/ppspickups1/src/modules/pickup/Pickup.cc (modified) * code/branches/ppspickups1/src/modules/pickup/Pickup.h (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (modified) * code/branches/ppspickups1/src/orxonox/items/Engine.h (modified) * code/branches/ppspickups1/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Minor cleanup. Mon, 12 Apr 2010 21:23:45 GMT rgrieder [6704] * code/branches/gamestates2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/BasicGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/InfoPopup.lua (modified) * code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/QuestGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua (modified) "filename" --> "name" table entry for GUI sheets. Mon, 12 Apr 2010 21:01:35 GMT dafrick [6703] * code/branches/ppspickups1/src/orxonox/items/MultiStateEngine.cc (modified) Removed warning (and possible error, I'm not sure) in MultiStateEngine. Mon, 12 Apr 2010 20:26:33 GMT dafrick [6702] * data/trunk/gui/imagesets/PickupInventory.imageset (added) * data/trunk/gui/imagesets/pickup.tga (added) * data/trunk/materials/scripts/Arrow.material (added) * data/trunk/materials/textures/arrow.tga (added) Added arrow texture and material. Created some images for the ... Mon, 12 Apr 2010 20:24:30 GMT dafrick [6701] * code/branches/pickup4/data/levels/includes/pickups.oxi (modified) * code/branches/pickup4/data/levels/pickup.oxw (modified) * code/branches/pickup4/data/levels/templates/pickup_representation_templates.oxt (modified) Added a new health pickup. Mon, 12 Apr 2010 19:10:16 GMT dafrick [6700] * code/branches/pickup4/data/gui/scripts/PickupInventory.lua (modified) * code/branches/pickup4/src/modules/pickup/PickupManager.cc (modified) Rudimentary version of PickupInventory appears to be working now, ... Mon, 12 Apr 2010 15:32:12 GMT smerkli [6699] * code/branches/chat/src/libraries/network/ChatListener.cc (modified) * code/branches/chat/src/orxonox/ChatHistory.cc (modified) * code/branches/chat/src/orxonox/ChatHistory.h (modified) shit works xD Mon, 12 Apr 2010 15:08:27 GMT smerkli [6698] * code/branches/chat/src/orxonox/CMakeLists.txt (modified) * code/branches/chat/src/orxonox/ChatHistory.cc (modified) * code/branches/chat/src/orxonox/ChatHistory.h (modified) * code/branches/chat/src/orxonox/graphics/CMakeLists.txt (modified) ChatHistory is not being constructed, no idea why. Mon, 12 Apr 2010 15:04:07 GMT jo [6697] * code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.h (modified) boost feature added Mon, 12 Apr 2010 14:52:01 GMT solex [6696] * 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 now limiting its formation size and revokes it with a ... Mon, 12 Apr 2010 14:18:12 GMT solex [6695] * 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 now lists slaves Mon, 12 Apr 2010 14:08:15 GMT ebeier [6694] * 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) * code/branches/ppspickups1/svntest.txt (deleted) added some speedpickup templates Mon, 12 Apr 2010 14:06:46 GMT smerkli [6693] * code/branches/chat/src/orxonox/ChatHistory.cc (modified) * code/branches/chat/src/orxonox/ChatHistory.h (modified) questions resolved, ready for in-game testing. Mon, 12 Apr 2010 14:00:30 GMT jo [6692] * code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc (modified) some bugs removed, with friendlyfire option Mon, 12 Apr 2010 13:48:24 GMT kolibri7 [6691] * code/branches/lod/data/levels/presentationLOD.oxw (added) * code/branches/lod/data/levels/presentationLODdif.oxw (added) * code/branches/lod/src/orxonox/Level.cc (modified) * code/branches/lod/src/orxonox/Level.h (modified) * code/branches/lod/src/orxonox/graphics/CMakeLists.txt (modified) * code/branches/lod/src/orxonox/graphics/MeshLodInformation.cc (added) * code/branches/lod/src/orxonox/graphics/MeshLodInformation.h (added) * code/branches/lod/src/orxonox/graphics/Model.cc (modified) * code/branches/lod/src/orxonox/graphics/Model.h (modified) implementing the XMLPort function for LoD; getting some erreors from ... Mon, 12 Apr 2010 13:30:51 GMT smerkli [6690] * code/branches/chat/src/orxonox/ChatHistory.cc (modified) * code/branches/chat/src/orxonox/ChatHistory.h (modified) Few changes before the questions, completing doxy stuff. Mon, 12 Apr 2010 13:17:17 GMT benedict [6689] * code/branches/ppspickups2/data/levels/includes/pickups_invisible.oxi (modified) * code/branches/ppspickups2/data/levels/pickup_pps_invi.oxw (modified) * code/branches/ppspickups2/data/levels/templates/pickup_representation_templates_invisible.oxt (modified) fixed some issues with the templates Mon, 12 Apr 2010 13:15:44 GMT smerkli [6688] * code/branches/chat/src/orxonox/ChatHistory.cc (modified) * code/branches/chat/src/orxonox/ChatHistory.h (modified) Completed and tested the code as far as I could, now preparing questions. Mon, 12 Apr 2010 12:57:28 GMT ebeier [6687] * data/trunk/materials/textures/eye.tga (modified) * data/trunk/materials/textures/shield.tga (modified) inverted pickup images Mon, 12 Apr 2010 12:52:45 GMT jo [6686] * code/branches/dynamicmatch/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/dynamicmatch/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.h (modified) first version- not playable yet 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.