# # ChangeLog for code/trunk/src/libraries # # Generated by Trac 1.0.9 # Nov 9, 2024, 7:14:21 AM Sun, 10 Nov 2013 17:30:41 GMT landauf [9759] * code/trunk/src/libraries/core/GUIManager.cc (modified) fixed warning (msvc) Tue, 15 Oct 2013 20:50:05 GMT landauf [9703] * code/trunk/src/libraries/core/CorePrereqs.h (modified) fixed build with boost 1.48 and 1.49 Thu, 03 Oct 2013 20:29:44 GMT landauf [9684] * code/trunk/src/libraries/core/config/ConfigFileEntryValue.h (modified) * code/trunk/src/libraries/core/config/ConfigFileSection.h (modified) * code/trunk/src/libraries/core/config/SettingsConfigFile.h (modified) added missing includes Wed, 02 Oct 2013 21:31:02 GMT landauf [9682] * code/trunk/src/libraries/util/SignalHandler.cc (modified) fixed build on MSVC: unistd.h is not part of windows Sun, 29 Sep 2013 14:27:05 GMT landauf [9676] * code/trunk/src/libraries/core/command/IOConsoleWindows.cc (modified) * code/trunk/src/libraries/core/command/IOConsoleWindows.h (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) fixed warnings with gcc 4.7 Thu, 26 Sep 2013 21:03:33 GMT landauf [9675] * code/trunk (modified) * code/trunk/cmake/tools/FindCEGUI.cmake (modified) * code/trunk/src/OrxonoxConfig.h.in (modified) * code/trunk/src/libraries/core/CorePrereqs.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/Resource.cc (modified) * code/trunk/src/libraries/util/Exception.cc (modified) * code/trunk/src/modules/objects/Planet.cc (modified) * code/trunk/src/orxonox/chat/ChatInputHandler.cc (modified) * code/trunk/src/orxonox/chat/ChatInputHandler.h (modified) * code/trunk/src/orxonox/graphics/Model.cc (modified) merged branch 'libs' back to trunk. orxonox now compiles and runs ... Tue, 17 Sep 2013 11:40:31 GMT smerkli [9672] * code/trunk/cmake/CompilerConfigGCC.cmake (modified) * code/trunk/src/external/ois/linux/LinuxForceFeedback.cpp (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/orxonox/chat/ChatInputHandler.cc (modified) Added a few includes that were necessary with the switch to GCC > 4.7 ... Sun, 25 Aug 2013 19:08:42 GMT landauf [9667] * code/trunk (modified) * code/trunk/src/SourceConfig.cmake (modified) * code/trunk/src/libraries/core/BaseObject.cc (modified) * code/trunk/src/libraries/core/BaseObject.h (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/ClassFactory.h (deleted) * code/trunk/src/libraries/core/ClassTreeMask.cc (modified) * code/trunk/src/libraries/core/ClassTreeMask.h (modified) * code/trunk/src/libraries/core/CommandLineParser.cc (deleted) * code/trunk/src/libraries/core/CommandLineParser.h (deleted) * code/trunk/src/libraries/core/ConfigFileManager.cc (deleted) * code/trunk/src/libraries/core/ConfigFileManager.h (deleted) * code/trunk/src/libraries/core/ConfigValueContainer.cc (deleted) * code/trunk/src/libraries/core/ConfigValueContainer.h (deleted) * code/trunk/src/libraries/core/ConfigValueIncludes.h (deleted) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/libraries/core/CorePrereqs.h (modified) * code/trunk/src/libraries/core/Event.cc (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/Game.h (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/Identifier.cc (deleted) * code/trunk/src/libraries/core/Identifier.h (deleted) * code/trunk/src/libraries/core/Iterator.h (deleted) * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/core/MetaObjectList.cc (deleted) * code/trunk/src/libraries/core/MetaObjectList.h (deleted) * code/trunk/src/libraries/core/Namespace.cc (modified) * code/trunk/src/libraries/core/Namespace.h (modified) * code/trunk/src/libraries/core/ObjectList.h (deleted) * code/trunk/src/libraries/core/ObjectListBase.cc (deleted) * code/trunk/src/libraries/core/ObjectListBase.h (deleted) * code/trunk/src/libraries/core/ObjectListIterator.h (deleted) * code/trunk/src/libraries/core/OrxonoxClass.cc (deleted) * code/trunk/src/libraries/core/OrxonoxClass.h (deleted) * code/trunk/src/libraries/core/PathConfig.cc (modified) * code/trunk/src/libraries/core/SmartPtr.h (deleted) * code/trunk/src/libraries/core/SubclassIdentifier.h (deleted) * code/trunk/src/libraries/core/Super.h (deleted) * code/trunk/src/libraries/core/Template.cc (modified) * code/trunk/src/libraries/core/Template.h (modified) * code/trunk/src/libraries/core/ViewportEventListener.cc (modified) * code/trunk/src/libraries/core/ViewportEventListener.h (modified) * code/trunk/src/libraries/core/WeakPtr.h (deleted) * code/trunk/src/libraries/core/WindowEventListener.cc (modified) * code/trunk/src/libraries/core/WindowEventListener.h (modified) * code/trunk/src/libraries/core/XMLNameListener.cc (modified) * code/trunk/src/libraries/core/XMLNameListener.h (modified) * code/trunk/src/libraries/core/XMLPort.cc (modified) * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/core/class (copied) * code/trunk/src/libraries/core/class/CMakeLists.txt (modified) * code/trunk/src/libraries/core/class/Identifiable.cc (modified) * code/trunk/src/libraries/core/class/Identifiable.h (modified) * code/trunk/src/libraries/core/class/Identifier.cc (modified) * code/trunk/src/libraries/core/class/Identifier.h (modified) * code/trunk/src/libraries/core/class/IdentifierManager.cc (modified) * code/trunk/src/libraries/core/class/IdentifierManager.h (modified) * code/trunk/src/libraries/core/class/OrxonoxClass.cc (copied) * code/trunk/src/libraries/core/class/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/class/OrxonoxInterface.cc (copied) * code/trunk/src/libraries/core/class/OrxonoxInterface.h (modified) * code/trunk/src/libraries/core/class/SubclassIdentifier.h (modified) * code/trunk/src/libraries/core/class/Super.h (modified) * code/trunk/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) * code/trunk/src/libraries/core/command/Functor.h (modified) * code/trunk/src/libraries/core/command/IOConsolePOSIX.cc (modified) * code/trunk/src/libraries/core/command/IOConsoleWindows.cc (modified) * code/trunk/src/libraries/core/command/Shell.cc (modified) * code/trunk/src/libraries/core/command/Shell.h (modified) * code/trunk/src/libraries/core/config (copied) * code/trunk/src/libraries/core/config/CMakeLists.txt (modified) * code/trunk/src/libraries/core/config/ConfigValueContainer.h (modified) * code/trunk/src/libraries/core/config/Configurable.cc (copied) * code/trunk/src/libraries/core/config/Configurable.h (modified) * code/trunk/src/libraries/core/input/Button.cc (modified) * code/trunk/src/libraries/core/input/InputBuffer.cc (modified) * code/trunk/src/libraries/core/input/InputBuffer.h (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/core/input/JoyStick.cc (modified) * code/trunk/src/libraries/core/input/JoyStick.h (modified) * code/trunk/src/libraries/core/input/JoyStickQuantityListener.cc (modified) * code/trunk/src/libraries/core/input/JoyStickQuantityListener.h (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/core/input/KeyBinderManager.cc (modified) * code/trunk/src/libraries/core/input/KeyBinderManager.h (modified) * code/trunk/src/libraries/core/input/Mouse.cc (modified) * code/trunk/src/libraries/core/object (copied) * code/trunk/src/libraries/core/object/CMakeLists.txt (modified) * code/trunk/src/libraries/core/object/ClassFactory.h (modified) * code/trunk/src/libraries/core/object/Context.cc (modified) * code/trunk/src/libraries/core/object/Context.h (modified) * code/trunk/src/libraries/core/object/Iterator.h (modified) * code/trunk/src/libraries/core/object/IteratorBase.h (copied) * code/trunk/src/libraries/core/object/Listable.cc (modified) * code/trunk/src/libraries/core/object/Listable.h (modified) * code/branches/core6/src/libraries/core/object/MetaObjectList.cc (deleted) * code/branches/core6/src/libraries/core/object/MetaObjectList.h (deleted) * code/trunk/src/libraries/core/object/ObjectList.h (modified) * code/trunk/src/libraries/core/object/ObjectListBase.cc (modified) * code/trunk/src/libraries/core/object/ObjectListBase.h (modified) * code/trunk/src/libraries/core/object/ObjectListIterator.h (modified) * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/ClientConnectionListener.cc (modified) * code/trunk/src/libraries/network/ClientConnectionListener.h (modified) * code/trunk/src/libraries/network/Host.cc (modified) * code/trunk/src/libraries/network/NetworkChatListener.h (modified) * code/trunk/src/libraries/network/NetworkFunction.cc (modified) * code/trunk/src/libraries/network/NetworkFunction.h (modified) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/TrafficControl.cc (modified) * code/trunk/src/libraries/network/WANDiscoverable.cc (modified) * code/trunk/src/libraries/network/WANDiscoverable.h (modified) * code/trunk/src/libraries/network/WANDiscovery.h (modified) * code/trunk/src/libraries/network/packet/ClassID.cc (modified) * code/trunk/src/libraries/network/packet/FunctionIDs.cc (modified) * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) * code/trunk/src/libraries/network/synchronisable/Serialise.h (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/libraries/tools/ParticleInterface.cc (modified) * code/trunk/src/libraries/tools/ResourceCollection.cc (modified) * code/trunk/src/libraries/tools/ResourceCollection.h (modified) * code/trunk/src/libraries/tools/ResourceLocation.cc (modified) * code/trunk/src/libraries/tools/ResourceLocation.h (modified) * code/trunk/src/libraries/tools/Shader.cc (modified) * code/trunk/src/libraries/tools/Timer.cc (modified) * code/trunk/src/libraries/tools/Timer.h (modified) * code/trunk/src/libraries/tools/interfaces/Tickable.h (modified) * code/trunk/src/libraries/tools/interfaces/TimeFactorListener.h (modified) * code/trunk/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified) * code/trunk/src/libraries/util/ScopedSingletonManager.h (modified) * code/trunk/src/modules/designtools/CreateStars.cc (modified) * code/trunk/src/modules/designtools/CreateStars.h (modified) * code/trunk/src/modules/designtools/ScreenshotManager.cc (modified) * code/trunk/src/modules/designtools/ScreenshotManager.h (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.cc (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.h (modified) * code/trunk/src/modules/docking/Dock.cc (modified) * code/trunk/src/modules/docking/Dock.h (modified) * code/trunk/src/modules/docking/DockToShip.cc (modified) * code/trunk/src/modules/docking/DockToShip.h (modified) * code/trunk/src/modules/docking/DockingAnimation.cc (modified) * code/trunk/src/modules/docking/DockingAnimation.h (modified) * code/trunk/src/modules/docking/DockingController.cc (modified) * code/trunk/src/modules/docking/DockingController.h (modified) * code/trunk/src/modules/docking/DockingEffect.cc (modified) * code/trunk/src/modules/docking/DockingEffect.h (modified) * code/trunk/src/modules/docking/DockingPrecompiledHeaders.h (modified) * code/trunk/src/modules/docking/DockingTarget.cc (modified) * code/trunk/src/modules/docking/DockingTarget.h (modified) * code/trunk/src/modules/docking/MoveToDockingTarget.cc (modified) * code/trunk/src/modules/docking/MoveToDockingTarget.h (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/OldSpaceRace.cc (modified) * code/trunk/src/modules/gametypes/OldSpaceRace.h (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.h (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.h (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.h (modified) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.h (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified) * code/trunk/src/modules/notifications/dispatchers/SimpleNotification.cc (modified) * code/trunk/src/modules/notifications/dispatchers/SimpleNotification.h (modified) * code/trunk/src/modules/objects/Attacher.cc (modified) * code/trunk/src/modules/objects/Attacher.h (modified) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) * code/trunk/src/modules/objects/Planet.cc (modified) * code/trunk/src/modules/objects/Planet.h (modified) * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/Script.h (modified) * code/trunk/src/modules/objects/SpaceBoundaries.cc (modified) * code/trunk/src/modules/objects/SpaceBoundaries.h (modified) * code/trunk/src/modules/objects/Turret.cc (modified) * code/trunk/src/modules/objects/Turret.h (modified) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified) * code/trunk/src/modules/objects/eventsystem/EventDispatcher.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventDispatcher.h (modified) * code/trunk/src/modules/objects/eventsystem/EventFilter.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventFilter.h (modified) * code/trunk/src/modules/objects/eventsystem/EventListener.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventListener.h (modified) * code/trunk/src/modules/objects/eventsystem/EventName.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventName.h (modified) * code/trunk/src/modules/objects/eventsystem/EventTarget.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventTarget.h (modified) * code/trunk/src/modules/objects/triggers/CheckPoint.cc (modified) * code/trunk/src/modules/objects/triggers/CheckPoint.h (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.h (modified) * code/trunk/src/modules/objects/triggers/EventMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/EventMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.h (modified) * code/trunk/src/modules/objects/triggers/Trigger.cc (modified) * code/trunk/src/modules/objects/triggers/Trigger.h (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.cc (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.h (modified) * code/trunk/src/modules/overlays/FadeoutText.cc (modified) * code/trunk/src/modules/overlays/FadeoutText.h (modified) * code/trunk/src/modules/overlays/GUIOverlay.cc (modified) * code/trunk/src/modules/overlays/GUIOverlay.h (modified) * code/trunk/src/modules/overlays/OverlayText.cc (modified) * code/trunk/src/modules/overlays/OverlayText.h (modified) * code/trunk/src/modules/overlays/debugging/DebugFPSText.cc (modified) * code/trunk/src/modules/overlays/debugging/DebugFPSText.h (modified) * code/trunk/src/modules/overlays/debugging/DebugRTRText.cc (modified) * code/trunk/src/modules/overlays/debugging/DebugRTRText.h (modified) * code/trunk/src/modules/overlays/hud/AnnounceMessage.cc (modified) * code/trunk/src/modules/overlays/hud/AnnounceMessage.h (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.h (modified) * code/trunk/src/modules/overlays/hud/DeathMessage.cc (modified) * code/trunk/src/modules/overlays/hud/DeathMessage.h (modified) * code/trunk/src/modules/overlays/hud/GametypeFadingMessage.cc (modified) * code/trunk/src/modules/overlays/hud/GametypeFadingMessage.h (modified) * code/trunk/src/modules/overlays/hud/GametypeStaticMessage.cc (modified) * code/trunk/src/modules/overlays/hud/GametypeStaticMessage.h (modified) * code/trunk/src/modules/overlays/hud/HUDBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDHealthBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.h (modified) * code/trunk/src/modules/overlays/hud/HUDSpeedBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDSpeedBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDTimer.cc (modified) * code/trunk/src/modules/overlays/hud/HUDTimer.h (modified) * code/trunk/src/modules/overlays/hud/KillMessage.cc (modified) * code/trunk/src/modules/overlays/hud/KillMessage.h (modified) * code/trunk/src/modules/overlays/hud/LastManStandingInfos.cc (modified) * code/trunk/src/modules/overlays/hud/LastManStandingInfos.h (modified) * code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.cc (modified) * code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.h (modified) * code/trunk/src/modules/overlays/hud/PauseNotice.cc (modified) * code/trunk/src/modules/overlays/hud/PauseNotice.h (modified) * code/trunk/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified) * code/trunk/src/modules/overlays/hud/TeamBaseMatchScore.h (modified) * code/trunk/src/modules/overlays/stats/Scoreboard.cc (modified) * code/trunk/src/modules/overlays/stats/Scoreboard.h (modified) * code/trunk/src/modules/overlays/stats/Stats.cc (modified) * code/trunk/src/modules/overlays/stats/Stats.h (modified) * code/trunk/src/modules/pickup/CollectiblePickup.cc (modified) * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/Pickup.h (modified) * code/trunk/src/modules/pickup/PickupCollection.cc (modified) * code/trunk/src/modules/pickup/PickupCollection.h (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/modules/pickup/PickupRepresentation.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) * code/trunk/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/trunk/src/modules/pickup/items/DamageBoostPickup.h (modified) * code/trunk/src/modules/pickup/items/DronePickup.cc (modified) * code/trunk/src/modules/pickup/items/DronePickup.h (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/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.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/ShieldPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.h (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.h (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.h (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/pong/PongAI.cc (modified) * code/trunk/src/modules/pong/PongAI.h (modified) * code/trunk/src/modules/pong/PongBall.cc (modified) * code/trunk/src/modules/pong/PongBall.h (modified) * code/trunk/src/modules/pong/PongBat.cc (modified) * code/trunk/src/modules/pong/PongBat.h (modified) * code/trunk/src/modules/pong/PongBot.cc (modified) * code/trunk/src/modules/pong/PongBot.h (modified) * code/trunk/src/modules/pong/PongCenterpoint.cc (modified) * code/trunk/src/modules/pong/PongCenterpoint.h (modified) * code/trunk/src/modules/pong/PongScore.cc (modified) * code/trunk/src/modules/pong/PongScore.h (modified) * code/trunk/src/modules/portals/PortalEndPoint.cc (modified) * code/trunk/src/modules/portals/PortalEndPoint.h (modified) * code/trunk/src/modules/portals/PortalLink.cc (modified) * code/trunk/src/modules/portals/PortalLink.h (modified) * code/trunk/src/modules/questsystem/GlobalQuest.cc (modified) * code/trunk/src/modules/questsystem/GlobalQuest.h (modified) * code/trunk/src/modules/questsystem/LocalQuest.cc (modified) * code/trunk/src/modules/questsystem/LocalQuest.h (modified) * code/trunk/src/modules/questsystem/Quest.cc (modified) * code/trunk/src/modules/questsystem/Quest.h (modified) * code/trunk/src/modules/questsystem/QuestDescription.cc (modified) * code/trunk/src/modules/questsystem/QuestDescription.h (modified) * code/trunk/src/modules/questsystem/QuestEffect.cc (modified) * code/trunk/src/modules/questsystem/QuestEffect.h (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.h (modified) * code/trunk/src/modules/questsystem/QuestHint.cc (modified) * code/trunk/src/modules/questsystem/QuestHint.h (modified) * code/trunk/src/modules/questsystem/QuestItem.cc (modified) * code/trunk/src/modules/questsystem/QuestItem.h (modified) * code/trunk/src/modules/questsystem/QuestListener.cc (modified) * code/trunk/src/modules/questsystem/QuestListener.h (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.h (modified) * code/trunk/src/modules/questsystem/effects/AddQuest.cc (modified) * code/trunk/src/modules/questsystem/effects/AddQuest.h (modified) * code/trunk/src/modules/questsystem/effects/AddQuestHint.cc (modified) * code/trunk/src/modules/questsystem/effects/AddQuestHint.h (modified) * code/trunk/src/modules/questsystem/effects/AddReward.cc (modified) * code/trunk/src/modules/questsystem/effects/AddReward.h (modified) * code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.cc (modified) * code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.h (modified) * code/trunk/src/modules/questsystem/effects/CompleteQuest.cc (modified) * code/trunk/src/modules/questsystem/effects/CompleteQuest.h (modified) * code/trunk/src/modules/questsystem/effects/FailQuest.cc (modified) * code/trunk/src/modules/questsystem/effects/FailQuest.h (modified) * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/tetris/Tetris.h (modified) * code/trunk/src/modules/tetris/TetrisBrick.cc (modified) * code/trunk/src/modules/tetris/TetrisBrick.h (modified) * code/trunk/src/modules/tetris/TetrisCenterpoint.cc (modified) * code/trunk/src/modules/tetris/TetrisCenterpoint.h (modified) * code/trunk/src/modules/tetris/TetrisScore.cc (modified) * code/trunk/src/modules/tetris/TetrisScore.h (modified) * code/trunk/src/modules/tetris/TetrisStone.cc (modified) * code/trunk/src/modules/tetris/TetrisStone.h (modified) * code/trunk/src/modules/towerdefense/Tower.cc (modified) * code/trunk/src/modules/towerdefense/Tower.h (modified) * code/trunk/src/modules/towerdefense/TowerDefense.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseController.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseController.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.h (modified) * code/trunk/src/modules/weapons/MuzzleFlash.cc (modified) * code/trunk/src/modules/weapons/MuzzleFlash.h (modified) * code/trunk/src/modules/weapons/RocketController.cc (modified) * code/trunk/src/modules/weapons/RocketController.h (modified) * code/trunk/src/modules/weapons/munitions/FusionMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/FusionMunition.h (modified) * code/trunk/src/modules/weapons/munitions/LaserMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/LaserMunition.h (modified) * code/trunk/src/modules/weapons/munitions/ReplenishingMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/ReplenishingMunition.h (modified) * code/trunk/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/RocketMunition.h (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/BillboardProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/BillboardProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/ParticleProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/ParticleProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.h (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.h (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.h (modified) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.h (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.h (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.h (modified) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.h (modified) * code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.h (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/CameraManager.h (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/Level.h (modified) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/MoodManager.cc (modified) * code/trunk/src/orxonox/MoodManager.h (modified) * code/trunk/src/orxonox/PawnManager.cc (modified) * code/trunk/src/orxonox/PlayerManager.cc (modified) * code/trunk/src/orxonox/Radar.cc (modified) * code/trunk/src/orxonox/Radar.h (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/Scene.h (modified) * code/trunk/src/orxonox/Test.cc (modified) * code/trunk/src/orxonox/Test.h (modified) * code/trunk/src/orxonox/chat/ChatHistory.cc (modified) * code/trunk/src/orxonox/chat/ChatListener.h (modified) * code/trunk/src/orxonox/chat/ChatManager.cc (modified) * code/trunk/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/CollisionShape.h (modified) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified) * code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.h (modified) * code/trunk/src/orxonox/controllers/AIController.cc (modified) * code/trunk/src/orxonox/controllers/AIController.h (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.h (modified) * code/trunk/src/orxonox/controllers/Controller.cc (modified) * code/trunk/src/orxonox/controllers/Controller.h (modified) * code/trunk/src/orxonox/controllers/DroneController.cc (modified) * code/trunk/src/orxonox/controllers/DroneController.h (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (modified) * code/trunk/src/orxonox/controllers/FormationController.h (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.h (modified) * code/trunk/src/orxonox/controllers/ScriptController.cc (modified) * code/trunk/src/orxonox/controllers/ScriptController.h (modified) * code/trunk/src/orxonox/controllers/WaypointController.cc (modified) * code/trunk/src/orxonox/controllers/WaypointController.h (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.h (modified) * code/trunk/src/orxonox/gamestates/GSClient.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.h (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified) * code/trunk/src/orxonox/gamestates/GSServer.cc (modified) * code/trunk/src/orxonox/gametypes/Asteroids.cc (modified) * code/trunk/src/orxonox/gametypes/Asteroids.h (modified) * code/trunk/src/orxonox/gametypes/Deathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Deathmatch.h (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.h (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.h (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (modified) * code/trunk/src/orxonox/gametypes/Mission.h (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.cc (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.h (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.h (modified) * code/trunk/src/orxonox/graphics/AnimatedModel.cc (modified) * code/trunk/src/orxonox/graphics/AnimatedModel.h (modified) * code/trunk/src/orxonox/graphics/Backlight.cc (modified) * code/trunk/src/orxonox/graphics/Backlight.h (modified) * code/trunk/src/orxonox/graphics/Billboard.cc (modified) * code/trunk/src/orxonox/graphics/Billboard.h (modified) * code/trunk/src/orxonox/graphics/BlinkingBillboard.cc (modified) * code/trunk/src/orxonox/graphics/BlinkingBillboard.h (modified) * code/trunk/src/orxonox/graphics/Camera.cc (modified) * code/trunk/src/orxonox/graphics/Camera.h (modified) * code/trunk/src/orxonox/graphics/FadingBillboard.cc (modified) * code/trunk/src/orxonox/graphics/FadingBillboard.h (modified) * code/trunk/src/orxonox/graphics/GlobalShader.cc (modified) * code/trunk/src/orxonox/graphics/GlobalShader.h (modified) * code/trunk/src/orxonox/graphics/Light.cc (modified) * code/trunk/src/orxonox/graphics/Light.h (modified) * code/trunk/src/orxonox/graphics/MeshLodInformation.cc (modified) * code/trunk/src/orxonox/graphics/MeshLodInformation.h (modified) * code/trunk/src/orxonox/graphics/Model.cc (modified) * code/trunk/src/orxonox/graphics/Model.h (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.cc (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.h (modified) * code/trunk/src/orxonox/graphics/ParticleSpawner.cc (modified) * code/trunk/src/orxonox/graphics/ParticleSpawner.h (modified) * code/trunk/src/orxonox/infos/Bot.cc (modified) * code/trunk/src/orxonox/infos/Bot.h (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/infos/HumanPlayer.cc (modified) * code/trunk/src/orxonox/infos/HumanPlayer.h (modified) * code/trunk/src/orxonox/infos/Info.cc (modified) * code/trunk/src/orxonox/infos/Info.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.h (modified) * code/trunk/src/orxonox/interfaces/GametypeMessageListener.h (modified) * code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.cc (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.h (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.cc (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified) * code/trunk/src/orxonox/interfaces/PickupListener.cc (modified) * code/trunk/src/orxonox/interfaces/PickupListener.h (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) * code/trunk/src/orxonox/interfaces/PlayerTrigger.h (modified) * code/trunk/src/orxonox/interfaces/RadarListener.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/interfaces/Rewardable.h (modified) * code/trunk/src/orxonox/interfaces/TeamColourable.h (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/items/Item.cc (modified) * code/trunk/src/orxonox/items/Item.h (modified) * code/trunk/src/orxonox/items/MultiStateEngine.cc (modified) * code/trunk/src/orxonox/items/MultiStateEngine.h (modified) * code/trunk/src/orxonox/overlays/GUISheet.cc (modified) * code/trunk/src/orxonox/overlays/GUISheet.h (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.h (modified) * code/trunk/src/orxonox/sound/BaseSound.cc (modified) * code/trunk/src/orxonox/sound/BaseSound.h (modified) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.h (modified) * code/trunk/src/orxonox/sound/WorldAmbientSound.cc (modified) * code/trunk/src/orxonox/sound/WorldAmbientSound.h (modified) * code/trunk/src/orxonox/sound/WorldSound.cc (modified) * code/trunk/src/orxonox/sound/WorldSound.h (modified) * code/trunk/src/orxonox/weaponsystem/DefaultWeaponmodeLink.cc (modified) * code/trunk/src/orxonox/weaponsystem/DefaultWeaponmodeLink.h (modified) * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) * code/trunk/src/orxonox/weaponsystem/Munition.h (modified) * code/trunk/src/orxonox/weaponsystem/Weapon.cc (modified) * code/trunk/src/orxonox/weaponsystem/Weapon.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponPack.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSet.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSet.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSlot.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSlot.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.h (modified) * code/trunk/src/orxonox/worldentities/BigExplosion.cc (modified) * code/trunk/src/orxonox/worldentities/BigExplosion.h (modified) * code/trunk/src/orxonox/worldentities/CameraPosition.cc (modified) * code/trunk/src/orxonox/worldentities/CameraPosition.h (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/Drone.cc (modified) * code/trunk/src/orxonox/worldentities/Drone.h (modified) * code/trunk/src/orxonox/worldentities/EffectContainer.cc (modified) * code/trunk/src/orxonox/worldentities/EffectContainer.h (modified) * code/trunk/src/orxonox/worldentities/ExplosionChunk.cc (modified) * code/trunk/src/orxonox/worldentities/ExplosionChunk.h (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.h (modified) * code/trunk/src/orxonox/worldentities/MovableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MovableEntity.h (modified) * code/trunk/src/orxonox/worldentities/SpawnPoint.cc (modified) * code/trunk/src/orxonox/worldentities/SpawnPoint.h (modified) * code/trunk/src/orxonox/worldentities/StaticEntity.cc (modified) * code/trunk/src/orxonox/worldentities/StaticEntity.h (modified) * code/trunk/src/orxonox/worldentities/TeamSpawnPoint.cc (modified) * code/trunk/src/orxonox/worldentities/TeamSpawnPoint.h (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Destroyer.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Destroyer.h (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.h (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) * code/trunk/src/orxonox/worldentities/pawns/Spectator.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Spectator.h (modified) * code/trunk/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/TeamBaseMatchBase.h (modified) * code/trunk/test/CMakeLists.txt (modified) * code/trunk/test/core (copied) merged core6 back to trunk Mon, 25 Mar 2013 20:40:27 GMT landauf [9576] * code/trunk/src/libraries/core/GUIManager.cc (modified) fall back to default parser if CEGUI cannot load XercesParser Mon, 25 Mar 2013 12:18:15 GMT fmauro [9575] * code/trunk/src/libraries/core/GUIManager.cc (modified) Force CEGUI to use Xerces parser instead of TinyXML with versions ... Tue, 12 Mar 2013 22:13:03 GMT landauf [9550] * code/trunk (modified) * code/trunk/CMakeLists.txt (modified) * code/trunk/cmake/tools/TargetUtilities.cmake (modified) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/SourceConfig.cmake (copied) * code/trunk/src/external/CMakeLists.txt (modified) * code/trunk/src/external/gmock (copied) * code/trunk/src/external/gtest (copied) * code/trunk/src/libraries/core/CommandLineParser.cc (modified) * code/trunk/src/libraries/core/CommandLineParser.h (modified) * code/trunk/src/libraries/core/ConfigValueContainer.cc (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/PathConfig.cc (modified) * code/trunk/src/libraries/core/command/CommandEvaluation.cc (modified) * code/trunk/src/libraries/core/command/CommandExecutor.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.h (modified) * code/trunk/src/libraries/core/command/Executor.cc (modified) * code/trunk/src/libraries/core/command/Executor.h (modified) * code/trunk/src/libraries/core/command/Functor.h (modified) * code/trunk/src/libraries/core/command/IOConsolePOSIX.cc (modified) * code/trunk/src/libraries/core/command/IOConsoleWindows.cc (modified) * code/trunk/src/libraries/core/command/Shell.cc (modified) * code/trunk/src/libraries/core/command/TclBind.cc (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/tools/Shader.cc (modified) * code/trunk/src/libraries/tools/Shader.h (modified) * code/trunk/src/libraries/util/Math.h (modified) * code/trunk/src/libraries/util/MultiType.cc (modified) * code/trunk/src/libraries/util/MultiType.h (modified) * code/trunk/src/libraries/util/MultiTypeValue.h (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/libraries/util/SignalHandler.h (modified) * code/trunk/src/libraries/util/StringUtils.cc (modified) * code/trunk/src/libraries/util/StringUtils.h (modified) * code/trunk/src/libraries/util/SubString.cc (modified) * code/trunk/src/libraries/util/SubString.h (modified) * code/trunk/src/libraries/util/UtilPrereqs.h (modified) * code/trunk/src/libraries/util/VA_NARGS.h (modified) * code/trunk/src/libraries/util/output/AdditionalContextListener.h (copied) * code/trunk/src/libraries/util/output/ConsoleWriter.cc (modified) * code/trunk/src/libraries/util/output/ConsoleWriter.h (modified) * code/trunk/src/libraries/util/output/LogWriter.cc (modified) * code/trunk/src/libraries/util/output/LogWriter.h (modified) * code/trunk/src/libraries/util/output/MemoryWriter.cc (modified) * code/trunk/src/libraries/util/output/MemoryWriter.h (modified) * code/trunk/src/libraries/util/output/OutputDefinitions.h (modified) * code/trunk/src/libraries/util/output/OutputListener.cc (modified) * code/trunk/src/libraries/util/output/OutputListener.h (modified) * code/trunk/src/libraries/util/output/OutputManager.cc (modified) * code/trunk/src/libraries/util/output/OutputManager.h (modified) * code/trunk/src/libraries/util/output/OutputStream.h (modified) * code/trunk/src/libraries/util/output/SubcontextOutputListener.h (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified) * code/trunk/src/orxonox-main.vcproj.user.in (deleted) * code/trunk/src/orxonox-main.vcxproj.user.in (deleted) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.cc (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) * code/trunk/src/template.vcproj.user.in (copied) * code/trunk/src/template.vcxproj.user.in (copied) * code/trunk/test (copied) merged testing branch back to trunk. unbelievable it took me 13 ... Thu, 30 Aug 2012 21:08:17 GMT landauf [9348] * code/trunk (modified) * code/trunk/cmake/tools/BuildUnits.cmake (modified) * code/trunk/data/gui/layouts/GUILayout.xsd (modified) * code/trunk/data/gui/layouts/InGamePickupHUD.layout (modified) * code/trunk/data/gui/layouts/ShipSelectionMenu.layout (copied) * code/trunk/data/gui/layouts/SingleplayerConfigMenu.layout (modified) * code/trunk/data/gui/scripts/AudioMenu.lua (modified) * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/data/gui/scripts/ShipSelectionMenu.lua (copied) * code/trunk/data/gui/scripts/SingleplayerConfigMenu.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/Spacerace2.oxw (modified) * code/trunk/data/levels/SurfaceRacePresentation.oxw (copied) * code/trunk/data/levels/asteroidField.oxw (modified) * code/trunk/data/levels/asteroids.oxw (modified) * code/trunk/data/levels/docking.oxw (modified) * code/trunk/data/levels/dynamicMatch.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/includes/CuboidSpaceStation.lua (modified) * code/trunk/data/levels/includes/asteroidField.lua (modified) * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/data/levels/includes/towerWeaponSettings.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/lastTeamStanding.oxw (modified) * code/trunk/data/levels/lastTeamStandingII.oxw (modified) * code/trunk/data/levels/missionOne.oxw (modified) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/old/CuboidSpaceStation.oxw (modified) * code/trunk/data/levels/old/presentationPhysics.oxw (modified) * code/trunk/data/levels/old/princessAeryn.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (modified) * code/trunk/data/levels/planets.oxw (modified) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/portals.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationDM.oxw (modified) * code/trunk/data/levels/presentationFS10.oxw (modified) * code/trunk/data/levels/presentationFS102.oxw (modified) * code/trunk/data/levels/presentationFS10Ed.oxw (modified) * code/trunk/data/levels/presentationFS11.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS11.oxw (modified) * code/trunk/data/levels/princessAeryn.oxw (modified) * code/trunk/data/levels/screenshot.oxw (modified) * code/trunk/data/levels/surfaceRace.oxw (copied) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/teamDeathMatch.oxw (modified) * code/trunk/data/levels/templates/FPS.oxt (modified) * code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/trunk/data/levels/templates/spaceshipRace.oxt (copied) * code/trunk/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/trunk/data/levels/templates/tower.oxt (copied) * code/trunk/data/levels/testStars.oxw (modified) * code/trunk/data/levels/testSwallow.oxw (modified) * code/trunk/data/levels/tetris.oxw (modified) * code/trunk/data/levels/theTimeMachine.oxw (modified) * code/trunk/data/levels/towerDefense.oxw (copied) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/data/overlays/dynamicMatchHUD.oxo (modified) * code/trunk/data/overlays/lastManStandingHUD.oxo (modified) * code/trunk/data/overlays/lastTeamStandingHUD.oxo (modified) * code/trunk/data/overlays/tetrisHUD.oxo (copied) * code/trunk/data/overlays/towerdefenseHUD.oxo (copied) * code/trunk/data/overlays/underAttackHUD.oxo (deleted) * code/trunk/data/particle/smoke1.particle (deleted) * code/trunk/doc/api/groups/Portals.dox (modified) * code/trunk/doc/api/groups/Weapons.dox (modified) * code/trunk/src/BuildUnitsConfigGCC.cmake (modified) * code/trunk/src/BuildUnitsConfigMSVC.cmake (modified) * code/trunk/src/external/enet/VERSION (modified) * code/trunk/src/external/tolua/README_ORXONOX (modified) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/libraries/core/Template.cc (modified) * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.h (modified) * code/trunk/src/libraries/util/output/ConsoleWriter.cc (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/docking/DockingController.cc (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/OldSpaceRace.cc (modified) * code/trunk/src/modules/gametypes/OldSpaceRace.h (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.h (modified) * code/trunk/src/modules/objects/triggers/CheckPoint.cc (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.cc (deleted) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.h (deleted) * code/trunk/src/modules/pickup/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/CollectiblePickup.cc (modified) * code/trunk/src/modules/pickup/CollectiblePickup.h (modified) * code/trunk/src/modules/pickup/DroppedPickup.cc (deleted) * code/trunk/src/modules/pickup/DroppedPickup.h (deleted) * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/Pickup.h (modified) * code/trunk/src/modules/pickup/PickupCollection.cc (modified) * code/trunk/src/modules/pickup/PickupCollection.h (modified) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.cc (deleted) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.h (deleted) * 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/modules/pickup/PickupSpawner.h (modified) * code/trunk/src/modules/pickup/items/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/items/DamageBoostPickup.cc (copied) * code/trunk/src/modules/pickup/items/DamageBoostPickup.h (copied) * code/trunk/src/modules/pickup/items/DronePickup.cc (modified) * code/trunk/src/modules/pickup/items/DronePickup.h (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/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.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/ShieldPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.h (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.h (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.h (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/tetris/CMakeLists.txt (modified) * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/tetris/Tetris.h (modified) * code/trunk/src/modules/tetris/TetrisBrick.cc (copied) * code/trunk/src/modules/tetris/TetrisBrick.h (copied) * code/trunk/src/modules/tetris/TetrisCenterpoint.cc (modified) * code/trunk/src/modules/tetris/TetrisCenterpoint.h (modified) * code/trunk/src/modules/tetris/TetrisPrereqs.h (modified) * code/trunk/src/modules/tetris/TetrisScore.cc (copied) * code/trunk/src/modules/tetris/TetrisScore.h (copied) * code/trunk/src/modules/tetris/TetrisStone.cc (modified) * code/trunk/src/modules/tetris/TetrisStone.h (modified) * code/trunk/src/modules/towerdefense (copied) * code/trunk/src/modules/weapons/RocketController.cc (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (modified) * code/trunk/src/orxonox/controllers/FormationController.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gametypes/Deathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Deathmatch.h (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (modified) * code/trunk/src/orxonox/gametypes/Mission.h (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.cc (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.h (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/pickup (deleted) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (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) merged branch presentation2012merge back to trunk Wed, 21 Mar 2012 20:31:38 GMT dafrick [9050] * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) More elegant resolution of discrepancies between cegui 0.6 and 0.7. Wed, 15 Feb 2012 22:51:58 GMT jo [9016] * code/trunk (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/layouts/CreditsMenu.layout (modified) * code/trunk/data/gui/layouts/MiscConfigMenu.layout (modified) * code/trunk/data/gui/layouts/SingleplayerConfigMenu.layout (copied) * code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified) * code/trunk/data/gui/scripts/CreditsMenu.lua (modified) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified) * code/trunk/data/gui/scripts/SingleplayerConfigMenu.lua (copied) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/Spacerace2.oxw (copied) * code/trunk/data/levels/asteroidField.oxw (copied) * code/trunk/data/levels/asteroids.oxw (modified) * code/trunk/data/levels/docking.oxw (modified) * code/trunk/data/levels/dynamicMatch.oxw (modified) * code/trunk/data/levels/earth.oxw (modified) * code/trunk/data/levels/emptyLevel.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/includes/asteroidField.lua (copied) * code/trunk/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/lastTeamStanding.oxw (modified) * code/trunk/data/levels/lastTeamStandingII.oxw (modified) * code/trunk/data/levels/missionOne.oxw (modified) * code/trunk/data/levels/myTestLevel.oxw (modified) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (modified) * code/trunk/data/levels/planets.oxw (modified) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/portals.oxw (modified) * code/trunk/data/levels/presentation.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationDM.oxw (modified) * code/trunk/data/levels/presentationFS10.oxw (modified) * code/trunk/data/levels/presentationFS102.oxw (modified) * code/trunk/data/levels/presentationFS10Ed.oxw (modified) * code/trunk/data/levels/presentationFS11.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS09b.oxw (modified) * code/trunk/data/levels/presentationHS11.oxw (copied) * code/trunk/data/levels/princessAeryn.oxw (modified) * code/trunk/data/levels/quests.oxw (modified) * code/trunk/data/levels/screenshot.oxw (modified) * code/trunk/data/levels/shieldTest.oxw (modified) * code/trunk/data/levels/sound.oxw (modified) * code/trunk/data/levels/spaceRace.oxw (modified) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/teamDeathMatch.oxw (modified) * code/trunk/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/trunk/data/levels/testStars.oxw (modified) * code/trunk/data/levels/testSwallow.oxw (modified) * code/trunk/data/levels/tetris.oxw (modified) * code/trunk/data/levels/theTimeMachine.oxw (modified) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/underAttackHUD.oxo (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/modules/gametypes/CMakeLists.txt (modified) * code/trunk/src/modules/gametypes/GametypesPrereqs.h (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (copied) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.h (copied) * code/trunk/src/modules/gametypes/OldSpaceRace.cc (copied) * code/trunk/src/modules/gametypes/OldSpaceRace.h (copied) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.cc (copied) * code/trunk/src/modules/gametypes/SpaceRaceManager.h (copied) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.cc (copied) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.h (copied) * code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/pong/PongAI.h (modified) * code/trunk/src/modules/pong/PongScore.cc (modified) * code/trunk/src/modules/pong/PongScore.h (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.h (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/Level.h (modified) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/controllers/AIController.cc (modified) * code/trunk/src/orxonox/controllers/AIController.h (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.h (modified) * code/trunk/src/orxonox/controllers/CMakeLists.txt (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (copied) * code/trunk/src/orxonox/controllers/FormationController.h (copied) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.h (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.h (modified) * code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (copied) * code/trunk/src/orxonox/gametypes/Mission.h (copied) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.cc (copied) * code/trunk/src/orxonox/gametypes/TeamGametype.h (copied) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) Merging presentation2011 branch to trunk. Please check for possible bugs. Sat, 26 Nov 2011 17:22:13 GMT dafrick [8952] * code/trunk/src/libraries/network/MasterServer.cc (modified) * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) * code/trunk/src/modules/pong/PongAI.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc (modified) Removing some unused variables and taking care of some other warnings ... Wed, 16 Nov 2011 13:55:40 GMT smerkli [8937] * code/trunk (modified) * code/trunk/src/libraries/network/MasterServer.cc (modified) * code/trunk/src/libraries/network/MasterServer.h (modified) * code/trunk/src/libraries/network/ServerList.cc (modified) * code/trunk/src/libraries/network/ServerList.h (modified) merged masterserverfix corretly now. Sat, 08 Oct 2011 10:57:54 GMT baermatt [8879] * code/trunk/src/libraries/util/output/OutputDefinitions.h (modified) Added 'ull' to some OutputContextMasks, because of an error with LLVM ... Wed, 24 Aug 2011 13:28:55 GMT dafrick [8866] * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) Moved clone base method into Pickupable to avoid ambiguity. Wed, 24 Aug 2011 11:17:36 GMT landauf [8863] * code/trunk/src/libraries/core/Super.h (modified) added warning if a super-function has two possible parents. this ... Tue, 23 Aug 2011 13:05:58 GMT landauf [8862] * code/trunk/data/gui/scripts/GUISheet.lua (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) added config value to enable/disable preloading of menu sheets during ... Tue, 23 Aug 2011 12:30:23 GMT landauf [8861] * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) added some additional output for loading steps that might take some ... Mon, 22 Aug 2011 22:45:53 GMT landauf [8858] * code/trunk (modified) * code/trunk/CMakeLists.txt (modified) * code/trunk/data/gui/scripts/GameplayMenu.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/NotificationLayer.lua (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) * code/trunk/data/levels/presentationDM.oxw (modified) * code/trunk/data/levels/templates/FPS.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff2.oxt (modified) * code/trunk/data/levels/templates/spaceshipGhost.oxt (modified) * code/trunk/data/levels/templates/spaceshipH2.oxt (modified) * code/trunk/data/levels/templates/spaceshipHXY.oxt (modified) * code/trunk/data/levels/templates/spaceshipHXYSL.oxt (modified) * code/trunk/data/levels/templates/spaceshipPirate.oxt (modified) * code/trunk/data/levels/templates/spaceshipSwallow.oxt (modified) * code/trunk/data/levels/templates/spaceshipTransporter.oxt (modified) * code/trunk/data/levels/templates/spaceshipTransporterSL.oxt (modified) * code/trunk/data/lua/LuaStateInit.lua (modified) * code/trunk/data/overlays/OrxonoxLoading.overlay (deleted) * code/trunk/data/overlays/debug.oxo (modified) * code/trunk/data/tcl/init.tcl (modified) * code/trunk/src/Orxonox.cc (modified) * code/trunk/src/OrxonoxConfig.h.in (modified) * code/trunk/src/libraries/core/BaseObject.cc (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/ClassFactory.h (modified) * code/trunk/src/libraries/core/CommandLineParser.cc (modified) * code/trunk/src/libraries/core/CommandLineParser.h (modified) * code/trunk/src/libraries/core/ConfigFileManager.cc (modified) * code/trunk/src/libraries/core/ConfigValueContainer.cc (modified) * code/trunk/src/libraries/core/ConfigValueIncludes.h (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/libraries/core/CorePrecompiledHeaders.h (modified) * code/trunk/src/libraries/core/DynLib.cc (modified) * code/trunk/src/libraries/core/Event.cc (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/Game.h (modified) * code/trunk/src/libraries/core/GameState.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/Identifier.cc (modified) * code/trunk/src/libraries/core/Identifier.h (modified) * code/trunk/src/libraries/core/Language.cc (modified) * code/trunk/src/libraries/core/Language.h (modified) * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/core/Loader.h (modified) * code/trunk/src/libraries/core/LuaState.cc (modified) * code/trunk/src/libraries/core/LuaState.h (modified) * code/trunk/src/libraries/core/MetaObjectList.cc (modified) * code/trunk/src/libraries/core/NamespaceNode.cc (modified) * code/trunk/src/libraries/core/OrxonoxClass.cc (modified) * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/PathConfig.cc (modified) * code/trunk/src/libraries/core/SubclassIdentifier.h (modified) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/libraries/core/Template.cc (modified) * code/trunk/src/libraries/core/WeakPtr.h (modified) * code/trunk/src/libraries/core/XMLPort.cc (modified) * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) * code/trunk/src/libraries/core/command/CommandEvaluation.cc (modified) * code/trunk/src/libraries/core/command/CommandExecutor.cc (modified) * code/trunk/src/libraries/core/command/CommandExecutor.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommandCompilation.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommandCompilation.h (modified) * code/trunk/src/libraries/core/command/Executor.cc (modified) * code/trunk/src/libraries/core/command/Executor.h (modified) * code/trunk/src/libraries/core/command/Functor.h (modified) * code/trunk/src/libraries/core/command/IOConsolePOSIX.cc (modified) * code/trunk/src/libraries/core/command/IOConsolePOSIX.h (modified) * code/trunk/src/libraries/core/command/IOConsoleWindows.cc (modified) * code/trunk/src/libraries/core/command/IOConsoleWindows.h (modified) * code/trunk/src/libraries/core/command/IRC.cc (modified) * code/trunk/src/libraries/core/command/Shell.cc (modified) * code/trunk/src/libraries/core/command/Shell.h (modified) * code/trunk/src/libraries/core/command/TclBind.cc (modified) * code/trunk/src/libraries/core/command/TclThreadManager.cc (modified) * code/trunk/src/libraries/core/input/Button.cc (modified) * code/trunk/src/libraries/core/input/InputDevice.h (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/core/input/JoyStick.cc (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/core/input/KeyBinderManager.cc (modified) * code/trunk/src/libraries/network/CMakeLists.txt (modified) * code/trunk/src/libraries/network/ChatListener.cc (deleted) * code/trunk/src/libraries/network/ChatListener.h (deleted) * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/Client.h (modified) * code/trunk/src/libraries/network/ClientConnection.cc (modified) * code/trunk/src/libraries/network/Connection.cc (modified) * code/trunk/src/libraries/network/GamestateManager.cc (modified) * code/trunk/src/libraries/network/Host.cc (modified) * code/trunk/src/libraries/network/Host.h (modified) * code/trunk/src/libraries/network/LANDiscoverable.cc (modified) * code/trunk/src/libraries/network/LANDiscovery.cc (modified) * code/trunk/src/libraries/network/LANDiscovery.h (modified) * code/trunk/src/libraries/network/MasterServer.cc (modified) * code/trunk/src/libraries/network/MasterServerComm.cc (modified) * code/trunk/src/libraries/network/MasterServerComm.h (modified) * code/trunk/src/libraries/network/NetworkChatListener.h (copied) * code/trunk/src/libraries/network/NetworkPrecompiledHeaders.h (modified) * code/trunk/src/libraries/network/NetworkPrereqs.h (modified) * code/trunk/src/libraries/network/PeerList.cc (modified) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/Server.h (modified) * code/trunk/src/libraries/network/ServerConnection.cc (modified) * code/trunk/src/libraries/network/TrafficControl.cc (modified) * code/trunk/src/libraries/network/WANDiscoverable.cc (modified) * code/trunk/src/libraries/network/WANDiscoverable.h (modified) * code/trunk/src/libraries/network/WANDiscovery.cc (modified) * code/trunk/src/libraries/network/WANDiscovery.h (modified) * code/trunk/src/libraries/network/packet/Acknowledgement.cc (modified) * code/trunk/src/libraries/network/packet/Chat.cc (modified) * code/trunk/src/libraries/network/packet/Chat.h (modified) * code/trunk/src/libraries/network/packet/ClassID.cc (modified) * code/trunk/src/libraries/network/packet/DeleteObjects.cc (modified) * code/trunk/src/libraries/network/packet/FunctionIDs.cc (modified) * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) * code/trunk/src/libraries/network/packet/Packet.cc (modified) * code/trunk/src/libraries/network/packet/Welcome.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/libraries/network/synchronisable/SynchronisableVariable.h (modified) * code/trunk/src/libraries/tools/BillboardSet.cc (modified) * code/trunk/src/libraries/tools/Mesh.cc (modified) * code/trunk/src/libraries/tools/ParticleInterface.cc (modified) * code/trunk/src/libraries/tools/ResourceCollection.cc (modified) * code/trunk/src/libraries/tools/ResourceLocation.cc (modified) * code/trunk/src/libraries/tools/Shader.cc (modified) * code/trunk/src/libraries/tools/Timer.h (modified) * code/trunk/src/libraries/util/CMakeLists.txt (modified) * code/trunk/src/libraries/util/Clipboard.cc (modified) * code/trunk/src/libraries/util/Convert.h (modified) * code/trunk/src/libraries/util/Debug.h (deleted) * code/trunk/src/libraries/util/Exception.cc (modified) * code/trunk/src/libraries/util/Exception.h (modified) * code/trunk/src/libraries/util/ExprParser.h (modified) * code/trunk/src/libraries/util/MultiType.h (modified) * code/trunk/src/libraries/util/OrxAssert.h (modified) * code/trunk/src/libraries/util/Output.h (copied) * code/trunk/src/libraries/util/OutputHandler.cc (deleted) * code/trunk/src/libraries/util/OutputHandler.h (deleted) * code/trunk/src/libraries/util/Scope.h (modified) * code/trunk/src/libraries/util/ScopedSingletonManager.h (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/libraries/util/Singleton.h (modified) * code/trunk/src/libraries/util/Sleep.cc (modified) * code/trunk/src/libraries/util/StringUtils.cc (modified) * code/trunk/src/libraries/util/StringUtils.h (modified) * code/trunk/src/libraries/util/SubString.cc (modified) * code/trunk/src/libraries/util/SubString.h (modified) * code/trunk/src/libraries/util/UtilPrereqs.h (modified) * code/trunk/src/libraries/util/output (copied) * code/trunk/src/libraries/util/output/BaseWriter.cc (copied) * code/trunk/src/libraries/util/output/BaseWriter.h (copied) * code/trunk/src/libraries/util/output/CMakeLists.txt (copied) * code/trunk/src/libraries/util/output/ConsoleWriter.cc (copied) * code/trunk/src/libraries/util/output/ConsoleWriter.h (copied) * code/trunk/src/libraries/util/output/LogWriter.cc (copied) * code/trunk/src/libraries/util/output/LogWriter.h (copied) * code/trunk/src/libraries/util/output/MemoryWriter.cc (copied) * code/trunk/src/libraries/util/output/MemoryWriter.h (copied) * code/trunk/src/libraries/util/output/OutputDefinitions.h (copied) * code/trunk/src/libraries/util/output/OutputListener.cc (copied) * code/trunk/src/libraries/util/output/OutputListener.h (copied) * code/trunk/src/libraries/util/output/OutputManager.cc (copied) * code/trunk/src/libraries/util/output/OutputManager.h (copied) * code/trunk/src/libraries/util/output/OutputStream.cc (copied) * code/trunk/src/libraries/util/output/OutputStream.h (copied) * code/trunk/src/libraries/util/output/SubcontextOutputListener.cc (copied) * code/trunk/src/libraries/util/output/SubcontextOutputListener.h (copied) * code/trunk/src/modules/designtools/ScreenshotManager.cc (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.cc (modified) * code/trunk/src/modules/docking/Dock.cc (modified) * code/trunk/src/modules/docking/DockToShip.cc (modified) * code/trunk/src/modules/docking/DockingController.cc (modified) * code/trunk/src/modules/docking/DockingTarget.cc (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/Planet.cc (modified) * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/SpaceBoundaries.cc (modified) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventFilter.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventListener.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventTarget.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.cc (modified) * code/trunk/src/modules/overlays/GUIOverlay.cc (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/items/DronePickup.cc (modified) * code/trunk/src/modules/pickup/items/HealthPickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/MetaPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.h (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/questsystem/GlobalQuest.cc (modified) * code/trunk/src/modules/questsystem/LocalQuest.cc (modified) * code/trunk/src/modules/questsystem/Quest.cc (modified) * code/trunk/src/modules/questsystem/QuestDescription.cc (modified) * code/trunk/src/modules/questsystem/QuestEffect.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestHint.cc (modified) * code/trunk/src/modules/questsystem/QuestItem.cc (modified) * code/trunk/src/modules/questsystem/QuestListener.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/effects/AddQuest.cc (modified) * code/trunk/src/modules/questsystem/effects/AddQuestHint.cc (modified) * code/trunk/src/modules/questsystem/effects/AddReward.cc (modified) * code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.cc (modified) * code/trunk/src/modules/questsystem/effects/CompleteQuest.cc (modified) * code/trunk/src/modules/questsystem/effects/FailQuest.cc (modified) * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/weapons/RocketController.cc (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/ChatHistory.cc (deleted) * code/trunk/src/orxonox/ChatHistory.h (deleted) * code/trunk/src/orxonox/ChatInputHandler.cc (deleted) * code/trunk/src/orxonox/ChatInputHandler.h (deleted) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/MoodManager.cc (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/PlayerManager.cc (modified) * code/trunk/src/orxonox/Radar.cc (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/Test.cc (modified) * code/trunk/src/orxonox/Test.h (modified) * code/trunk/src/orxonox/chat (copied) * code/trunk/src/orxonox/chat/CMakeLists.txt (copied) * code/trunk/src/orxonox/chat/ChatHistory.cc (copied) * code/trunk/src/orxonox/chat/ChatHistory.h (copied) * code/trunk/src/orxonox/chat/ChatInputHandler.cc (copied) * code/trunk/src/orxonox/chat/ChatInputHandler.h (copied) * code/trunk/src/orxonox/chat/ChatListener.h (copied) * code/trunk/src/orxonox/chat/ChatManager.cc (copied) * code/trunk/src/orxonox/chat/ChatManager.h (copied) * code/trunk/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/gamestates/GSClient.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSMasterServer.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gamestates/GSServer.cc (modified) * code/trunk/src/orxonox/gametypes/Asteroids.cc (modified) * code/trunk/src/orxonox/gametypes/Deathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/graphics/AnimatedModel.cc (modified) * code/trunk/src/orxonox/graphics/AnimatedModel.h (modified) * code/trunk/src/orxonox/graphics/CEGuiSample.cc (deleted) * code/trunk/src/orxonox/graphics/CEGuiSample.h (deleted) * code/trunk/src/orxonox/graphics/Model.cc (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) * code/trunk/src/orxonox/overlays/InGameConsole.h (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/pickup/PickupIdentifier.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) * code/trunk/src/orxonox/sound/BaseSound.cc (modified) * code/trunk/src/orxonox/sound/SoundBuffer.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/SoundStreamer.cc (modified) * code/trunk/src/orxonox/sound/WorldSound.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/worldentities/BigExplosion.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ExplosionChunk.cc (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.cc (modified) * code/trunk/src/orxonox/worldentities/SpawnPoint.cc (modified) * code/trunk/src/orxonox/worldentities/StaticEntity.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) merged output branch back to trunk. Changes: - you have to ... Mon, 04 Jul 2011 00:47:44 GMT rgrieder [8729] * code/trunk (modified) * code/trunk/cmake/CompilerConfigGCC.cmake (modified) * code/trunk/cmake/CompilerConfigMSVC.cmake (modified) * code/trunk/cmake/tools/BuildUnits.cmake (copied) * code/trunk/cmake/tools/GenerateToluaBindings.cmake (modified) * code/trunk/cmake/tools/SourceFileUtilities.cmake (modified) * code/trunk/cmake/tools/TargetUtilities.cmake (modified) * code/trunk/data/gui/scripts/ChatBox-inputonly.lua (modified) * code/trunk/data/gui/scripts/ChatBox.lua (modified) * code/trunk/data/gui/scripts/MenuSheet.lua (modified) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified) * code/trunk/data/gui/scripts/NotificationLayer.lua (modified) * code/trunk/data/gui/scripts/SheetManager.lua (modified) * code/trunk/data/lua/Tools.lua (modified) * code/trunk/src/BuildUnitsConfigGCC.cmake (copied) * code/trunk/src/BuildUnitsConfigMSVC.cmake (copied) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/OrxonoxConfig.cmake (modified) * code/trunk/src/external/bullet/BulletCollision/CMakeLists.txt (modified) * code/trunk/src/external/bullet/BulletDynamics/CMakeLists.txt (modified) * code/trunk/src/external/bullet/CMakeLists.txt (modified) * code/trunk/src/external/bullet/LinearMath/CMakeLists.txt (modified) * code/trunk/src/external/enet/CMakeLists.txt (modified) * code/trunk/src/external/ogreceguirenderer/CMakeLists.txt (modified) * code/trunk/src/external/ois/CMakeLists.txt (modified) * code/trunk/src/external/ois/linux/CMakeLists.txt (modified) * code/trunk/src/external/ois/mac/CMakeLists.txt (modified) * code/trunk/src/external/ois/win32/CMakeLists.txt (modified) * code/trunk/src/external/tinyxml/CMakeLists.txt (modified) * code/trunk/src/external/tolua/lua/basic.lua (modified) * code/trunk/src/external/tolua/lua/package.lua (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/CommandLineParser.cc (modified) * code/trunk/src/libraries/core/CommandLineParser.h (modified) * code/trunk/src/libraries/core/ConfigValueIncludes.h (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/libraries/core/EventIncludes.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/LuaState.cc (modified) * code/trunk/src/libraries/core/LuaState.h (modified) * code/trunk/src/libraries/core/ObjectListBase.h (modified) * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/PathConfig.cc (modified) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/libraries/core/ToluaInterface.h (deleted) * code/trunk/src/libraries/core/ToluaInterfaceHook.lua (copied) * code/trunk/src/libraries/core/ViewportEventListener.h (modified) * code/trunk/src/libraries/core/command/Functor.h (modified) * code/trunk/src/libraries/core/command/IOConsolePOSIX.cc (modified) * code/trunk/src/libraries/core/command/IOConsoleWindows.cc (modified) * code/trunk/src/libraries/core/command/IOConsoleWindows.h (modified) * code/trunk/src/libraries/core/command/Shell.cc (modified) * code/trunk/src/libraries/core/command/Shell.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/core/input/JoyStick.h (modified) * code/trunk/src/libraries/core/input/JoyStickQuantityListener.h (modified) * code/trunk/src/libraries/core/input/KeyBinderManager.h (modified) * code/trunk/src/libraries/core/input/KeyDetector.h (modified) * code/trunk/src/libraries/core/input/Keyboard.h (modified) * code/trunk/src/libraries/core/input/Mouse.cc (modified) * code/trunk/src/libraries/network/WANDiscoverable.h (modified) * code/trunk/src/libraries/network/packet/CMakeLists.txt (modified) * code/trunk/src/libraries/tools/CMakeLists.txt (modified) * code/trunk/src/libraries/tools/Shader.h (modified) * code/trunk/src/libraries/tools/Timer.cc (modified) * code/trunk/src/libraries/tools/Timer.h (modified) * code/trunk/src/libraries/util/CMakeLists.txt (modified) * code/trunk/src/libraries/util/Convert.h (modified) * code/trunk/src/libraries/util/Debug.h (modified) * code/trunk/src/libraries/util/Math.h (modified) * code/trunk/src/libraries/util/OutputHandler.cc (modified) * code/trunk/src/libraries/util/OutputHandler.h (modified) * code/trunk/src/libraries/util/TriBool.h (deleted) * code/trunk/src/libraries/util/UtilPrereqs.h (modified) * code/trunk/src/libraries/util/tribool.h (copied) * code/trunk/src/modules/docking/Dock.cc (modified) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventFilter.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventListener.cc (modified) * code/trunk/src/modules/overlays/hud/GametypeFadingMessage.h (modified) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.h (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pong/CMakeLists.txt (modified) * code/trunk/src/modules/pong/PongAI.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/weapons/munitions/ReplenishingMunition.cc (modified) * code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/controllers/AIController.cc (modified) * code/trunk/src/orxonox/controllers/AIController.h (modified) * code/trunk/src/orxonox/controllers/DroneController.cc (modified) * code/trunk/src/orxonox/controllers/DroneController.h (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/graphics/CMakeLists.txt (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) * code/trunk/src/orxonox/sound/BaseSound.cc (modified) * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (modified) Merged unity_build branch back to trunk. Features: - Implemented ... Tue, 14 Jun 2011 18:53:28 GMT dafrick [8706] * code/trunk (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/layouts/DockingDialog.layout (copied) * code/trunk/data/gui/layouts/QuestGUI.layout (modified) * code/trunk/data/gui/scripts/DockingDialog.lua (copied) * code/trunk/data/gui/scripts/NotificationLayer.lua (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/asteroids.oxw (modified) * code/trunk/data/levels/docking.oxw (copied) * code/trunk/data/levels/dynamicMatch.oxw (modified) * code/trunk/data/levels/earth.oxw (modified) * code/trunk/data/levels/emptyLevel.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/includes/notifications.oxi (copied) * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsAssff2.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsImmTest.oxi (copied) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/lastTeamStanding.oxw (modified) * code/trunk/data/levels/lastTeamStandingII.oxw (modified) * code/trunk/data/levels/myTestLevel.oxw (modified) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (modified) * code/trunk/data/levels/planets.oxw (modified) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/portals.oxw (modified) * code/trunk/data/levels/presentation.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationDM.oxw (modified) * code/trunk/data/levels/presentationFS10.oxw (modified) * code/trunk/data/levels/presentationFS102.oxw (modified) * code/trunk/data/levels/presentationFS10Ed.oxw (modified) * code/trunk/data/levels/presentationFS11.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS09b.oxw (modified) * code/trunk/data/levels/princessAeryn.oxw (modified) * code/trunk/data/levels/quests.oxw (copied) * code/trunk/data/levels/screenshot.oxw (modified) * code/trunk/data/levels/shieldTest.oxw (copied) * code/trunk/data/levels/sound.oxw (modified) * code/trunk/data/levels/spaceRace.oxw (copied) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/teamDeathMatch.oxw (modified) * code/trunk/data/levels/templates/lodInformation.oxt (modified) * code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff2.oxt (copied) * code/trunk/data/levels/templates/spaceshipGhost.oxt (modified) * code/trunk/data/levels/templates/spaceshipH2.oxt (modified) * code/trunk/data/levels/templates/spaceshipHXY.oxt (modified) * code/trunk/data/levels/templates/spaceshipHXYSL.oxt (modified) * code/trunk/data/levels/templates/spaceshipImmTest.oxt (copied) * code/trunk/data/levels/templates/spaceshipPirate.oxt (modified) * code/trunk/data/levels/templates/spaceshipSwallow.oxt (modified) * code/trunk/data/levels/templates/spaceshipTransporter.oxt (modified) * code/trunk/data/levels/templates/spaceshipTransporterSL.oxt (modified) * code/trunk/data/levels/testStars.oxw (modified) * code/trunk/data/levels/testSwallow.oxw (modified) * code/trunk/data/levels/tetris.oxw (copied) * code/trunk/data/levels/theTimeMachine.oxw (modified) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/debug.oxo (modified) * code/trunk/data/particle/RingExp.particle (copied) * code/trunk/data/particle/RingExp2.particle (copied) * code/trunk/data/particle/RingExp3.particle (copied) * code/trunk/data/particle/Shield.particle (copied) * code/trunk/data/particle/weaponflare.particle (copied) * code/trunk/data/particle/weaponshoot.particle (copied) * code/trunk/doc/api/Groups.dox (modified) * code/trunk/doc/api/groups/Portals.dox (copied) * code/trunk/doc/api/groups/Triggers.dox (modified) * code/trunk/src/libraries/core/BaseObject.cc (modified) * code/trunk/src/libraries/core/ConfigValueContainer.h (modified) * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/Identifier.h (modified) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/libraries/core/ThreadWin.cc (modified) * code/trunk/src/libraries/core/command/Functor.h (modified) * code/trunk/src/libraries/core/command/Shell.cc (modified) * code/trunk/src/libraries/network/LANDiscovery.cc (modified) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/packet/Welcome.cc (modified) * code/trunk/src/libraries/network/packet/Welcome.h (modified) * code/trunk/src/libraries/network/synchronisable/Serialise.h (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/libraries/util/Convert.h (modified) * code/trunk/src/libraries/util/Exception.h (modified) * code/trunk/src/libraries/util/Math.h (modified) * code/trunk/src/libraries/util/MultiTypeValue.h (modified) * code/trunk/src/libraries/util/ScopedSingletonManager.h (modified) * code/trunk/src/libraries/util/Serialise.h (modified) * code/trunk/src/libraries/util/SubString.h (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/docking (copied) * code/trunk/src/modules/docking/CMakeLists.txt (copied) * code/trunk/src/modules/docking/Dock.cc (copied) * code/trunk/src/modules/docking/Dock.h (copied) * code/trunk/src/modules/docking/DockToShip.cc (copied) * code/trunk/src/modules/docking/DockToShip.h (copied) * code/trunk/src/modules/docking/DockingAnimation.cc (copied) * code/trunk/src/modules/docking/DockingAnimation.h (copied) * code/trunk/src/modules/docking/DockingController.cc (copied) * code/trunk/src/modules/docking/DockingController.h (copied) * code/trunk/src/modules/docking/DockingEffect.cc (copied) * code/trunk/src/modules/docking/DockingEffect.h (copied) * code/trunk/src/modules/docking/DockingPrecompiledHeaders.h (copied) * code/trunk/src/modules/docking/DockingPrereqs.h (copied) * code/trunk/src/modules/docking/DockingTarget.cc (copied) * code/trunk/src/modules/docking/DockingTarget.h (copied) * code/trunk/src/modules/docking/MoveToDockingTarget.cc (copied) * code/trunk/src/modules/docking/MoveToDockingTarget.h (copied) * code/trunk/src/modules/gametypes (copied) * code/trunk/src/modules/gametypes/CMakeLists.txt (copied) * code/trunk/src/modules/gametypes/GametypesPrecompiledHeaders.h (copied) * code/trunk/src/modules/gametypes/GametypesPrereqs.h (copied) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (copied) * code/trunk/src/modules/gametypes/RaceCheckPoint.h (copied) * code/trunk/src/modules/gametypes/SpaceRace.cc (copied) * code/trunk/src/modules/gametypes/SpaceRace.h (copied) * code/trunk/src/modules/notifications/CMakeLists.txt (modified) * code/trunk/src/modules/notifications/Notification.cc (deleted) * code/trunk/src/modules/notifications/Notification.h (deleted) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.h (modified) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc (copied) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.h (copied) * code/trunk/src/modules/notifications/dispatchers/SimpleNotification.cc (modified) * code/trunk/src/modules/objects/CMakeLists.txt (modified) * code/trunk/src/modules/objects/ObjectsPrereqs.h (modified) * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/SpaceBoundaries.cc (copied) * code/trunk/src/modules/objects/SpaceBoundaries.h (copied) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc (modified) * code/trunk/src/modules/objects/triggers/Trigger.cc (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.cc (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.h (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/GametypeStatus.cc (deleted) * code/trunk/src/modules/overlays/hud/GametypeStatus.h (deleted) * code/trunk/src/modules/overlays/hud/HUDBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.cc (copied) * code/trunk/src/modules/overlays/hud/HUDBoostBar.h (copied) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDSpeedBar.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/items/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.cc (copied) * code/trunk/src/modules/pickup/items/ShrinkPickup.h (copied) * code/trunk/src/modules/pong/PongBat.h (modified) * code/trunk/src/modules/portals/CMakeLists.txt (modified) * code/trunk/src/modules/portals/PortalEndPoint.cc (modified) * code/trunk/src/modules/portals/PortalEndPoint.h (modified) * code/trunk/src/modules/portals/PortalLink.cc (modified) * code/trunk/src/modules/portals/PortalLink.h (modified) * code/trunk/src/modules/portals/PortalsPrecompiledHeaders.h (modified) * code/trunk/src/modules/portals/PortalsPrereqs.h (modified) * code/trunk/src/modules/questsystem/QuestDescription.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.h (modified) * code/trunk/src/modules/tetris (copied) * code/trunk/src/modules/tetris/CMakeLists.txt (copied) * code/trunk/src/modules/tetris/Tetris.cc (copied) * code/trunk/src/modules/tetris/Tetris.h (copied) * code/trunk/src/modules/tetris/TetrisCenterpoint.cc (copied) * code/trunk/src/modules/tetris/TetrisCenterpoint.h (copied) * code/trunk/src/modules/tetris/TetrisPrereqs.h (copied) * code/trunk/src/modules/tetris/TetrisStone.cc (copied) * code/trunk/src/modules/tetris/TetrisStone.h (copied) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (copied) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (copied) * code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.h (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.h (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.h (modified) * 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) * code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/MoodManager.cc (modified) * code/trunk/src/orxonox/MoodManager.h (modified) * code/trunk/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/CollisionShape.h (modified) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified) * code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.h (modified) * code/trunk/src/orxonox/controllers/Controller.h (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.h (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/graphics/Billboard.cc (modified) * code/trunk/src/orxonox/graphics/Billboard.h (modified) * code/trunk/src/orxonox/graphics/Camera.cc (modified) * code/trunk/src/orxonox/graphics/Camera.h (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.h (modified) * code/trunk/src/orxonox/interfaces/CMakeLists.txt (modified) * code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.cc (copied) * code/trunk/src/orxonox/interfaces/NotificationListener.h (modified) * code/trunk/src/orxonox/interfaces/PlayerTrigger.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/overlays/OrxonoxOverlay.h (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSlot.cc (modified) * code/trunk/src/orxonox/worldentities/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/CameraPosition.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.h (modified) * code/trunk/src/orxonox/worldentities/SpaceBoundaries.cc (deleted) * code/trunk/src/orxonox/worldentities/SpaceBoundaries.h (deleted) * code/trunk/src/orxonox/worldentities/SpawnPoint.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.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) Merging presentation branch back into trunk. There are many new ... Sun, 22 May 2011 19:51:15 GMT landauf [8530] * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) added config value to define the scroll speed in CEGUI listboxes. ... Sun, 22 May 2011 08:15:22 GMT landauf [8527] * code/trunk/src/libraries/core/GUIManager.cc (modified) build fix for mingw, d_ostream.open() is not defined for wchar Thu, 19 May 2011 01:18:44 GMT rgrieder [8505] * code/trunk/src/libraries/core/Core.cc (modified) Do not limit the main thread to the first Core/CPU on Windows. It ... Thu, 12 May 2011 14:35:25 GMT rgrieder [8467] * code/trunk/src/libraries/core/GUIManager.cc (modified) Bugfix for log file paths containing non ASCII characters. Only ... Mon, 09 May 2011 16:44:05 GMT rgrieder [8439] * code/trunk/src/libraries/core/GUIManager.cc (modified) Fixed overlay drawing issue with CEGUI 0.7 (thx Crazy Eddie!). You ... Mon, 09 May 2011 03:06:49 GMT rgrieder [8423] * 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.cc (modified) * code/trunk/src/libraries/core/Game.h (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/util/DestructionHelper.h (added) Added and incorporated new class DestructionHelper: instead of doing ... Sun, 08 May 2011 17:19:32 GMT rgrieder [8419] * code/trunk/src/libraries/core/GUIManager.cc (modified) Fixed a bug. But that doesn't really change anything ;( CEGUI still ... Sun, 08 May 2011 16:53:39 GMT rgrieder [8418] * code/trunk/src/OrxonoxConfig.h.in (modified) * code/trunk/src/libraries/core/Game.h (modified) * code/trunk/src/libraries/core/ToluaInterface.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.h (modified) * code/trunk/src/libraries/network/NetworkFunction.h (modified) Added preprocessor macro __UNIQUE_NUMBER__ which will return a new ... Fri, 06 May 2011 02:40:30 GMT rgrieder [8411] * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) Properly initialise all members in CEGUI. Avoid segfaults when an ... Fri, 06 May 2011 02:39:20 GMT rgrieder [8410] * code/trunk/src/libraries/util/Exception.cc (modified) CEGUI seems to throw C strings. We need to catch them as well. Thu, 05 May 2011 21:16:33 GMT scheusso [8408] * code/trunk/src/libraries/network/Host.cc (modified) fix for inactive servers/clients Thu, 05 May 2011 21:14:59 GMT scheusso [8407] * code/trunk/src/libraries/network/GamestateManager.cc (modified) fixing a (quite huge) network memory leak Thu, 05 May 2011 14:02:40 GMT scheusso [8403] * code/trunk/src/libraries/network/FunctionCallManager.cc (modified) * code/trunk/src/libraries/network/Host.cc (modified) * code/trunk/src/libraries/network/Host.h (modified) fixing possible bug with packet ordering Thu, 05 May 2011 13:40:12 GMT scheusso [8402] * code/trunk/src/libraries/network/GamestateManager.h (modified) fix for Notification Script (bug is in network) Wed, 04 May 2011 02:49:20 GMT rgrieder [8400] * code/trunk/src/libraries/util/Math.cc (modified) * code/trunk/src/libraries/util/mbool.h (modified) Removed strange hack. Extensive tests while watching Top Gear have ... Wed, 04 May 2011 02:01:02 GMT rgrieder [8399] * code/trunk/src/libraries/core/Thread.cc (modified) Build fix (surfaces without compilations): ORXONOX_PLATFORM_WINDOWS ... Tue, 03 May 2011 07:19:52 GMT scheusso [8394] * code/trunk/src/libraries/core/ThreadPool.cc (modified) * code/trunk/src/libraries/network/GamestateManager.cc (modified) * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) -fixed a memory leak (thx reto) -some OrxVerify messages Mon, 02 May 2011 03:00:20 GMT rgrieder [8373] * code/trunk/src/libraries/core/ThreadPool.cc (modified) * code/trunk/src/libraries/network/GamestateManager.cc (modified) * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) Replaced code like bool b = someFunction(); assert(b); with ... Sun, 01 May 2011 19:02:38 GMT rgrieder [8372] * code/trunk/src/libraries/util/OrxAssert.h (modified) Improved output of OrxAssert (line number, function name and file) ... Sat, 30 Apr 2011 19:31:02 GMT rgrieder [8366] * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/PathConfig.cc (modified) * code/trunk/src/libraries/core/PathConfig.h (modified) * code/trunk/src/libraries/core/command/TclBind.cc (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/tools/ResourceLocation.cc (modified) Renamed PathConfig::isDevelopmentRun() to ... Thu, 28 Apr 2011 16:26:33 GMT scheusso [8358] * code/trunk/src/libraries/network/ServerConnection.cc (modified) don't ask ;) Thu, 28 Apr 2011 05:15:14 GMT rgrieder [8351] * code/trunk/CMakeLists.txt (modified) * code/trunk/INSTALL (modified) * code/trunk/bin/CMakeLists.txt (modified) * code/trunk/bin/client1.bat.in (modified) * code/trunk/bin/client2.bat.in (modified) * code/trunk/bin/dedicated.bat.in (modified) * code/trunk/bin/dedicatedClient.bat.in (modified) * code/trunk/bin/masterserver.bat.in (modified) * code/trunk/bin/masterserver.in (modified) * code/trunk/bin/run.bat.in (modified) * code/trunk/bin/server.bat.in (modified) * code/trunk/bin/standalone.bat.in (modified) * code/trunk/bin/vld.ini.in (modified) * code/trunk/cmake/BundleConfig.cmake (copied) * code/trunk/cmake/CompilerConfig.cmake (modified) * code/trunk/cmake/CompilerConfigGCC.cmake (modified) * code/trunk/cmake/CompilerConfigMSVC.cmake (modified) * code/trunk/cmake/InstallCheck.cmake (copied) * code/trunk/cmake/InstallConfig.cmake (modified) * code/trunk/cmake/LibraryConfig.cmake (modified) * code/trunk/cmake/LibraryConfigApple.cmake (deleted) * code/trunk/cmake/LibraryConfigTardis.cmake (modified) * code/trunk/cmake/PackageConfig.cmake (modified) * code/trunk/cmake/PackageConfigMSVC.cmake (modified) * code/trunk/cmake/PackageConfigMinGW.cmake (modified) * code/trunk/cmake/PackageConfigOSX.cmake (copied) * code/trunk/cmake/PrepareDevBundle.cmake (copied) * code/trunk/cmake/tools/CheckOGREPlugins.cmake (modified) * code/trunk/cmake/tools/CheckPackageVersion.cmake (copied) * code/trunk/cmake/tools/FindALUT.cmake (modified) * code/trunk/cmake/tools/FindCEGUI.cmake (modified) * code/trunk/cmake/tools/FindLua.cmake (deleted) * code/trunk/cmake/tools/FindLua5.1.cmake (copied) * code/trunk/cmake/tools/FindOGRE.cmake (modified) * code/trunk/cmake/tools/FindOgg.cmake (modified) * code/trunk/cmake/tools/FindPOCO.cmake (modified) * code/trunk/cmake/tools/FindVorbis.cmake (modified) * code/trunk/cmake/tools/GenerateToluaBindings.cmake (modified) * code/trunk/cmake/tools/TargetUtilities.cmake (modified) * code/trunk/contrib/CMakeLists.txt (copied) * code/trunk/contrib/orxonox.desktop (modified) * code/trunk/contrib/orxonox.manpage.xml (modified) * code/trunk/contrib/orxonox.png (copied) * code/trunk/contrib/orxonox_old.svg (copied) * code/trunk/data/CMakeLists.txt (modified) * code/trunk/data/DataInstallScript.cmake (deleted) * code/trunk/data/gui/scripts/AudioMenu.lua (modified) * code/trunk/data/gui/scripts/GUITools.lua (modified) * code/trunk/data/gui/scripts/InitialiseGUI.lua (modified) * code/trunk/data/gui/scripts/NotificationLayer.lua (modified) * code/trunk/data/gui/scripts/SettingsMenu.lua (modified) * code/trunk/data/levels/lastTeamStandingII.oxw (modified) * code/trunk/data/levels/planets.oxw (copied) * code/trunk/data/mac (copied) * code/trunk/data/mac/English.lproj (copied) * code/trunk/data/mac/English.lproj/InfoPlist.strings (copied) * code/trunk/data/mac/English.lproj/MainMenu.nib (copied) * code/trunk/data/mac/English.lproj/MainMenu.nib/designable.nib (copied) * code/trunk/data/mac/English.lproj/MainMenu.nib/keyedobjects.nib (copied) * code/trunk/data/mac/English.lproj/MainMenu.xib (copied) * code/trunk/data/mac/Icon.icns (copied) * code/trunk/data/mac/Orxonox-Info.plist (copied) * code/trunk/data/overlays/lastTeamStandingHUD.oxo (modified) * code/trunk/doc/api/doxy.config.in (modified) * code/trunk/doc/api/groups/Notifications.dox (modified) * code/trunk/doc/api/groups/Pickup.dox (modified) * code/trunk/doc/api/groups/Questsystem.dox (modified) * code/trunk/doc/api/groups/Triggers.dox (modified) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/Orxonox.cc (modified) * code/trunk/src/OrxonoxConfig.cmake (modified) * code/trunk/src/OrxonoxConfig.h.in (modified) * code/trunk/src/OrxonoxMac.h (copied) * code/trunk/src/OrxonoxMac.mm (copied) * code/trunk/src/SpecialConfig.h.in (modified) * code/trunk/src/external/CMakeLists.txt (modified) * code/trunk/src/external/bullet/Bullet-C-Api.h (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btDbvt.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btDbvt.h (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.h (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h (modified) * code/trunk/src/external/bullet/BulletCollision/CMakeLists.txt (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionObject.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btGhostObject.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btManifoldResult.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btManifoldResult.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btUnionFind.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btUnionFind.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btBox2dShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btBox2dShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btBoxShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btBoxShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCapsuleShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCapsuleShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCollisionMargin.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCollisionShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCollisionShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCompoundShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConcaveShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConcaveShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConeShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConeShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvex2dShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvex2dShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexHullShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexHullShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCylinderShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCylinderShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btEmptyShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btEmptyShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btMaterial.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btMultiSphereShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btMultiSphereShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btShapeHull.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btShapeHull.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btSphereShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btSphereShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleBuffer.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleBuffer.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleCallback.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleCallback.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleInfoMap.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleMesh.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleMesh.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btUniformScalingShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btUniformScalingShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/Gimpact (deleted) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btConvexCast.h (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btPointCollector.h (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h (modified) * code/trunk/src/external/bullet/BulletDynamics/CMakeLists.txt (modified) * code/trunk/src/external/bullet/BulletDynamics/Character/btCharacterControllerInterface.h (modified) * code/trunk/src/external/bullet/BulletDynamics/Character/btKinematicCharacterController.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/Character/btKinematicCharacterController.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btContactSolverInfo.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btHinge2Constraint.h (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btJacobianEntry.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btUniversalConstraint.h (copied) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/Bullet-C-API.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btActionInterface.h (modified) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h (modified) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h (modified) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btRigidBody.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btRigidBody.h (modified) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h (modified) * code/trunk/src/external/bullet/BulletDynamics/Vehicle/btRaycastVehicle.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h (modified) * code/trunk/src/external/bullet/BulletDynamics/Vehicle/btWheelInfo.h (modified) * code/trunk/src/external/bullet/BulletLicense.txt (modified) * code/trunk/src/external/bullet/CMakeLists.txt (modified) * code/trunk/src/external/bullet/ChangeLog (modified) * code/trunk/src/external/bullet/LinearMath/CMakeLists.txt (modified) * code/trunk/src/external/bullet/LinearMath/btAlignedAllocator.cpp (modified) * code/trunk/src/external/bullet/LinearMath/btAlignedObjectArray.h (modified) * code/trunk/src/external/bullet/LinearMath/btConvexHull.cpp (modified) * code/trunk/src/external/bullet/LinearMath/btConvexHull.h (modified) * code/trunk/src/external/bullet/LinearMath/btDefaultMotionState.h (modified) * code/trunk/src/external/bullet/LinearMath/btHashMap.h (modified) * code/trunk/src/external/bullet/LinearMath/btIDebugDraw.h (modified) * code/trunk/src/external/bullet/LinearMath/btMatrix3x3.h (modified) * code/trunk/src/external/bullet/LinearMath/btMinMax.h (modified) * code/trunk/src/external/bullet/LinearMath/btPoolAllocator.h (modified) * code/trunk/src/external/bullet/LinearMath/btQuaternion.h (modified) * code/trunk/src/external/bullet/LinearMath/btQuickprof.cpp (modified) * code/trunk/src/external/bullet/LinearMath/btQuickprof.h (modified) * code/trunk/src/external/bullet/LinearMath/btScalar.h (modified) * code/trunk/src/external/bullet/LinearMath/btSerializer.cpp (copied) * code/trunk/src/external/bullet/LinearMath/btSerializer.h (copied) * code/trunk/src/external/bullet/LinearMath/btTransform.h (modified) * code/trunk/src/external/bullet/LinearMath/btTransformUtil.h (modified) * code/trunk/src/external/bullet/LinearMath/btVector3.h (modified) * code/trunk/src/external/bullet/NEWS (modified) * code/trunk/src/external/bullet/README (modified) * code/trunk/src/external/bullet/VERSION (modified) * code/trunk/src/external/bullet/btBulletCollisionCommon.h (modified) * code/trunk/src/external/bullet/btBulletDynamicsCommon.h (modified) * code/trunk/src/external/bullet/changes_orxonox.diff (modified) * code/trunk/src/external/ceguilua (deleted) * code/trunk/src/external/cpptcl/changes_orxonox.diff (modified) * code/trunk/src/external/cpptcl/cpptcl.cc (modified) * code/trunk/src/external/enet/CMakeLists.txt (modified) * code/trunk/src/external/enet/patches/0001-Add-IPv6-support-to-Enet.patch (modified) * code/trunk/src/external/enet/win32.c (modified) * code/trunk/src/external/ogreceguirenderer/CMakeLists.txt (modified) * code/trunk/src/external/ogreceguirenderer/OgreCEGUIRenderer.cpp (modified) * code/trunk/src/external/ogreceguirenderer/VERSION (modified) * code/trunk/src/external/ogreceguirenderer/changes_orxonox.diff (modified) * code/trunk/src/external/ois/CMakeLists.txt (modified) * code/trunk/src/external/ois/OIS.h (modified) * code/trunk/src/external/ois/OISConfig.h (modified) * code/trunk/src/external/ois/OISInputManager.cpp (modified) * code/trunk/src/external/ois/OISKeyboard.h (modified) * code/trunk/src/external/ois/OISMultiTouch.h (copied) * code/trunk/src/external/ois/OISPrereqs.h (modified) * code/trunk/src/external/ois/ReadMe.txt (modified) * code/trunk/src/external/ois/VERSION (modified) * code/trunk/src/external/ois/changes_orxonox.diff (modified) * code/trunk/src/external/ois/linux/LinuxInputManager.cpp (modified) * code/trunk/src/external/ois/linux/LinuxInputManager.h (modified) * code/trunk/src/external/ois/linux/LinuxJoyStickEvents.cpp (modified) * code/trunk/src/external/ois/linux/LinuxKeyboard.cpp (modified) * code/trunk/src/external/ois/linux/LinuxKeyboard.h (modified) * code/trunk/src/external/ois/linux/LinuxMouse.cpp (modified) * code/trunk/src/external/ois/linux/LinuxPrereqs.h (modified) * code/trunk/src/external/ois/mac/CMakeLists.txt (modified) * code/trunk/src/external/ois/mac/MacHIDManager.cpp (modified) * code/trunk/src/external/ois/mac/MacHIDManager.h (modified) * code/trunk/src/external/ois/mac/MacInputManager.cpp (modified) * code/trunk/src/external/ois/mac/MacJoyStick.cpp (copied) * code/trunk/src/external/ois/mac/MacJoyStick.h (copied) * code/trunk/src/external/ois/mac/MacKeyboard.cpp (modified) * code/trunk/src/external/ois/win32/Win32ForceFeedback.cpp (modified) * code/trunk/src/external/ois/win32/Win32ForceFeedback.h (modified) * code/trunk/src/external/ois/win32/Win32InputManager.cpp (modified) * code/trunk/src/external/ois/win32/Win32InputManager.h (modified) * code/trunk/src/external/ois/win32/Win32JoyStick.cpp (modified) * code/trunk/src/external/ois/win32/Win32JoyStick.h (modified) * code/trunk/src/external/ois/win32/Win32KeyBoard.cpp (modified) * code/trunk/src/external/ois/win32/Win32KeyBoard.h (modified) * code/trunk/src/external/ois/win32/Win32Mouse.cpp (modified) * code/trunk/src/external/ois/win32/Win32Mouse.h (modified) * code/trunk/src/external/ois/win32/Win32Prereqs.h (modified) * code/trunk/src/external/tinyxml/CMakeLists.txt (modified) * code/trunk/src/external/tinyxml/VERSION (modified) * code/trunk/src/external/tinyxml/changes_orxonox.diff (modified) * code/trunk/src/external/tinyxml/ticpp.cpp (modified) * code/trunk/src/external/tinyxml/ticpp.h (modified) * code/trunk/src/external/tolua/CMakeLists.txt (modified) * code/trunk/src/external/tolua/README_ORXONOX (copied) * code/trunk/src/external/tolua/VERSION (modified) * code/trunk/src/external/tolua/all-5.0.lua (deleted) * code/trunk/src/external/tolua/changes_orxonox.diff (modified) * code/trunk/src/external/tolua/lua/package.lua (modified) * code/trunk/src/external/tolua/tolua++.h (deleted) * code/trunk/src/external/tolua/tolua_event.c (deleted) * code/trunk/src/external/tolua/tolua_event.h (deleted) * code/trunk/src/external/tolua/tolua_is.c (deleted) * code/trunk/src/external/tolua/tolua_map.c (deleted) * code/trunk/src/external/tolua/tolua_push.c (deleted) * code/trunk/src/external/tolua/tolua_to.c (deleted) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/ConfigValueContainer.cc (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/CorePrereqs.h (modified) * code/trunk/src/libraries/core/DynLib.cc (modified) * code/trunk/src/libraries/core/DynLib.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/Identifier.h (modified) * code/trunk/src/libraries/core/LuaState.cc (modified) * code/trunk/src/libraries/core/LuaState.h (modified) * code/trunk/src/libraries/core/MemoryArchive.cc (deleted) * code/trunk/src/libraries/core/MemoryArchive.h (deleted) * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/PathConfig.cc (modified) * code/trunk/src/libraries/core/PathConfig.h (modified) * code/trunk/src/libraries/core/Resource.cc (modified) * code/trunk/src/libraries/core/Resource.h (modified) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) * code/trunk/src/libraries/core/command/TclThreadManager.cc (modified) * code/trunk/src/libraries/core/input/InputDevice.h (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/core/input/InputState.h (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/network/CMakeLists.txt (modified) * code/trunk/src/libraries/network/LANDiscoverable.cc (modified) * code/trunk/src/libraries/network/LANDiscoverable.h (modified) * code/trunk/src/libraries/network/LANDiscovery.cc (modified) * code/trunk/src/libraries/network/LANDiscovery.h (modified) * code/trunk/src/libraries/network/MasterServer.cc (modified) * code/trunk/src/libraries/network/MasterServer.h (modified) * code/trunk/src/libraries/network/MasterServerComm.cc (modified) * code/trunk/src/libraries/network/MasterServerComm.h (modified) * code/trunk/src/libraries/network/MasterServerProtocol.h (modified) * code/trunk/src/libraries/network/NetworkPrecompiledHeaders.h (modified) * code/trunk/src/libraries/network/NetworkPrereqs.h (modified) * code/trunk/src/libraries/network/PeerList.cc (modified) * code/trunk/src/libraries/network/PeerList.h (modified) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/Server.h (modified) * code/trunk/src/libraries/network/ServerList.cc (modified) * code/trunk/src/libraries/network/ServerList.h (modified) * code/trunk/src/libraries/network/WANDiscoverable.cc (modified) * code/trunk/src/libraries/network/WANDiscoverable.h (modified) * code/trunk/src/libraries/network/WANDiscovery.cc (modified) * code/trunk/src/libraries/network/WANDiscovery.h (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.cc (modified) * code/trunk/src/libraries/network/packet/ServerInformation.cc (modified) * code/trunk/src/libraries/network/packet/ServerInformation.h (modified) * code/trunk/src/libraries/tools/BulletConversions.h (modified) * code/trunk/src/libraries/tools/CMakeLists.txt (modified) * code/trunk/src/libraries/tools/Mesh.cc (modified) * code/trunk/src/libraries/tools/ResourceCollection.cc (modified) * code/trunk/src/libraries/tools/ToolsPrereqs.h (modified) * code/trunk/src/libraries/util/CMakeLists.txt (modified) * code/trunk/src/libraries/util/Convert.h (modified) * code/trunk/src/libraries/util/Exception.cc (modified) * code/trunk/src/libraries/util/ExprParser.cc (modified) * code/trunk/src/libraries/util/ExprParser.h (modified) * code/trunk/src/libraries/util/Math.h (modified) * code/trunk/src/libraries/util/MathConvert.h (modified) * code/trunk/src/libraries/util/SharedPtr.h (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/libraries/util/SignalHandler.h (modified) * code/trunk/src/libraries/util/UtilPrereqs.h (modified) * code/trunk/src/modules/designtools/CreateStars.cc (modified) * code/trunk/src/modules/designtools/DesignToolsPrereqs.h (modified) * code/trunk/src/modules/designtools/ScreenshotManager.cc (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.cc (modified) * code/trunk/src/modules/notifications/NotificationsPrereqs.h (modified) * code/trunk/src/modules/objects/ObjectsPrereqs.h (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.cc (modified) * code/trunk/src/modules/pickup/PickupCollection.h (modified) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/pong/PongPrereqs.h (modified) * code/trunk/src/modules/questsystem/QuestEffect.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestsystemPrereqs.h (modified) * code/trunk/src/modules/questsystem/effects/AddReward.cc (modified) * code/trunk/src/modules/questsystem/effects/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/WeaponsPrereqs.h (modified) * code/trunk/src/orxonox-main.vcxproj.user.in (copied) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/MoodManager.cc (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/PawnManager.cc (modified) * code/trunk/src/orxonox/PawnManager.h (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.h (modified) * code/trunk/src/orxonox/graphics/BlinkingBillboard.cc (modified) * code/trunk/src/orxonox/graphics/BlinkingBillboard.h (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.cc (modified) * code/trunk/src/orxonox/interfaces/PickupListener.cc (modified) * code/trunk/src/orxonox/interfaces/PickupListener.h (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) * code/trunk/src/orxonox/sound/SoundBuffer.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.h (modified) * code/trunk/src/orxonox/sound/WorldSound.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) Merged kicklib2 branch back to trunk (includes former branches ... Mon, 25 Apr 2011 22:31:32 GMT scheusso [8329] * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) preparing countermeasures against clients sending unwanted data Mon, 25 Apr 2011 18:22:36 GMT scheusso [8327] * code/trunk (modified) * code/trunk/src/libraries/core/Thread.cc (modified) * code/trunk/src/libraries/core/ThreadWin.cc (copied) * code/trunk/src/libraries/network/CMakeLists.txt (modified) * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/ClientConnection.cc (modified) * code/trunk/src/libraries/network/ClientConnection.h (modified) * code/trunk/src/libraries/network/ClientConnectionListener.cc (modified) * code/trunk/src/libraries/network/ClientConnectionListener.h (modified) * code/trunk/src/libraries/network/ClientInformation.cc (deleted) * code/trunk/src/libraries/network/ClientInformation.h (deleted) * code/trunk/src/libraries/network/Connection.cc (modified) * code/trunk/src/libraries/network/Connection.h (modified) * code/trunk/src/libraries/network/GamestateClient.cc (deleted) * code/trunk/src/libraries/network/GamestateClient.h (deleted) * code/trunk/src/libraries/network/GamestateHandler.h (modified) * code/trunk/src/libraries/network/GamestateManager.cc (modified) * code/trunk/src/libraries/network/GamestateManager.h (modified) * code/trunk/src/libraries/network/Host.cc (modified) * code/trunk/src/libraries/network/NetworkPrereqs.h (modified) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/Server.h (modified) * code/trunk/src/libraries/network/ServerConnection.cc (modified) * code/trunk/src/libraries/network/ServerConnection.h (modified) * code/trunk/src/libraries/network/WANDiscovery.cc (modified) * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) * code/trunk/src/libraries/network/packet/Packet.cc (modified) * code/trunk/src/libraries/network/packet/Packet.h (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/trunk/src/orxonox/ChatHistory.cc (modified) * code/trunk/src/orxonox/ChatInputHandler.cc (modified) * code/trunk/src/orxonox/PlayerManager.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/HumanPlayer.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) merging network6 into trunk Sat, 23 Apr 2011 21:37:10 GMT scheusso [8316] * code/trunk/src/libraries/core/command/ConsoleCommand.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) fix for dedicated Client Sat, 23 Apr 2011 08:56:00 GMT scheusso [8314] * code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified) clarification of an assertion Tue, 19 Apr 2011 13:48:48 GMT rgrieder [8267] * code/trunk/src/libraries/core/Identifier.cc (modified) * code/trunk/src/libraries/util/ImplicitConversion.h (modified) Fixed typos. Sat, 16 Apr 2011 09:19:06 GMT landauf [8245] * code/trunk/src/libraries/core/Game.cc (modified) keep it DRY Mon, 11 Apr 2011 17:37:00 GMT dafrick [8232] * code/trunk/data/gui/scripts/KeyBindMenu.lua (modified) * code/trunk/src/libraries/util/StringUtils.cc (modified) * code/trunk/src/libraries/util/StringUtils.h (modified) * code/trunk/src/modules/designtools/ScreenshotManager.cc (modified) * code/trunk/src/modules/designtools/ScreenshotManager.h (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.cc (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.h (modified) Extending and reorganizing ScreenshotManager and SkyboxGenerator. ... Sat, 09 Apr 2011 17:07:17 GMT dafrick [8215] * code/trunk/src/libraries/core/Game.cc (modified) Bugfix, so that orxonox will start in modes that don't show any ... Wed, 23 Mar 2011 20:57:54 GMT dafrick [8108] * code/trunk (modified) * code/trunk/doc/api/Groups.dox (modified) * code/trunk/doc/api/groups (copied) * code/trunk/doc/api/groups/Notifications.dox (copied) * code/trunk/doc/api/groups/Pickup.dox (copied) * code/trunk/doc/api/groups/Questsystem.dox (copied) * code/trunk/doc/api/groups/Triggers.dox (copied) * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/network/Host.cc (modified) * code/trunk/src/libraries/network/MasterServerComm.h (modified) * code/trunk/src/modules/designtools/ScreenshotManager.cc (modified) * code/trunk/src/modules/pickup/Pickup.h (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/pong/PongAI.cc (modified) * code/trunk/src/modules/pong/PongAI.h (modified) * code/trunk/src/modules/pong/PongBall.cc (modified) * code/trunk/src/modules/pong/PongBall.h (modified) * code/trunk/src/modules/pong/PongBat.cc (modified) * code/trunk/src/modules/pong/PongBat.h (modified) * code/trunk/src/modules/pong/PongBot.cc (modified) * code/trunk/src/modules/pong/PongBot.h (modified) * code/trunk/src/modules/pong/PongCenterpoint.cc (modified) * code/trunk/src/modules/pong/PongCenterpoint.h (modified) * code/trunk/src/modules/pong/PongScore.cc (modified) * code/trunk/src/modules/pong/PongScore.h (modified) Merging changes from tetris branch into trunk, since they are also ... Tue, 15 Mar 2011 20:47:11 GMT landauf [8079] * code/trunk (modified) * code/trunk/cmake/tools/TargetUtilities.cmake (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/configs/CEGUIConfig.xsd (modified) * code/trunk/data/gui/layouts/GraphicsMenu.layout (modified) * code/trunk/data/gui/schemes/GUIScheme.xsd (modified) * code/trunk/data/gui/schemes/OrxonoxLook.scheme (modified) * code/trunk/data/gui/schemes/TaharezGreenLook.scheme (modified) * code/trunk/data/gui/schemes/TaharezLook.scheme (modified) * code/trunk/data/gui/scripts/AudioMenu.lua (modified) * 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 (modified) * code/trunk/data/gui/scripts/GUITools.lua (modified) * code/trunk/data/gui/scripts/GraphicsMenu.lua (modified) * code/trunk/data/gui/scripts/HostMenu.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/MiscConfigMenu.lua (modified) * code/trunk/data/gui/scripts/MouseControlsMenu.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/NotificationLayer.lua (modified) * code/trunk/data/gui/scripts/SettingsMenu.lua (modified) * code/trunk/data/gui/scripts/SheetManager.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/asteroids.oxw (modified) * code/trunk/data/levels/dynamicMatch.oxw (modified) * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationDM.oxw (modified) * code/trunk/data/levels/presentationFS102.oxw (modified) * code/trunk/data/levels/presentationFS10Ed.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS09b.oxw (modified) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/testSwallow.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/data/overlays/debug.oxo (modified) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/external/enet/win32.c (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/CorePrereqs.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/core/Loader.h (modified) * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/ViewportEventListener.cc (copied) * code/trunk/src/libraries/core/ViewportEventListener.h (copied) * code/trunk/src/libraries/core/WeakPtr.h (modified) * code/trunk/src/libraries/core/command/CommandEvaluation.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommandCompilation.cc (modified) * code/trunk/src/libraries/core/command/Shell.cc (modified) * code/trunk/src/libraries/core/command/TclBind.cc (modified) * code/trunk/src/libraries/core/command/TclBind.h (modified) * code/trunk/src/libraries/core/command/TclThreadManager.cc (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/KeyBinder.cc (modified) * code/trunk/src/libraries/core/input/Keyboard.cc (modified) * code/trunk/src/libraries/core/input/Keyboard.h (modified) * code/trunk/src/libraries/network/Host.cc (modified) * code/trunk/src/libraries/tools/ResourceLocation.cc (modified) * code/trunk/src/libraries/tools/Shader.cc (modified) * code/trunk/src/libraries/tools/Shader.h (modified) * code/trunk/src/libraries/tools/Timer.cc (modified) * code/trunk/src/libraries/tools/Timer.h (modified) * code/trunk/src/libraries/tools/ToolsPrereqs.h (modified) * code/trunk/src/modules/designtools/ScreenshotManager.cc (modified) * code/trunk/src/modules/designtools/ScreenshotManager.h (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/PauseNotice.cc (copied) * code/trunk/src/modules/overlays/hud/PauseNotice.h (copied) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/questsystem/QuestItem.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/effects/AddQuestHint.cc (modified) * code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.cc (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/CameraManager.h (modified) * code/trunk/src/orxonox/ChatInputHandler.cc (modified) * code/trunk/src/orxonox/ChatInputHandler.h (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (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/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.h (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/graphics/Camera.cc (modified) * code/trunk/src/orxonox/graphics/Camera.h (modified) * code/trunk/src/orxonox/graphics/GlobalShader.cc (modified) * code/trunk/src/orxonox/graphics/GlobalShader.h (modified) * code/trunk/src/orxonox/graphics/Model.cc (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) merged usability branch back to trunk incomplete summary of the ... Thu, 24 Feb 2011 21:56:43 GMT dafrick [7958] * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) Fixed a warning. Thu, 24 Feb 2011 05:21:24 GMT rgrieder [7952] * code/trunk/src/libraries/network/NetworkPrecompiledHeaders.h (modified) Fixed MSCV include order problem with ENet and Ogre (only occurs with ... Wed, 16 Feb 2011 21:23:00 GMT landauf [7904] * code/trunk/src/libraries/network/LANDiscoverable.h (modified) * code/trunk/src/libraries/util/Singleton.h (modified) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.h (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.h (modified) 2x virtual because it may be required in some cases (Singleton & ... Mon, 14 Feb 2011 21:30:01 GMT landauf [7891] * code/trunk/src/libraries/core/input/Button.cc (modified) * code/trunk/src/libraries/core/input/InputCommands.h (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) keybind mode shouldn't be changed if it was defined explicitly in the ... Sun, 13 Feb 2011 16:49:41 GMT dafrick [7876] * code/trunk/data/gui/scripts/HostMenu.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.h (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified) Extending startGame and similar console commands, now also the level ... Sun, 13 Feb 2011 00:25:46 GMT landauf [7874] * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/WindowEventListener.cc (modified) * code/trunk/src/libraries/core/WindowEventListener.h (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/core/input/InputManager.h (modified) WindowEventListener now declares if the window's focus is active or ... Sat, 12 Feb 2011 20:10:41 GMT landauf [7873] * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) fixed mouse cursor offset after window resize Sat, 12 Feb 2011 18:40:56 GMT rgrieder [7872] * code/trunk/src/libraries/core/Core.cc (modified) Fixed msvc warning. Sat, 12 Feb 2011 18:39:29 GMT rgrieder [7871] * code/trunk/src/libraries/core/command/Functor.h (modified) Fixed msvc build: Functor does not necessarily have to be ... Sat, 12 Feb 2011 18:24:16 GMT landauf [7870] * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) added feature: ogre config dialog keeps showing up on startup until ... Sat, 12 Feb 2011 15:28:53 GMT landauf [7868] * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) use exit() instead of abort() if the ogre config dialog was canceled ... Sat, 12 Feb 2011 10:54:07 GMT landauf [7861] * code/trunk/src/libraries/core/command/ConsoleCommand.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.h (modified) * code/trunk/src/libraries/core/input/InputCommands.h (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/core/input/KeyBinder.h (modified) added function to KeyBinder which allows to change the keybind mode ... Sat, 12 Feb 2011 10:34:40 GMT landauf [7859] * code/trunk/src/libraries/core/input/HalfAxis.h (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/core/input/KeyBinder.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.h (modified) implemented feature to reset the mouse cursor to the center used in ... Thu, 10 Feb 2011 22:34:20 GMT landauf [7851] * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/core/command/Functor.h (modified) * code/trunk/src/libraries/tools/Timer.h (modified) * code/trunk/src/orxonox/weaponsystem/Munition.h (modified) added "safe mode" feature to FunctorMember: if enabled, the functor ... Thu, 10 Feb 2011 21:26:46 GMT landauf [7850] * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/WeakPtr.h (modified) moved if(object) condition from WeakPtr to DestructionListener Thu, 10 Feb 2011 20:52:23 GMT landauf [7849] * code/trunk/src/libraries/core/CorePrereqs.h (modified) * code/trunk/src/libraries/core/OrxonoxClass.cc (modified) * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/WeakPtr.h (modified) Added DestructionListener, a class which gets notified if a certain ... Thu, 10 Feb 2011 15:11:09 GMT landauf [7844] * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) fixed warning. hope this works on all supported systems, because ... Sun, 26 Dec 2010 12:06:29 GMT rgrieder [7811] * code/trunk/src/libraries/core/GUIManager.cc (modified) Fixed possible bug. Sun, 26 Dec 2010 11:53:02 GMT rgrieder [7809] * code/trunk/src/libraries/core/input/JoyStick.h (modified) * code/trunk/src/libraries/core/input/Keyboard.h (modified) * code/trunk/src/libraries/core/input/Mouse.h (modified) Fixed Doxygen problem ('Template' is not always a type). Sat, 25 Dec 2010 20:32:34 GMT dafrick [7804] * code/trunk/src/libraries/network/MasterServerComm.h (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) Some more minor changes in documentation. Wed, 22 Dec 2010 18:24:24 GMT dafrick [7801] * code/trunk (modified) * code/trunk/bin/CMakeLists.txt (modified) * code/trunk/bin/masterserver.bat.in (copied) * code/trunk/bin/masterserver.in (copied) * code/trunk/data/gui/layouts/AudioMenu.layout (modified) * code/trunk/data/gui/layouts/CreditsMenu.layout (modified) * code/trunk/data/gui/layouts/GraphicsMenu.layout (modified) * code/trunk/data/gui/layouts/InGameMenu.layout (modified) * code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified) * code/trunk/data/gui/schemes/OrxonoxHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/OrxonoxLookHUDWidgets.scheme (deleted) * code/trunk/data/gui/schemes/OrxonoxLookMenuWidgets.scheme (deleted) * code/trunk/data/gui/schemes/OrxonoxMenuWidgets.scheme (copied) * code/trunk/data/gui/scripts/ChatBox-inputonly.lua (modified) * code/trunk/data/gui/scripts/ChatBox.lua (modified) * code/trunk/data/gui/scripts/GraphicsMenu.lua (modified) * code/trunk/data/gui/scripts/InitialiseGUI.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/network/CMakeLists.txt (modified) * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/Client.h (modified) * code/trunk/src/libraries/network/ClientConnection.cc (modified) * code/trunk/src/libraries/network/ClientConnection.h (modified) * code/trunk/src/libraries/network/ClientInformation.cc (modified) * code/trunk/src/libraries/network/ClientInformation.h (modified) * code/trunk/src/libraries/network/Connection.cc (modified) * code/trunk/src/libraries/network/Connection.h (modified) * code/trunk/src/libraries/network/FunctionCallManager.cc (modified) * code/trunk/src/libraries/network/FunctionCallManager.h (modified) * code/trunk/src/libraries/network/GamestateClient.cc (modified) * code/trunk/src/libraries/network/GamestateClient.h (modified) * code/trunk/src/libraries/network/GamestateHandler.cc (modified) * code/trunk/src/libraries/network/GamestateHandler.h (modified) * code/trunk/src/libraries/network/GamestateManager.cc (modified) * code/trunk/src/libraries/network/GamestateManager.h (modified) * code/trunk/src/libraries/network/Host.cc (modified) * code/trunk/src/libraries/network/Host.h (modified) * code/trunk/src/libraries/network/LANDiscoverable.cc (modified) * code/trunk/src/libraries/network/MasterServer.cc (copied) * code/trunk/src/libraries/network/MasterServer.h (copied) * code/trunk/src/libraries/network/MasterServerComm.cc (copied) * code/trunk/src/libraries/network/MasterServerComm.h (copied) * code/trunk/src/libraries/network/MasterServerProtocol.h (copied) * code/trunk/src/libraries/network/NetworkPrereqs.h (modified) * code/trunk/src/libraries/network/PeerList.cc (copied) * code/trunk/src/libraries/network/PeerList.h (copied) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/Server.h (modified) * code/trunk/src/libraries/network/ServerConnection.cc (modified) * code/trunk/src/libraries/network/ServerConnection.h (modified) * code/trunk/src/libraries/network/ServerList.cc (copied) * code/trunk/src/libraries/network/ServerList.h (copied) * code/trunk/src/libraries/network/WANDiscoverable.cc (copied) * code/trunk/src/libraries/network/WANDiscoverable.h (copied) * code/trunk/src/libraries/network/WANDiscovery.cc (copied) * code/trunk/src/libraries/network/WANDiscovery.h (copied) * code/trunk/src/libraries/network/packet/Acknowledgement.cc (modified) * code/trunk/src/libraries/network/packet/Acknowledgement.h (modified) * code/trunk/src/libraries/network/packet/Chat.cc (modified) * code/trunk/src/libraries/network/packet/Chat.h (modified) * code/trunk/src/libraries/network/packet/ClassID.cc (modified) * code/trunk/src/libraries/network/packet/ClassID.h (modified) * code/trunk/src/libraries/network/packet/DeleteObjects.cc (modified) * code/trunk/src/libraries/network/packet/DeleteObjects.h (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.cc (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.h (modified) * code/trunk/src/libraries/network/packet/FunctionIDs.cc (modified) * code/trunk/src/libraries/network/packet/FunctionIDs.h (modified) * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) * code/trunk/src/libraries/network/packet/Gamestate.h (modified) * code/trunk/src/libraries/network/packet/Packet.cc (modified) * code/trunk/src/libraries/network/packet/Packet.h (modified) * code/trunk/src/libraries/network/packet/ServerInformation.cc (modified) * code/trunk/src/libraries/network/packet/ServerInformation.h (modified) * code/trunk/src/libraries/network/packet/Welcome.cc (modified) * code/trunk/src/libraries/network/packet/Welcome.h (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) * code/trunk/src/modules/overlays/hud/HUDBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/weapons/MuzzleFlash.cc (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/gamestates/CMakeLists.txt (modified) * code/trunk/src/orxonox/gamestates/GSMasterServer.cc (copied) * code/trunk/src/orxonox/gamestates/GSMasterServer.h (copied) * code/trunk/src/orxonox/gamestates/GSServer.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/infos/Bot.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merging presentation2 branch back to trunk. Fri, 03 Dec 2010 13:37:11 GMT dafrick [7709] * code/trunk (modified) * code/trunk/data/DefaultResources.oxr (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/tools/ResourceLocation.cc (modified) Merging data_cleanup branch. You will need to update your data ... Sat, 13 Nov 2010 22:55:23 GMT dafrick [7648] * code/trunk (modified) * code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified) * code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/Fight in our Back.oxw (modified) * code/trunk/data/levels/Quest_PirateAttack.oxw (modified) * code/trunk/data/levels/The Time Machine.oxw (modified) * code/trunk/data/levels/empty_level.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fps_test.oxw (modified) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/presentation.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationFS10.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS09b.oxw (modified) * code/trunk/data/levels/presentation_FS10.oxw (modified) * code/trunk/data/levels/presentation_FS10_ed.oxw (modified) * code/trunk/data/levels/presentation_dm.oxw (modified) * code/trunk/data/levels/princessaeryn.oxw (modified) * code/trunk/data/levels/screenshot.oxw (modified) * code/trunk/data/levels/sound.oxw (modified) * code/trunk/data/levels/teambasematchlevel.oxw (modified) * code/trunk/data/levels/teamdeathmatch.oxw (modified) * code/trunk/data/levels/test_stars.oxw (modified) * code/trunk/data/levels/test_swallow.oxw (modified) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/core/Loader.h (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/LevelInfo.cc (copied) * code/trunk/src/orxonox/LevelInfo.h (copied) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) Merged releasetodo, containing a new way to describe and tag levels, ... Fri, 15 Oct 2010 06:35:20 GMT dafrick [7545] * code/trunk/src/libraries/tools/Timer.h (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.h (modified) Improvements in InvisiblePickup. Fri, 01 Oct 2010 11:27:04 GMT scheusso [7503] * code/trunk/src/libraries/network/FunctionCall.cc (modified) don't know where this else got lost Tue, 28 Sep 2010 19:48:32 GMT scheusso [7495] * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/FunctionCall.cc (modified) * code/trunk/src/libraries/network/FunctionCall.h (modified) * code/trunk/src/libraries/network/FunctionCallManager.cc (modified) * code/trunk/src/libraries/network/FunctionCallManager.h (modified) * code/trunk/src/libraries/network/NetworkFunction.h (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) buffering incoming function calls for non-existing objects works now Sun, 26 Sep 2010 16:41:19 GMT scheusso [7490] * code/trunk/src/libraries/network/CMakeLists.txt (modified) * code/trunk/src/libraries/network/FunctionCall.cc (copied) * code/trunk/src/libraries/network/FunctionCall.h (copied) * code/trunk/src/libraries/network/NetworkPrereqs.h (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.cc (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.h (modified) * code/trunk/src/libraries/network/packet/Packet.h (modified) cleaning up function calls a bit in order to buffer calls for not ... Fri, 17 Sep 2010 13:13:47 GMT adrfried [7461] * code/trunk/src/libraries/network/packet/ServerInformation.cc (modified) fix ServerInformation Thu, 16 Sep 2010 22:48:29 GMT adrfried [7459] * code/trunk (modified) * code/trunk/cmake/LibraryConfig.cmake (modified) * code/trunk/cmake/PackageConfig.cmake (modified) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/external/CMakeLists.txt (modified) * code/trunk/src/external/enet (copied) * code/trunk/src/external/enet/CMakeLists.txt (copied) * code/trunk/src/external/enet/ChangeLog (copied) * code/trunk/src/external/enet/Doxyfile (copied) * code/trunk/src/external/enet/LICENSE (copied) * code/trunk/src/external/enet/README (copied) * code/trunk/src/external/enet/callbacks.c (copied) * code/trunk/src/external/enet/callbacks.h (copied) * code/trunk/src/external/enet/compress.c (copied) * code/trunk/src/external/enet/docs (copied) * code/trunk/src/external/enet/docs/FAQ.dox (copied) * code/trunk/src/external/enet/docs/design.dox (copied) * code/trunk/src/external/enet/docs/install.dox (copied) * code/trunk/src/external/enet/docs/license.dox (copied) * code/trunk/src/external/enet/docs/mainpage.dox (copied) * code/trunk/src/external/enet/docs/tutorial.dox (copied) * code/trunk/src/external/enet/enet.h (copied) * code/trunk/src/external/enet/host.c (copied) * code/trunk/src/external/enet/include (copied) * code/trunk/src/external/enet/include/enet (copied) * code/trunk/src/external/enet/libenet.pc.in (copied) * code/trunk/src/external/enet/list.c (copied) * code/trunk/src/external/enet/list.h (copied) * code/trunk/src/external/enet/packet.c (copied) * code/trunk/src/external/enet/patches (copied) * code/trunk/src/external/enet/patches/0001-IPv6-support.patch (copied) * code/trunk/src/external/enet/peer.c (copied) * code/trunk/src/external/enet/protocol.c (copied) * code/trunk/src/external/enet/protocol.h (copied) * code/trunk/src/external/enet/time.h (copied) * code/trunk/src/external/enet/types.h (copied) * code/trunk/src/external/enet/unix.c (copied) * code/trunk/src/external/enet/unix.h (copied) * code/trunk/src/external/enet/utility.h (copied) * code/trunk/src/external/enet/win32.c (copied) * code/trunk/src/external/enet/win32.h (copied) * code/trunk/src/libraries/network/CMakeLists.txt (modified) * code/trunk/src/libraries/network/ClientConnection.cc (modified) * code/trunk/src/libraries/network/ClientInformation.cc (modified) * code/trunk/src/libraries/network/LANDiscoverable.cc (modified) * code/trunk/src/libraries/network/LANDiscovery.cc (modified) * code/trunk/src/libraries/network/ServerConnection.cc (modified) * code/trunk/src/libraries/network/packet/ServerInformation.cc (modified) * code/trunk/src/libraries/network/packet/ServerInformation.h (modified) Merged ipv6 branch Orxonox now includes a modified version of ENet 1.3.0 Thu, 16 Sep 2010 11:45:08 GMT landauf [7457] * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/libraries/util/SignalHandler.h (modified) show file name and line number in the call stack (works only with ... Wed, 15 Sep 2010 16:14:37 GMT landauf [7455] * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/libraries/util/SignalHandler.h (modified) added special implementation of abort() and _assert() for mingw which ... Tue, 14 Sep 2010 00:35:57 GMT landauf [7452] * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/libraries/util/SignalHandler.h (modified) changed to non-deprecated functions (xxxx64) fixed a few errors that ... Mon, 13 Sep 2010 21:30:06 GMT rgrieder [7450] * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/SpecialConfig.h.in (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) - Catched -> Caught - No idea why OROXNOX_USE_WINMAIN was at the ... Mon, 13 Sep 2010 21:12:21 GMT landauf [7449] * code/trunk/cmake/LibraryConfig.cmake (modified) * code/trunk/cmake/PackageConfig.cmake (modified) * code/trunk/cmake/tools/FindDbgHelp.cmake (added) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/SpecialConfig.h.in (modified) * code/trunk/src/libraries/util/CMakeLists.txt (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/libraries/util/SignalHandler.h (modified) added windows implementation of SignalHandler. Sun, 12 Sep 2010 13:33:35 GMT rgrieder [7427] * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/PathConfig.h (modified) * code/trunk/src/libraries/util/Math.h (modified) Applied fixes from sandbox_qt to trunk. Sun, 12 Sep 2010 05:55:04 GMT adrfried [7422] * code/trunk/src/libraries/core/command/IOConsolePOSIX.cc (modified) Improve getTerminalSize Width and height never get 0 anymore, this ... Sat, 11 Sep 2010 18:30:17 GMT rgrieder [7417] * code/trunk/src/libraries/util/StringUtils.h (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.h (modified) Removed StringCompare again. Sat, 11 Sep 2010 15:05:47 GMT dafrick [7413] * code/trunk/data/gui/scripts/NotificationLayer.lua (modified) * code/trunk/src/libraries/util/StringUtils.h (modified) * code/trunk/src/modules/notifications/Notification.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.h (modified) Removing some TODO comments. Better handling of duplicate name in ... Sat, 11 Sep 2010 08:20:44 GMT dafrick [7403] * code/trunk (modified) * code/trunk/data/gui/layouts/NotificationLayer.layout (copied) * code/trunk/data/gui/scripts/GUISheet.lua (modified) * code/trunk/data/gui/scripts/KeyBindMenu.lua (modified) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified) * code/trunk/data/gui/scripts/NotificationLayer.lua (copied) * code/trunk/data/gui/scripts/SheetManager.lua (modified) * code/trunk/data/levels/Fight in our Back.oxw (modified) * code/trunk/data/levels/Quest_PirateAttack.oxw (modified) * code/trunk/data/levels/old/princessaeryn.oxw (modified) * code/trunk/data/levels/old/questsystem.oxw (modified) * code/trunk/data/levels/princessaeryn.oxw (modified) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/modules/notifications/CMakeLists.txt (modified) * code/trunk/src/modules/notifications/Notification.cc (modified) * code/trunk/src/modules/notifications/Notification.h (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.h (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.h (modified) * code/trunk/src/modules/notifications/NotificationOverlay.cc (deleted) * code/trunk/src/modules/notifications/NotificationOverlay.h (deleted) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) * code/trunk/src/modules/notifications/NotificationsPrereqs.h (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.h (modified) * code/trunk/src/modules/questsystem/Quest.cc (modified) * code/trunk/src/modules/questsystem/QuestDescription.cc (modified) * code/trunk/src/modules/questsystem/QuestDescription.h (modified) * code/trunk/src/modules/questsystem/QuestHint.cc (modified) * code/trunk/src/modules/questsystem/QuestNotification.cc (modified) * code/trunk/src/modules/questsystem/QuestNotification.h (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.h (modified) Merged notifications branch back to trunk. Fri, 10 Sep 2010 22:34:00 GMT landauf [7401] * code/trunk (modified) * code/trunk/cmake/tools/TargetUtilities.cmake (modified) * code/trunk/doc/api/CMakeLists.txt (modified) * code/trunk/doc/api/Groups.dox (copied) * code/trunk/doc/api/doxy.config.in (modified) * code/trunk/doc/api/images/orxonox.jpg (copied) * code/trunk/doc/api/main.dox (modified) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/OrxonoxConfig.h.in (modified) * code/trunk/src/SpecialConfig.h.in (modified) * code/trunk/src/libraries/CMakeLists.txt (modified) * code/trunk/src/libraries/core/BaseObject.cc (modified) * code/trunk/src/libraries/core/BaseObject.h (modified) * code/trunk/src/libraries/core/ClassFactory.h (modified) * code/trunk/src/libraries/core/ClassTreeMask.cc (modified) * code/trunk/src/libraries/core/ClassTreeMask.h (modified) * code/trunk/src/libraries/core/CommandLineParser.cc (modified) * code/trunk/src/libraries/core/CommandLineParser.h (modified) * code/trunk/src/libraries/core/ConfigFileManager.cc (modified) * code/trunk/src/libraries/core/ConfigFileManager.h (modified) * code/trunk/src/libraries/core/ConfigValueContainer.h (modified) * code/trunk/src/libraries/core/ConfigValueIncludes.h (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/libraries/core/DynLib.h (modified) * code/trunk/src/libraries/core/DynLibManager.h (modified) * code/trunk/src/libraries/core/Event.cc (modified) * code/trunk/src/libraries/core/Event.h (modified) * code/trunk/src/libraries/core/EventIncludes.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/GameMode.cc (modified) * code/trunk/src/libraries/core/GameMode.h (modified) * code/trunk/src/libraries/core/GameState.h (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/Identifier.cc (modified) * code/trunk/src/libraries/core/Identifier.h (modified) * code/trunk/src/libraries/core/Iterator.h (modified) * code/trunk/src/libraries/core/Language.cc (modified) * code/trunk/src/libraries/core/Language.h (modified) * code/trunk/src/libraries/core/Loader.h (modified) * code/trunk/src/libraries/core/LuaState.h (modified) * code/trunk/src/libraries/core/MemoryArchive.cc (modified) * code/trunk/src/libraries/core/MemoryArchive.h (modified) * code/trunk/src/libraries/core/MetaObjectList.h (modified) * code/trunk/src/libraries/core/Namespace.cc (modified) * code/trunk/src/libraries/core/Namespace.h (modified) * code/trunk/src/libraries/core/NamespaceNode.h (modified) * code/trunk/src/libraries/core/ObjectList.h (modified) * code/trunk/src/libraries/core/ObjectListBase.cc (modified) * code/trunk/src/libraries/core/ObjectListBase.h (modified) * code/trunk/src/libraries/core/ObjectListIterator.h (modified) * code/trunk/src/libraries/core/OrxonoxClass.cc (modified) * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/PathConfig.h (modified) * code/trunk/src/libraries/core/Resource.h (modified) * code/trunk/src/libraries/core/SmartPtr.h (modified) * code/trunk/src/libraries/core/SubclassIdentifier.h (modified) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/libraries/core/Template.h (modified) * code/trunk/src/libraries/core/Thread.h (modified) * code/trunk/src/libraries/core/ThreadPool.h (modified) * code/trunk/src/libraries/core/ToluaInterface.h (modified) * code/trunk/src/libraries/core/WeakPtr.h (modified) * code/trunk/src/libraries/core/WindowEventListener.h (modified) * code/trunk/src/libraries/core/XMLFile.h (modified) * code/trunk/src/libraries/core/XMLNameListener.h (modified) * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/core/command/ArgumentCompleter.h (modified) * code/trunk/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) * code/trunk/src/libraries/core/command/ArgumentCompletionFunctions.h (modified) * code/trunk/src/libraries/core/command/ArgumentCompletionListElement.h (modified) * code/trunk/src/libraries/core/command/CommandEvaluation.cc (modified) * code/trunk/src/libraries/core/command/CommandEvaluation.h (modified) * code/trunk/src/libraries/core/command/CommandExecutor.cc (modified) * code/trunk/src/libraries/core/command/CommandExecutor.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommandCompilation.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommandCompilation.h (modified) * code/trunk/src/libraries/core/command/Executor.cc (modified) * code/trunk/src/libraries/core/command/Executor.h (modified) * code/trunk/src/libraries/core/command/ExecutorPtr.h (modified) * code/trunk/src/libraries/core/command/Functor.h (modified) * code/trunk/src/libraries/core/command/FunctorPtr.h (modified) * code/trunk/src/libraries/core/command/IOConsole.h (modified) * code/trunk/src/libraries/core/command/IOConsolePOSIX.h (modified) * code/trunk/src/libraries/core/command/IOConsoleWindows.h (modified) * code/trunk/src/libraries/core/command/IRC.cc (modified) * code/trunk/src/libraries/core/command/IRC.h (modified) * code/trunk/src/libraries/core/command/Shell.cc (modified) * code/trunk/src/libraries/core/command/Shell.h (modified) * code/trunk/src/libraries/core/command/TclBind.cc (modified) * code/trunk/src/libraries/core/command/TclBind.h (modified) * code/trunk/src/libraries/core/command/TclThreadList.h (modified) * code/trunk/src/libraries/core/command/TclThreadManager.cc (modified) * code/trunk/src/libraries/core/command/TclThreadManager.h (modified) * code/trunk/src/libraries/core/input/Button.cc (modified) * code/trunk/src/libraries/core/input/InputCommands.cc (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/InputState.h (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/network/ClientInformation.cc (modified) * code/trunk/src/libraries/network/GamestateClient.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/libraries/tools/ResourceCollection.cc (modified) * code/trunk/src/libraries/tools/ResourceCollection.h (modified) * code/trunk/src/libraries/tools/ResourceLocation.cc (modified) * code/trunk/src/libraries/tools/ResourceLocation.h (modified) * code/trunk/src/libraries/tools/Timer.cc (modified) * code/trunk/src/libraries/tools/Timer.h (modified) * code/trunk/src/libraries/util/Clipboard.cc (modified) * code/trunk/src/libraries/util/Clipboard.h (modified) * code/trunk/src/libraries/util/Clock.cc (modified) * code/trunk/src/libraries/util/Clock.h (modified) * code/trunk/src/libraries/util/Convert.cc (modified) * code/trunk/src/libraries/util/Convert.h (modified) * code/trunk/src/libraries/util/Debug.h (modified) * code/trunk/src/libraries/util/Exception.cc (modified) * code/trunk/src/libraries/util/Exception.h (modified) * code/trunk/src/libraries/util/ExprParser.h (modified) * code/trunk/src/libraries/util/ImplicitConversion.h (modified) * code/trunk/src/libraries/util/Math.cc (modified) * code/trunk/src/libraries/util/Math.h (modified) * code/trunk/src/libraries/util/MathConvert.h (modified) * code/trunk/src/libraries/util/MultiType.cc (modified) * code/trunk/src/libraries/util/MultiType.h (modified) * code/trunk/src/libraries/util/MultiTypeValue.h (modified) * code/trunk/src/libraries/util/OrxAssert.h (modified) * code/trunk/src/libraries/util/OrxEnum.h (modified) * code/trunk/src/libraries/util/OutputHandler.cc (modified) * code/trunk/src/libraries/util/OutputHandler.h (modified) * code/trunk/src/libraries/util/Scope.cc (modified) * code/trunk/src/libraries/util/Scope.h (modified) * code/trunk/src/libraries/util/ScopedSingletonManager.cc (modified) * code/trunk/src/libraries/util/ScopedSingletonManager.h (modified) * code/trunk/src/libraries/util/Serialise.h (modified) * code/trunk/src/libraries/util/SharedPtr.cc (modified) * code/trunk/src/libraries/util/SharedPtr.h (modified) * code/trunk/src/libraries/util/SignalHandler.h (modified) * code/trunk/src/libraries/util/Singleton.h (modified) * code/trunk/src/libraries/util/SmallObjectAllocator.cc (modified) * code/trunk/src/libraries/util/SmallObjectAllocator.h (modified) * code/trunk/src/libraries/util/StringUtils.cc (modified) * code/trunk/src/libraries/util/StringUtils.h (modified) * code/trunk/src/libraries/util/SubString.cc (modified) * code/trunk/src/libraries/util/SubString.h (modified) * code/trunk/src/libraries/util/TriBool.h (modified) * code/trunk/src/libraries/util/VA_NARGS.h (modified) * code/trunk/src/libraries/util/mbool.h (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/notifications/Notification.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) * code/trunk/src/modules/objects/Planet.cc (modified) * code/trunk/src/modules/overlays/FadeoutText.h (modified) * code/trunk/src/modules/overlays/GUIOverlay.cc (modified) * code/trunk/src/modules/overlays/GUIOverlay.h (modified) * code/trunk/src/modules/overlays/OverlayText.cc (modified) * code/trunk/src/modules/overlays/OverlayText.h (modified) * code/trunk/src/modules/overlays/hud/HUDBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.h (modified) * code/trunk/src/modules/overlays/stats/Scoreboard.cc (modified) * code/trunk/src/modules/overlays/stats/Scoreboard.h (modified) * code/trunk/src/modules/overlays/stats/Stats.cc (modified) * code/trunk/src/modules/overlays/stats/Stats.h (modified) * code/trunk/src/modules/pickup/DroppedPickup.cc (modified) * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/PickupCollection.cc (modified) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/questsystem/AddQuest.cc (deleted) * code/trunk/src/modules/questsystem/AddQuest.h (deleted) * code/trunk/src/modules/questsystem/AddQuestHint.cc (deleted) * code/trunk/src/modules/questsystem/AddQuestHint.h (deleted) * code/trunk/src/modules/questsystem/AddReward.cc (deleted) * code/trunk/src/modules/questsystem/AddReward.h (deleted) * code/trunk/src/modules/questsystem/CMakeLists.txt (modified) * code/trunk/src/modules/questsystem/ChangeQuestStatus.cc (deleted) * code/trunk/src/modules/questsystem/ChangeQuestStatus.h (deleted) * code/trunk/src/modules/questsystem/CompleteQuest.cc (deleted) * code/trunk/src/modules/questsystem/CompleteQuest.h (deleted) * code/trunk/src/modules/questsystem/FailQuest.cc (deleted) * code/trunk/src/modules/questsystem/FailQuest.h (deleted) * code/trunk/src/modules/questsystem/GlobalQuest.h (modified) * code/trunk/src/modules/questsystem/LocalQuest.h (modified) * code/trunk/src/modules/questsystem/Quest.cc (modified) * code/trunk/src/modules/questsystem/QuestDescription.h (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.h (modified) * code/trunk/src/modules/questsystem/QuestHint.h (modified) * code/trunk/src/modules/questsystem/QuestItem.cc (modified) * code/trunk/src/modules/questsystem/QuestItem.h (modified) * code/trunk/src/modules/questsystem/QuestListener.h (modified) * code/trunk/src/modules/questsystem/QuestNotification.cc (modified) * code/trunk/src/modules/questsystem/effects (copied) * code/trunk/src/modules/questsystem/effects/AddQuest.cc (copied) * code/trunk/src/modules/questsystem/effects/AddQuest.h (copied) * code/trunk/src/modules/questsystem/effects/AddQuestHint.cc (copied) * code/trunk/src/modules/questsystem/effects/AddQuestHint.h (copied) * code/trunk/src/modules/questsystem/effects/AddReward.cc (copied) * code/trunk/src/modules/questsystem/effects/AddReward.h (copied) * code/trunk/src/modules/questsystem/effects/CMakeLists.txt (copied) * code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.cc (copied) * code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.h (copied) * code/trunk/src/modules/questsystem/effects/CompleteQuest.cc (copied) * code/trunk/src/modules/questsystem/effects/CompleteQuest.h (copied) * code/trunk/src/modules/questsystem/effects/FailQuest.cc (copied) * code/trunk/src/modules/questsystem/effects/FailQuest.h (copied) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/gamestates/GSServer.cc (modified) * code/trunk/src/orxonox/graphics/Light.h (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) * code/trunk/src/orxonox/overlays/GUISheet.cc (modified) * code/trunk/src/orxonox/overlays/GUISheet.h (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.h (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.h (modified) merged doc branch back to trunk Wed, 01 Sep 2010 22:24:49 GMT adrfried [7321] * code/trunk/src/libraries/network/packet/ServerInformation.cc (modified) free some memory Wed, 01 Sep 2010 12:51:48 GMT rgrieder [7314] * code/trunk/src/libraries/network/packet/CMakeLists.txt (modified) * code/trunk/src/libraries/network/synchronisable/CMakeLists.txt (modified) Adjusted header file lists in network. Tue, 31 Aug 2010 22:04:57 GMT rgrieder [7305] * code/trunk/src/libraries/util/Convert.h (modified) * code/trunk/src/libraries/util/ImplicitConversion.h (moved) File rename. Tue, 31 Aug 2010 21:31:37 GMT dafrick [7301] * code/trunk/src/libraries/core/EventIncludes.h (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.h (modified) * code/trunk/src/modules/objects/triggers/EventMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/EventMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.h (modified) Improving documentation for MultiTriggers, also some small bugfixes, ...