# # ChangeLog for code/trunk/src/modules # # Generated by Trac 1.0.9 # Nov 24, 2024, 2:45:27 PM Wed, 24 Aug 2011 12:57:53 GMT dafrick [8864] * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/items/HealthPickup.cc (modified) * code/trunk/src/orxonox/pickup/PickupIdentifier.cc (modified) Improving output. Mon, 22 Aug 2011 22:58:21 GMT landauf [8859] * code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.h (modified) fixed build for MSVC: "only static const integral data members can be ... 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, 22 Aug 2011 13:05:26 GMT dafrick [8855] * 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/WeaponsPrereqs.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/CMakeLists.txt (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/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) Cleaning up game immersion. Roughly documenting weapons module. Wed, 20 Jul 2011 21:27:45 GMT dafrick [8767] * 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/objects/SpaceBoundaries.cc (modified) * code/trunk/src/modules/objects/SpaceBoundaries.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/weapons/projectiles/BasicProjectile.cc (modified) Some cleanup... Sat, 09 Jul 2011 17:45:14 GMT landauf [8738] * code/trunk/src/modules/overlays/hud/HUDRadar.cc (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/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) added "scale" for radar viewables. scale is relative, 1.0 means ... Sat, 09 Jul 2011 10:05:56 GMT landauf [8737] * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) fixed radar flashing red after killing an enemy with the steerable rocket 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 ... Sun, 03 Jul 2011 15:42:19 GMT dafrick [8727] * code/trunk/data/levels/templates/spaceshipAssff.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff2.oxt (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.h (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/items/MultiStateEngine.cc (modified) * code/trunk/src/orxonox/items/MultiStateEngine.h (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Cleaning up in SpaceShip and Engine. Fixed several bugs. Kicked ... Mon, 27 Jun 2011 08:45:15 GMT dafrick [8713] * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.h (modified) Cleaning up ShrinkPickup. 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 ... Thu, 12 May 2011 15:20:25 GMT rgrieder [8471] * code/trunk/src/modules/portals/PortalEndPoint.cc (modified) Fixed possible bug (avoid using 'this' in the initialiser list unless ... Thu, 12 May 2011 14:50:23 GMT rgrieder [8469] * code/trunk/src/modules/portals/PortalsPrereqs.h (modified) Fixed trunk. Thu, 12 May 2011 11:51:18 GMT FelixSchulthess [8457] * code/trunk (modified) * code/trunk/data/levels/portals.oxw (copied) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.h (modified) * code/trunk/src/modules/portals (copied) * code/trunk/src/modules/portals/CMakeLists.txt (copied) * code/trunk/src/modules/portals/PortalEndPoint.cc (copied) * code/trunk/src/modules/portals/PortalEndPoint.h (copied) * code/trunk/src/modules/portals/PortalLink.cc (copied) * code/trunk/src/modules/portals/PortalLink.h (copied) * code/trunk/src/modules/portals/PortalsPrecompiledHeaders.h (copied) * code/trunk/src/modules/portals/PortalsPrereqs.h (copied) merged portals branch into trunk Sat, 07 May 2011 21:20:28 GMT dafrick [8415] * code/trunk/src/modules/designtools/ScreenshotManager.cc (modified) AnD so should the comment say. ;) Sat, 07 May 2011 21:19:45 GMT dafrick [8414] * code/trunk/src/modules/designtools/ScreenshotManager.cc (modified) ScreenshotManager with gridSize = 1 works again. Sat, 07 May 2011 18:43:37 GMT dafrick [8413] * code/trunk/src/modules/designtools/ScreenshotManager.cc (modified) * code/trunk/src/modules/designtools/ScreenshotManager.h (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.cc (modified) This should make the ScreenshotManager a lot more memory efficient. Thu, 05 May 2011 19:11:46 GMT dafrick [8406] * code/trunk/src/modules/designtools/ScreenshotManager.cc (modified) Quick fix for ScreenshotManager, such that it only needs memory when ... Tue, 03 May 2011 19:46:30 GMT youngk [8397] * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) Added Newtonian Gravitation to the selection of force fields. 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 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 Fri, 22 Apr 2011 19:28:56 GMT dafrick [8305] * code/trunk/src/modules/pickup/PickupCollection.cc (modified) Fixing another potential memory leak. Fri, 22 Apr 2011 15:59:40 GMT dafrick [8297] * code/trunk/src/modules/designtools/ScreenshotManager.cc (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.cc (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.cc (modified) Possible bug fix in PickupCarrier. Tue, 12 Apr 2011 15:10:26 GMT rgrieder [8234] * code/trunk/src/modules/designtools/SkyboxGenerator.cc (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) Removed 6 MSVC warnings about conversions. 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 19:24:36 GMT dafrick [8220] * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) Adding some default keybindings. Sat, 09 Apr 2011 13:33:06 GMT dafrick [8213] * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (modified) * code/trunk/data/levels/theTimeMachine.oxw (modified) * code/trunk/doc/api/groups/Triggers.dox (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/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/Trigger.cc (modified) * code/trunk/src/modules/objects/triggers/Trigger.h (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.h (modified) Adding changes made to DistanceTrigger also in trunk. Also ... Wed, 06 Apr 2011 09:12:38 GMT dafrick [8193] * code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.h (modified) Resolving bug in MultiTrigger. Sun, 03 Apr 2011 17:56:47 GMT jo [8178] * code/trunk (modified) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/lastTeamStanding.oxw (copied) * code/trunk/data/levels/lastTeamStandingII.oxw (copied) * code/trunk/data/overlays/lastManStandingHUD.oxo (modified) * code/trunk/data/overlays/lastTeamStandingHUD.oxo (copied) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/GametypeStatus.cc (modified) * code/trunk/src/modules/overlays/hud/GametypeStatus.h (modified) * code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.cc (copied) * code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.h (copied) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (copied) * code/trunk/src/orxonox/gametypes/LastTeamStanding.h (copied) Merged lastmastanding3 into trunk. There's an xml parsing error that ... 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, 17 Feb 2011 23:08:00 GMT landauf [7911] * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) Pong gametype should delete the objects it created 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 22:21:33 GMT landauf [7896] * code/trunk/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) actually I believe the condition should be the other way round ... Mon, 14 Feb 2011 22:14:46 GMT landauf [7895] * code/trunk/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) implemented instant reloading of rocket munition because this was a ... Mon, 14 Feb 2011 14:31:53 GMT landauf [7886] * code/trunk/src/modules/pong/PongBall.cc (modified) simplification Mon, 14 Feb 2011 14:27:56 GMT landauf [7885] * code/trunk/src/modules/pong/PongBall.cc (modified) * code/trunk/src/modules/pong/PongBall.h (modified) fixed minor memory leak Sun, 13 Feb 2011 20:52:42 GMT landauf [7880] * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.h (modified) radar doesn't abort if owner is missing radar works with all ... Sat, 12 Feb 2011 14:08:59 GMT landauf [7865] * code/trunk/data/levels/pong.oxw (moved) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) renamed pong level, added a bot, and changed the pong gametype to ... Thu, 10 Feb 2011 22:46:07 GMT landauf [7852] * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/pong/PongBall.cc (modified) * code/trunk/src/modules/pong/PongBall.h (modified) fixed crash in Pong gametype if the game was ended right after the ... Thu, 10 Feb 2011 17:05:08 GMT landauf [7848] * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) fixed "sound volume out of range" warning when firing a rocked. max ... Thu, 10 Feb 2011 15:59:00 GMT landauf [7846] * code/trunk/src/modules/weapons/WeaponsPrereqs.h (modified) * code/trunk/src/modules/weapons/munitions/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/munitions/RocketMunition.cc (added) * code/trunk/src/modules/weapons/munitions/RocketMunition.h (added) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) fixed "No munition class defined in WeaponMode" warning: you have to ... 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, 26 Nov 2010 12:40:00 GMT dafrick [7678] * code/trunk/src/modules/objects/ForceField.h (modified) Adding documentation for invertedSphere ForceField. Fri, 26 Nov 2010 12:25:56 GMT dafrick [7677] * code/trunk/data/levels/The Time Machine.oxw (modified) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) Adding yet another class of ForceFields and using it in The Time Machine. Fri, 26 Nov 2010 07:44:48 GMT dafrick [7676] * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) Some documentation and simplification Thu, 25 Nov 2010 23:01:53 GMT dafrick [7674] * code/trunk/data/levels/The Time Machine.oxw (modified) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) Resolving some stupid bugs and some adding some minor improvements. Thu, 25 Nov 2010 22:24:50 GMT dafrick [7673] * code/trunk/data/levels/The Time Machine.oxw (modified) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) * code/trunk/src/orxonox/infos/Bot.cc (modified) Documenting and extending ForceField. A little cleaning up in The ... Thu, 18 Nov 2010 20:54:39 GMT rgrieder [7655] * code/trunk (modified) * code/trunk/data/levels/gametype_asteroids.oxw (modified) * code/trunk/data/levels/gametype_dynamicmatch.oxw (modified) * code/trunk/data/levels/gametype_lastmanstanding.oxw (copied) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/test_swallow.oxw (modified) * code/trunk/data/overlays/dynamicmatchhud.oxo (modified) * code/trunk/data/overlays/lastmanstandinghud.oxo (copied) * code/trunk/src/modules/notifications/Notification.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/LastManStandingInfos.cc (copied) * code/trunk/src/modules/overlays/hud/LastManStandingInfos.h (copied) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/gametypes/Asteroids.cc (modified) * code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (copied) * code/trunk/src/orxonox/gametypes/LastManStanding.h (copied) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) Merged lastmanstanding back to trunk. Thu, 18 Nov 2010 20:49:55 GMT rgrieder [7654] * code/trunk (modified) * code/trunk/data/levels/gametype_lastmanstanding.oxw (deleted) * code/trunk/data/overlays/lastmanstandinghud.oxo (deleted) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/LastManStandingInfos.cc (deleted) * code/trunk/src/modules/overlays/hud/LastManStandingInfos.h (deleted) * code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (deleted) * code/trunk/src/orxonox/gametypes/LastManStanding.h (deleted) Reverted attempt to merge lastmanstanding branch. Thu, 18 Nov 2010 20:37:19 GMT jo [7653] * code/trunk (modified) * code/trunk/data/levels/gametype_lastmanstanding.oxw (added) * code/trunk/data/overlays/lastmanstandinghud.oxo (added) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/LastManStandingInfos.cc (added) * code/trunk/src/modules/overlays/hud/LastManStandingInfos.h (added) * code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (added) * code/trunk/src/orxonox/gametypes/LastManStanding.h (added) initial upload Thu, 18 Nov 2010 19:22:04 GMT landauf [7652] * code/trunk/src/modules/objects/triggers/TriggerBase.cc (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.h (modified) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) eol-style native Sat, 30 Oct 2010 11:54:49 GMT dafrick [7601] * code/trunk/doc/api/Groups.dox (modified) * code/trunk/src/modules/objects/Attacher.h (modified) * code/trunk/src/modules/objects/ForceField.h (modified) * code/trunk/src/modules/objects/ObjectsPrereqs.h (modified) * code/trunk/src/modules/objects/Planet.h (modified) * code/trunk/src/modules/objects/Script.h (modified) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified) * code/trunk/src/modules/objects/eventsystem/EventDispatcher.h (modified) * code/trunk/src/modules/objects/eventsystem/EventFilter.h (modified) * code/trunk/src/modules/objects/eventsystem/EventListener.h (modified) * code/trunk/src/modules/objects/eventsystem/EventName.h (modified) * code/trunk/src/modules/objects/eventsystem/EventTarget.h (modified) * code/trunk/src/modules/objects/triggers/CMakeLists.txt (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 (added) * code/trunk/src/modules/objects/triggers/TriggerBase.h (added) * code/trunk/src/orxonox/interfaces/PlayerTrigger.h (modified) Adding all classes in modules/objects to Objects module (in doxygen). ... Sun, 17 Oct 2010 20:50:43 GMT dafrick [7552] * code/trunk/doc/api/Groups.dox (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/NotificationQueue.h (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified) * code/trunk/src/modules/notifications/dispatchers/SimpleNotification.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.h (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.h (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.h (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/orxonox/interfaces/NotificationListener.h (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) * code/trunk/src/orxonox/items/Engine.h (modified) Resolving some TODOs and doing some additional cleanup. Almost done ... Sun, 17 Oct 2010 19:40:53 GMT dafrick [7551] * code/trunk/doc/api/Groups.dox (modified) * code/trunk/doc/api/images/pickupmodule.png (added) * code/trunk/src/modules/pickup/items/HealthPickup.h (modified) * code/trunk/src/orxonox/pickup/PickupIdentifier.h (modified) Moved documentation for pickup module from wiki to doxygen. Sat, 16 Oct 2010 12:18:45 GMT dafrick [7549] * code/trunk/src/modules/pickup/DroppedPickup.cc (modified) * code/trunk/src/modules/pickup/DroppedPickup.h (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) Resolving some more TODO's. Sat, 16 Oct 2010 11:22:15 GMT dafrick [7548] * 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/SpeedPickup.cc (modified) * code/trunk/src/modules/questsystem/QuestHint.cc (modified) Resolving some TODO's. Sat, 16 Oct 2010 10:37:09 GMT dafrick [7547] * code/trunk/data/levels/templates/pickup_representation_templates.oxt (modified) * code/trunk/src/modules/pickup/CollectiblePickup.h (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.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.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/SpeedPickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.h (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.cc (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.h (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/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/pickup/PickupIdentifier.h (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) Documenting and cleanup. Fri, 15 Oct 2010 06:43:02 GMT dafrick [7546] * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) Ok, this should finally do it. 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, 15 Oct 2010 06:14:03 GMT dafrick [7544] * code/trunk/data/levels/templates/pickup_representation_templates.oxt (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.h (modified) Fixing bug I introduced. Thu, 14 Oct 2010 10:55:59 GMT dafrick [7541] * 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) Some more documentation. Thu, 14 Oct 2010 09:20:16 GMT dafrick [7540] * 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) Some more documenting. Wed, 13 Oct 2010 20:57:13 GMT dafrick [7539] * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupRepresentation.h (modified) Some cleanup in PickupManager. Wed, 13 Oct 2010 09:35:18 GMT dafrick [7533] * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/src/modules/pickup/CollectiblePickup.h (modified) * code/trunk/src/modules/pickup/DroppedPickup.h (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/PickupCollectionIdentifier.cc (modified) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.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/items/MetaPickup.cc (modified) * code/trunk/src/modules/pickup/items/MetaPickup.h (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * 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) Documenting in pickups module. Cleaning up in PickupManager. ... Tue, 12 Oct 2010 18:33:58 GMT dafrick [7531] * code/trunk/src/modules/pickup/PickupManager.cc (modified) Fixing bug, that caused segfault in pickups with multiplayer. Wed, 06 Oct 2010 06:00:40 GMT dafrick [7504] * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (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/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/interfaces/CMakeLists.txt (modified) * code/trunk/src/orxonox/interfaces/PickupListener.cc (added) * code/trunk/src/orxonox/interfaces/PickupListener.h (added) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) Pickups module is now (from what I can tell after some basic testing) ... Tue, 28 Sep 2010 15:31:59 GMT dafrick [7494] * code/trunk/src/modules/pickup/CollectiblePickup.cc (modified) * code/trunk/src/modules/pickup/CollectiblePickup.h (modified) * code/trunk/src/modules/pickup/DroppedPickup.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/PickupCollectionIdentifier.cc (modified) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.h (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) * code/trunk/src/orxonox/interfaces/CMakeLists.txt (modified) * code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.cc (added) * code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) * code/trunk/src/orxonox/pickup/PickupIdentifier.cc (modified) * code/trunk/src/orxonox/pickup/PickupIdentifier.h (modified) Some documenting and cleaning up/re-organization in pickups module. Mon, 27 Sep 2010 17:53:30 GMT dafrick [7493] * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/pickup/CollectiblePickup.h (modified) * code/trunk/src/modules/pickup/DroppedPickup.cc (modified) * code/trunk/src/modules/pickup/DroppedPickup.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/items/HealthPickup.h (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.h (modified) * code/trunk/src/modules/pickup/items/MetaPickup.h (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.h (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.h (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) Fixing small bug in Script (regarding number of executions). Fixed ... Fri, 24 Sep 2010 14:01:04 GMT dafrick [7489] * code/trunk/doc/api/Groups.dox (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/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/dispatchers/CommandNotification.cc (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.h (modified) Mostly more documentation. Fri, 24 Sep 2010 10:01:57 GMT dafrick [7488] * code/trunk/doc/api/Groups.dox (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/NotificationQueue.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified) * code/trunk/src/modules/notifications/dispatchers/SimpleNotification.h (modified) Some more documentation. Making NotificationManager Root scope, ... Thu, 23 Sep 2010 21:54:16 GMT dafrick [7486] * code/trunk/src/modules/notifications/Notification.h (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.h (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/Script.h (modified) Cleanup in Script. Some more documenting in Notifications module. Thu, 23 Sep 2010 11:00:42 GMT dafrick [7484] * code/trunk/doc/api/Groups.dox (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/NotificationQueue.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.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.h (modified) * code/trunk/src/modules/objects/Script.h (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.h (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.h (modified) Doing some documentation. Thu, 23 Sep 2010 09:21:01 GMT dafrick [7483] * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/Script.h (modified) Removing some debug output and come minor cleaning up. Thu, 23 Sep 2010 09:12:22 GMT dafrick [7482] * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/Script.h (modified) Fixed Script class. Works now without having to rely on guessing how ... Tue, 21 Sep 2010 21:15:44 GMT dafrick [7474] * code/trunk/data/levels/notifications.oxw (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/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/objects/Script.cc (modified) * code/trunk/src/modules/objects/Script.h (modified) * code/trunk/src/modules/questsystem/CMakeLists.txt (modified) * code/trunk/src/modules/questsystem/QuestDescription.cc (modified) * code/trunk/src/modules/questsystem/QuestDescription.h (modified) * code/trunk/src/modules/questsystem/QuestNotification.cc (deleted) * code/trunk/src/modules/questsystem/QuestNotification.h (deleted) * code/trunk/src/modules/questsystem/QuestsystemPrereqs.h (modified) * code/trunk/src/orxonox/PlayerManager.cc (modified) Synchronizing Notifications. In the course of that, notifications ... Fri, 17 Sep 2010 19:41:17 GMT dafrick [7463] * code/trunk/data/levels/Fight in our Back.oxw (modified) * code/trunk/data/levels/Quest_PirateAttack.oxw (modified) * code/trunk/data/levels/notifications.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/src/modules/notifications/Notification.cc (modified) * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/Script.h (modified) Fixing "bug", that caused crash in dedicated mode. Script object can ... Fri, 17 Sep 2010 18:49:06 GMT dafrick [7462] * code/trunk/src/modules/notifications/Notification.cc (modified) * code/trunk/src/modules/questsystem/QuestListener.cc (modified) Small changes in Notification to work towards synchronizing them... Wed, 15 Sep 2010 17:29:16 GMT dafrick [7456] * code/trunk/data/gui/scripts/QuestGUI.lua (modified) * code/trunk/doc/api/Groups.dox (modified) * code/trunk/doc/api/images/questsystem.png (added) * 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.h (modified) * code/trunk/src/modules/notifications/NotificationQueue.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/pickup/CollectiblePickup.h (modified) * code/trunk/src/modules/pickup/DroppedPickup.h (modified) * code/trunk/src/modules/pickup/Pickup.h (modified) * code/trunk/src/modules/pickup/PickupCollection.h (modified) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.h (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) * code/trunk/src/modules/pickup/items/DronePickup.h (modified) * code/trunk/src/modules/pickup/items/HealthPickup.h (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.h (modified) * code/trunk/src/modules/pickup/items/MetaPickup.h (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.h (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.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/QuestNotification.cc (modified) * code/trunk/src/modules/questsystem/QuestNotification.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/orxonox/interfaces/PickupCarrier.h (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) * code/trunk/src/orxonox/pickup/PickupIdentifier.h (modified) Reviewing documentation fo Questsystem, moving documentation fully ... 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 14:16:10 GMT dafrick [7412] * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) Fixed one (hopefully) final bug in Notifications. Sat, 11 Sep 2010 13:17:39 GMT dafrick [7410] * 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/Script.cc (modified) Removing some warnings (both compiler and doxygen). Sat, 11 Sep 2010 13:16:38 GMT rgrieder [7409] * code/trunk/src/modules/notifications/NotificationsPrecompiledHeaders.h (modified) * code/trunk/src/modules/pickup/PickupPrecompiledHeaders.h (modified) Added some standard header to PCH file in pickup and notifications. Sat, 11 Sep 2010 13:09:48 GMT dafrick [7408] * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/objects/Script.cc (modified) Did not get all xmlElements... Sat, 11 Sep 2010 12:52:59 GMT dafrick [7407] * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.h (modified) * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/Script.h (modified) xmlElement -> xmlelement Sat, 11 Sep 2010 12:50:21 GMT dafrick [7406] * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/Script.h (modified) Fixing so that libobjects is loaded again... Sat, 11 Sep 2010 12:42:47 GMT dafrick [7404] * code/trunk/data/levels/Fight in our Back.oxw (modified) * code/trunk/data/levels/Quest_PirateAttack.oxw (modified) * code/trunk/data/levels/notifications.oxw (added) * 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/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.h (modified) * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/Script.h (modified) Adding new level notifications.oxw, to "showcase", or at this stage ... 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 Mon, 06 Sep 2010 19:34:51 GMT rgrieder [7368] * code/trunk (modified) * code/trunk/data/overlays/hudtamplates_fps.oxo (modified) * code/trunk/data/overlays/hudtemplates3.oxo (modified) * code/trunk/data/overlays/underattackhud.oxo (modified) * code/trunk/data/particle/smoke1.particle (modified) * code/trunk/src/modules/overlays/hud/HUDBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) Merged png2 branch back to trunk. 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, ... Tue, 31 Aug 2010 01:51:37 GMT landauf [7285] * code/trunk/cmake/tools/FindPOCO.cmake (modified) * code/trunk/data/levels/includes/weaponsettings_swallow.oxi (modified) * code/trunk/data/levels/templates/spaceship_swallow.oxt (modified) * code/trunk/data/levels/test_swallow.oxw (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.h (modified) * code/trunk/src/modules/notifications/NotificationsPrecompiledHeaders.h (modified) * code/trunk/src/modules/notifications/NotificationsPrereqs.h (modified) * code/trunk/src/modules/notifications/dispatchers/CMakeLists.txt (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/pickup/CollectiblePickup.cc (modified) * code/trunk/src/modules/pickup/CollectiblePickup.h (modified) added eol-style native for some files. note: there are another 6 ... Tue, 31 Aug 2010 01:37:40 GMT landauf [7284] * code/trunk (modified) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified) * code/trunk/data/levels/fps_test.oxw (modified) * code/trunk/data/levels/old/physicstest2.oxw (modified) * code/trunk/data/levels/presentation_FS10.oxw (modified) * code/trunk/data/levels/presentation_FS10_ed.oxw (modified) * code/trunk/data/tcl/irk/lib/irkreceive.tcl (modified) * code/trunk/src/libraries/core/ArgumentCompleter.h (deleted) * code/trunk/src/libraries/core/ArgumentCompletionFunctions.cc (deleted) * code/trunk/src/libraries/core/ArgumentCompletionFunctions.h (deleted) * code/trunk/src/libraries/core/ArgumentCompletionListElement.h (deleted) * 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/CommandEvaluation.cc (deleted) * code/trunk/src/libraries/core/CommandEvaluation.h (deleted) * code/trunk/src/libraries/core/CommandExecutor.cc (deleted) * code/trunk/src/libraries/core/CommandExecutor.h (deleted) * 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.cc (modified) * code/trunk/src/libraries/core/ConsoleCommand.cc (deleted) * code/trunk/src/libraries/core/ConsoleCommand.h (deleted) * code/trunk/src/libraries/core/ConsoleCommandCompilation.cc (deleted) * code/trunk/src/libraries/core/ConsoleCommandCompilation.h (deleted) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/CorePrereqs.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/Executor.cc (deleted) * code/trunk/src/libraries/core/Executor.h (deleted) * code/trunk/src/libraries/core/Functor.h (deleted) * 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/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/IOConsole.cc (deleted) * code/trunk/src/libraries/core/IOConsole.h (deleted) * code/trunk/src/libraries/core/IRC.cc (deleted) * code/trunk/src/libraries/core/IRC.h (deleted) * 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/LuaState.cc (modified) * code/trunk/src/libraries/core/LuaState.h (modified) * code/trunk/src/libraries/core/ScopedSingletonManager.cc (deleted) * code/trunk/src/libraries/core/ScopedSingletonManager.h (deleted) * code/trunk/src/libraries/core/Shell.cc (deleted) * code/trunk/src/libraries/core/Shell.h (deleted) * code/trunk/src/libraries/core/TclBind.cc (deleted) * code/trunk/src/libraries/core/TclBind.h (deleted) * code/trunk/src/libraries/core/TclThreadList.h (deleted) * code/trunk/src/libraries/core/TclThreadManager.cc (deleted) * code/trunk/src/libraries/core/TclThreadManager.h (deleted) * code/trunk/src/libraries/core/Thread.cc (modified) * code/trunk/src/libraries/core/Thread.h (modified) * code/trunk/src/libraries/core/ThreadPool.cc (modified) * code/trunk/src/libraries/core/ThreadPool.h (modified) * code/trunk/src/libraries/core/WeakPtr.h (modified) * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/core/command (copied) * code/trunk/src/libraries/core/command/ArgumentCompleter.h (copied) * code/trunk/src/libraries/core/command/ArgumentCompletionFunctions.cc (copied) * code/trunk/src/libraries/core/command/ArgumentCompletionFunctions.h (copied) * code/trunk/src/libraries/core/command/ArgumentCompletionListElement.h (copied) * code/trunk/src/libraries/core/command/CMakeLists.txt (copied) * code/trunk/src/libraries/core/command/CommandEvaluation.cc (copied) * code/trunk/src/libraries/core/command/CommandEvaluation.h (copied) * code/trunk/src/libraries/core/command/CommandExecutor.cc (copied) * code/trunk/src/libraries/core/command/CommandExecutor.h (copied) * code/trunk/src/libraries/core/command/ConsoleCommand.cc (copied) * code/trunk/src/libraries/core/command/ConsoleCommand.h (copied) * code/trunk/src/libraries/core/command/ConsoleCommandCompilation.cc (copied) * code/trunk/src/libraries/core/command/ConsoleCommandCompilation.h (copied) * code/trunk/src/libraries/core/command/Executor.cc (copied) * code/trunk/src/libraries/core/command/Executor.h (copied) * code/trunk/src/libraries/core/command/ExecutorPtr.h (copied) * code/trunk/src/libraries/core/command/Functor.h (copied) * code/trunk/src/libraries/core/command/FunctorPtr.h (copied) * code/trunk/src/libraries/core/command/IOConsole.cc (copied) * code/trunk/src/libraries/core/command/IOConsole.h (copied) * code/trunk/src/libraries/core/command/IRC.cc (copied) * code/trunk/src/libraries/core/command/IRC.h (copied) * code/trunk/src/libraries/core/command/Shell.cc (copied) * code/trunk/src/libraries/core/command/Shell.h (copied) * code/trunk/src/libraries/core/command/TclBind.cc (copied) * code/trunk/src/libraries/core/command/TclBind.h (copied) * code/trunk/src/libraries/core/command/TclThreadList.h (copied) * code/trunk/src/libraries/core/command/TclThreadManager.cc (copied) * code/trunk/src/libraries/core/command/TclThreadManager.h (copied) * code/trunk/src/libraries/core/input/Button.cc (modified) * code/trunk/src/libraries/core/input/HalfAxis.cc (modified) * code/trunk/src/libraries/core/input/InputCommands.h (modified) * code/trunk/src/libraries/core/input/InputManager.cc (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/KeyBinderManager.cc (modified) * code/trunk/src/libraries/core/input/KeyBinderManager.h (modified) * code/trunk/src/libraries/core/input/KeyDetector.cc (modified) * code/trunk/src/libraries/core/input/KeyDetector.h (modified) * code/trunk/src/libraries/core/input/Mouse.cc (modified) * code/trunk/src/libraries/core/input/Mouse.h (modified) * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/ClientConnection.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/LANDiscovery.cc (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/synchronisable/Serialise.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/Math.cc (modified) * code/trunk/src/libraries/util/MultiType.h (modified) * code/trunk/src/libraries/util/OutputHandler.h (modified) * code/trunk/src/libraries/util/ScopedSingletonManager.cc (copied) * code/trunk/src/libraries/util/ScopedSingletonManager.h (copied) * code/trunk/src/libraries/util/SharedPtr.cc (copied) * code/trunk/src/libraries/util/SharedPtr.h (copied) * code/trunk/src/libraries/util/SmallObjectAllocator.cc (copied) * code/trunk/src/libraries/util/SmallObjectAllocator.h (copied) * 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/VA_NARGS.h (copied) * code/trunk/src/modules/designtools/ScreenshotManager.cc (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/objects/triggers/Trigger.cc (modified) * code/trunk/src/modules/overlays/OverlaysPrecompiledHeaders.h (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/trunk/src/modules/overlays/hud/GametypeStatus.cc (modified) * code/trunk/src/modules/overlays/hud/GametypeStatus.h (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/QuestsystemPrecompiledHeaders.h (modified) * code/trunk/src/modules/weapons/MuzzleFlash.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/ChatHistory.cc (modified) * code/trunk/src/orxonox/ChatInputHandler.cc (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/MoodManager.cc (modified) * code/trunk/src/orxonox/OrxonoxPrecompiledHeaders.h (modified) * code/trunk/src/orxonox/PlayerManager.cc (modified) * code/trunk/src/orxonox/Radar.cc (modified) * code/trunk/src/orxonox/Test.cc (modified) * code/trunk/src/orxonox/controllers/AIController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/DroneController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/gamestates/GSGraphics.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.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/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/trunk/src/orxonox/graphics/ParticleSpawner.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/overlays/OverlayGroup.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/WorldSound.cc (modified) * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) * code/trunk/src/orxonox/worldentities/BigExplosion.cc (modified) * code/trunk/src/orxonox/worldentities/ExplosionChunk.cc (modified) * code/trunk/src/orxonox/worldentities/MovableEntity.cc (modified) merged consolecommands3 branch back to trunk. note: the console ... Mon, 30 Aug 2010 18:07:38 GMT rgrieder [7271] * code/trunk/src/libraries/core/CorePrereqs.h (modified) * code/trunk/src/libraries/core/Event.cc (modified) * code/trunk/src/libraries/core/Identifier.h (modified) * code/trunk/src/libraries/core/Iterator.h (modified) * code/trunk/src/libraries/core/ObjectList.h (modified) * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/core/input/InputDevice.h (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.h (modified) There is no such word as "casted". Also inserted 4 static_casts and ... Tue, 24 Aug 2010 12:26:39 GMT dafrick [7210] * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/src/modules/notifications/NotificationsPrereqs.h (modified) * code/trunk/src/modules/notifications/dispatchers/CMakeLists.txt (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified) * code/trunk/src/modules/notifications/dispatchers/SimpleNotification.cc (added) * code/trunk/src/modules/notifications/dispatchers/SimpleNotification.h (added) Created new NotificationDispatcher. It just displays, upon being ... Tue, 24 Aug 2010 08:59:12 GMT dafrick [7209] * code/trunk/src/modules/pickup/PickupManager.cc (modified) Fixed little "bug", will have to be reviewed, when the pickup module ... Tue, 24 Aug 2010 07:49:54 GMT dafrick [7208] * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/Pickup.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/ShieldPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.h (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.h (modified) Removed Timer from Pickup, as this is no his core functionality. Mon, 23 Aug 2010 09:43:10 GMT dafrick [7206] * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) Cleaning up and documenting PickupManager. Also discovered and fixed ... Fri, 20 Aug 2010 19:55:50 GMT dafrick [7193] * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/src/modules/notifications/CMakeLists.txt (modified) * code/trunk/src/modules/notifications/Notification.cc (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (added) * code/trunk/src/modules/notifications/NotificationDispatcher.h (added) * code/trunk/src/modules/notifications/NotificationsPrereqs.h (modified) * code/trunk/src/modules/notifications/dispatchers (added) * code/trunk/src/modules/notifications/dispatchers/CMakeLists.txt (added) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (added) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (added) Added NotificationDispatcher, class that can, upon being triggered, ...