# # ChangeLog for code # # Generated by Trac 1.0.9 # Nov 25, 2024, 12:35:15 PM Mon, 08 Aug 2011 22:37:21 GMT landauf [8832] * code/branches/output/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/output/src/libraries/network/MasterServerComm.cc (modified) * code/branches/output/src/libraries/network/MasterServerComm.h (modified) * code/branches/output/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/output/src/libraries/network/Server.cc (modified) * code/branches/output/src/libraries/network/Server.h (modified) * code/branches/output/src/libraries/network/WANDiscovery.cc (modified) * code/branches/output/src/libraries/network/WANDiscovery.h (modified) Quick and dirty fix to un-singletonize WANDiscovery. It is now ... Mon, 08 Aug 2011 20:19:09 GMT landauf [8831] * code/branches/output/src/libraries/core/ConfigFileManager.cc (modified) * code/branches/output/src/libraries/core/command/Shell.cc (modified) * code/branches/output/src/libraries/util/output/BaseWriter.cc (modified) * code/branches/output/src/libraries/util/output/LogWriter.cc (modified) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) fixed wrong config value callback in Shell fixed bug in ... Sun, 07 Aug 2011 20:51:54 GMT landauf [8830] * code/branches/output/src/Orxonox.cc (modified) * code/branches/output/src/libraries/core/Core.cc (modified) * code/branches/output/src/libraries/core/GUIManager.cc (modified) * code/branches/output/src/libraries/core/Game.cc (modified) * code/branches/output/src/libraries/core/GraphicsManager.cc (modified) * code/branches/output/src/libraries/core/Language.cc (modified) * code/branches/output/src/libraries/core/Loader.cc (modified) * code/branches/output/src/libraries/util/Scope.h (modified) * code/branches/output/src/orxonox/Main.cc (modified) * code/branches/output/src/orxonox/gamestates/GSClient.cc (modified) * code/branches/output/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/output/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/output/src/orxonox/gamestates/GSMasterServer.cc (modified) * code/branches/output/src/orxonox/gamestates/GSServer.cc (modified) * code/branches/output/src/orxonox/sound/SoundManager.cc (modified) added some output (user and internal) throughout the initialization ... Sun, 07 Aug 2011 13:11:16 GMT landauf [8829] * code/branches/output/src/libraries/network/CMakeLists.txt (modified) * code/branches/output/src/libraries/network/ChatListener.cc (deleted) * code/branches/output/src/libraries/network/ChatListener.h (deleted) * code/branches/output/src/libraries/network/Client.cc (modified) * code/branches/output/src/libraries/network/Client.h (modified) * code/branches/output/src/libraries/network/Host.cc (modified) * code/branches/output/src/libraries/network/Host.h (modified) * code/branches/output/src/libraries/network/NetworkChatListener.h (added) * code/branches/output/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/output/src/libraries/network/Server.cc (modified) * code/branches/output/src/libraries/network/Server.h (modified) * code/branches/output/src/libraries/network/packet/Chat.cc (modified) * code/branches/output/src/libraries/network/packet/Chat.h (modified) * code/branches/output/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/output/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/output/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/branches/output/src/modules/overlays/hud/ChatOverlay.h (modified) * code/branches/output/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/output/src/orxonox/chat/CMakeLists.txt (modified) * code/branches/output/src/orxonox/chat/ChatHistory.cc (modified) * code/branches/output/src/orxonox/chat/ChatHistory.h (modified) * code/branches/output/src/orxonox/chat/ChatInputHandler.cc (modified) * code/branches/output/src/orxonox/chat/ChatInputHandler.h (modified) * code/branches/output/src/orxonox/chat/ChatListener.h (added) * code/branches/output/src/orxonox/chat/ChatManager.cc (added) * code/branches/output/src/orxonox/chat/ChatManager.h (added) * code/branches/output/src/orxonox/gametypes/Asteroids.cc (modified) * code/branches/output/src/orxonox/gametypes/Deathmatch.cc (modified) * code/branches/output/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/output/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/output/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/branches/output/src/orxonox/gametypes/UnderAttack.cc (modified) enhanced chat system. chat related code is now separated into ... Sat, 06 Aug 2011 16:33:55 GMT landauf [8828] * code/branches/output/src/orxonox/CMakeLists.txt (modified) * code/branches/output/src/orxonox/chat (added) * code/branches/output/src/orxonox/chat/CMakeLists.txt (added) * code/branches/output/src/orxonox/chat/ChatHistory.cc (moved) * code/branches/output/src/orxonox/chat/ChatHistory.h (moved) * code/branches/output/src/orxonox/chat/ChatInputHandler.cc (moved) * code/branches/output/src/orxonox/chat/ChatInputHandler.h (moved) moved chat related files to a new subdirectory Sat, 06 Aug 2011 13:42:38 GMT landauf [8827] * code/branches/output/src/libraries/network/Host.cc (modified) small fix in Host::isServer in agreement with Oli Sat, 06 Aug 2011 13:40:37 GMT landauf [8826] * code/branches/output/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/branches/output/src/orxonox/ChatHistory.cc (modified) * code/branches/output/src/orxonox/ChatInputHandler.cc (modified) display chat messages without sender without name (currently used for ... Sat, 06 Aug 2011 09:07:35 GMT landauf [8825] * code/branches/output/data/overlays/debug.oxo (modified) * code/branches/output/src/modules/overlays/hud/ChatOverlay.cc (modified) There's a bug in ogre 1.7 (?) causing the first text overlay with a ... Thu, 04 Aug 2011 21:54:03 GMT jo [8824] * code/branches/ai2/data/levels/missionOne.oxw (modified) Some updates to the level. Thu, 04 Aug 2011 10:51:24 GMT dafrick [8823] * code/branches/ai2/data/levels/missionOne.oxw (modified) * code/branches/ai2/src/modules/notifications/NotificationDispatcher.cc (modified) * code/branches/ai2/src/modules/notifications/NotificationDispatcher.h (modified) Forgot to change some debug stuff. ;) Wed, 03 Aug 2011 22:45:06 GMT landauf [8822] * code/branches/output/data/levels/presentationDM.oxw (modified) * code/branches/output/src/libraries/network/Host.cc (modified) * code/branches/output/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/output/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/output/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/branches/output/src/orxonox/gametypes/Asteroids.cc (modified) * code/branches/output/src/orxonox/gametypes/Deathmatch.cc (modified) * code/branches/output/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/output/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/output/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/branches/output/src/orxonox/gametypes/UnderAttack.cc (modified) Chat works again Removed console output for almost all gameplay ... Wed, 03 Aug 2011 22:09:03 GMT dafrick [8821] * code/branches/ai2/data/levels/missionOne.oxw (modified) * code/branches/ai2/src/modules/notifications/NotificationDispatcher.cc (modified) * code/branches/ai2/src/modules/notifications/NotificationDispatcher.h (modified) Adding broadcast functionality to NotificationDispatcher. Wed, 03 Aug 2011 21:28:06 GMT landauf [8820] * code/branches/output/data/levels/templates/FPS.oxt (modified) * code/branches/output/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/output/data/levels/templates/spaceshipAssff2.oxt (modified) * code/branches/output/data/levels/templates/spaceshipGhost.oxt (modified) * code/branches/output/data/levels/templates/spaceshipH2.oxt (modified) * code/branches/output/data/levels/templates/spaceshipHXY.oxt (modified) * code/branches/output/data/levels/templates/spaceshipHXYSL.oxt (modified) * code/branches/output/data/levels/templates/spaceshipImmTest.oxt (modified) * code/branches/output/data/levels/templates/spaceshipPirate.oxt (modified) * code/branches/output/data/levels/templates/spaceshipSwallow.oxt (modified) * code/branches/output/data/levels/templates/spaceshipTransporter.oxt (modified) * code/branches/output/data/levels/templates/spaceshipTransporterSL.oxt (modified) * code/branches/output/src/libraries/core/GraphicsManager.cc (modified) * code/branches/output/src/libraries/core/Loader.cc (modified) * code/branches/output/src/libraries/core/Loader.h (modified) * code/branches/output/src/orxonox/worldentities/WorldEntity.cc (modified) fixed some stuff that became visible after the recent changes in the ... Wed, 03 Aug 2011 19:54:19 GMT dafrick [8819] * code/branches/ai2/src/modules/pickup/PickupSpawner.cc (modified) Minor change in PickupSpawner, fixing possible cause for segfaults. Wed, 03 Aug 2011 18:56:26 GMT landauf [8817] * code/branches/output/src/libraries/network/LANDiscovery.cc (modified) * code/branches/output/src/libraries/network/LANDiscovery.h (modified) * code/branches/output/src/libraries/network/WANDiscoverable.cc (modified) * code/branches/output/src/libraries/network/WANDiscoverable.h (modified) * code/branches/output/src/libraries/network/WANDiscovery.cc (modified) * code/branches/output/src/libraries/network/WANDiscovery.h (modified) * code/branches/output/src/orxonox/graphics/AnimatedModel.cc (modified) * code/branches/output/src/orxonox/graphics/AnimatedModel.h (modified) corrected authors Tue, 02 Aug 2011 20:36:41 GMT landauf [8816] * code/branches/output/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) fixed bug in auto completion function Mon, 01 Aug 2011 22:15:08 GMT landauf [8814] * code/branches/output/data/overlays/OrxonoxLoading.overlay (deleted) OrxonoxLoading.overlay is not needed anymore (see r8813) Mon, 01 Aug 2011 18:42:26 GMT landauf [8812] * code/branches/output/src/Orxonox.cc (modified) * code/branches/output/src/OrxonoxConfig.h.in (modified) * code/branches/output/src/libraries/core/OrxonoxClass.h (modified) * code/branches/output/src/libraries/util/Output.h (modified) removed COUT, CCOUT, and DOUT macros. COUT is now defined as a ... Mon, 01 Aug 2011 17:09:29 GMT landauf [8811] * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) * code/branches/output/src/modules/designtools/ScreenshotManager.cc (modified) * code/branches/output/src/modules/designtools/SkyboxGenerator.cc (modified) * code/branches/output/src/modules/docking/Dock.cc (modified) * code/branches/output/src/modules/docking/DockToShip.cc (modified) * code/branches/output/src/modules/docking/DockingController.cc (modified) * code/branches/output/src/modules/docking/DockingTarget.cc (modified) * code/branches/output/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/output/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/output/src/modules/notifications/NotificationDispatcher.cc (modified) * code/branches/output/src/modules/notifications/NotificationManager.cc (modified) * code/branches/output/src/modules/notifications/NotificationQueue.cc (modified) * code/branches/output/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/branches/output/src/modules/objects/ForceField.cc (modified) * code/branches/output/src/modules/objects/Planet.cc (modified) * code/branches/output/src/modules/objects/Script.cc (modified) * code/branches/output/src/modules/objects/SpaceBoundaries.cc (modified) * code/branches/output/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified) * code/branches/output/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/branches/output/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/branches/output/src/modules/objects/collisionshapes/SphereCollisionShape.cc (modified) * code/branches/output/src/modules/objects/eventsystem/EventFilter.cc (modified) * code/branches/output/src/modules/objects/eventsystem/EventListener.cc (modified) * code/branches/output/src/modules/objects/eventsystem/EventTarget.cc (modified) * code/branches/output/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/branches/output/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/branches/output/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/branches/output/src/modules/objects/triggers/TriggerBase.cc (modified) * code/branches/output/src/modules/overlays/GUIOverlay.cc (modified) * code/branches/output/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/branches/output/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/output/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/output/src/modules/pickup/Pickup.cc (modified) * code/branches/output/src/modules/pickup/PickupManager.cc (modified) * code/branches/output/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/output/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/output/src/modules/pickup/items/DronePickup.cc (modified) * code/branches/output/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/output/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/branches/output/src/modules/pickup/items/MetaPickup.cc (modified) * code/branches/output/src/modules/pickup/items/ShieldPickup.cc (modified) * code/branches/output/src/modules/pickup/items/ShrinkPickup.h (modified) * code/branches/output/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/output/src/modules/pong/Pong.cc (modified) * code/branches/output/src/modules/questsystem/GlobalQuest.cc (modified) * code/branches/output/src/modules/questsystem/LocalQuest.cc (modified) * code/branches/output/src/modules/questsystem/Quest.cc (modified) * code/branches/output/src/modules/questsystem/QuestDescription.cc (modified) * code/branches/output/src/modules/questsystem/QuestEffect.cc (modified) * code/branches/output/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/branches/output/src/modules/questsystem/QuestHint.cc (modified) * code/branches/output/src/modules/questsystem/QuestItem.cc (modified) * code/branches/output/src/modules/questsystem/QuestListener.cc (modified) * code/branches/output/src/modules/questsystem/QuestManager.cc (modified) * code/branches/output/src/modules/questsystem/effects/AddQuest.cc (modified) * code/branches/output/src/modules/questsystem/effects/AddQuestHint.cc (modified) * code/branches/output/src/modules/questsystem/effects/AddReward.cc (modified) * code/branches/output/src/modules/questsystem/effects/ChangeQuestStatus.cc (modified) * code/branches/output/src/modules/questsystem/effects/CompleteQuest.cc (modified) * code/branches/output/src/modules/questsystem/effects/FailQuest.cc (modified) * code/branches/output/src/modules/tetris/Tetris.cc (modified) * code/branches/output/src/modules/weapons/RocketController.cc (modified) * code/branches/output/src/modules/weapons/projectiles/SimpleRocket.cc (modified) Replaced COUT() with orxout() in all modules. phew. Mon, 01 Aug 2011 14:40:20 GMT landauf [8810] * code/branches/output/src/orxonox/graphics/CEGuiSample.cc (deleted) * code/branches/output/src/orxonox/graphics/CEGuiSample.h (deleted) removed CEGuiSample, I think this is not needed anymore Mon, 01 Aug 2011 14:37:38 GMT landauf [8809] * code/branches/output/src/libraries/tools/BillboardSet.cc (modified) * code/branches/output/src/libraries/tools/Mesh.cc (modified) * code/branches/output/src/libraries/tools/ParticleInterface.cc (modified) * code/branches/output/src/libraries/tools/ResourceCollection.cc (modified) * code/branches/output/src/libraries/tools/ResourceLocation.cc (modified) * code/branches/output/src/libraries/tools/Shader.cc (modified) * code/branches/output/src/libraries/tools/Timer.h (modified) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) * code/branches/output/src/orxonox/ChatHistory.cc (modified) * code/branches/output/src/orxonox/ChatInputHandler.cc (modified) * code/branches/output/src/orxonox/Level.cc (modified) * code/branches/output/src/orxonox/LevelInfo.cc (modified) * code/branches/output/src/orxonox/LevelManager.cc (modified) * code/branches/output/src/orxonox/MoodManager.cc (modified) * code/branches/output/src/orxonox/PlayerManager.cc (modified) * code/branches/output/src/orxonox/Radar.cc (modified) * code/branches/output/src/orxonox/Scene.cc (modified) * code/branches/output/src/orxonox/Test.cc (modified) * code/branches/output/src/orxonox/Test.h (modified) * code/branches/output/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/branches/output/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/output/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/output/src/orxonox/controllers/HumanController.cc (modified) * code/branches/output/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/output/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/output/src/orxonox/gamestates/GSMasterServer.cc (modified) * code/branches/output/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/output/src/orxonox/gamestates/GSServer.cc (modified) * code/branches/output/src/orxonox/gametypes/Asteroids.cc (modified) * code/branches/output/src/orxonox/gametypes/Deathmatch.cc (modified) * code/branches/output/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/output/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/output/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/output/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/branches/output/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/branches/output/src/orxonox/gametypes/UnderAttack.cc (modified) * code/branches/output/src/orxonox/graphics/Model.cc (modified) * code/branches/output/src/orxonox/graphics/ParticleEmitter.cc (modified) * code/branches/output/src/orxonox/interfaces/PickupCarrier.cc (modified) * code/branches/output/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/output/src/orxonox/interfaces/RadarViewable.cc (modified) * code/branches/output/src/orxonox/items/Engine.cc (modified) * code/branches/output/src/orxonox/overlays/InGameConsole.cc (modified) * code/branches/output/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/output/src/orxonox/pickup/PickupIdentifier.cc (modified) * code/branches/output/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/output/src/orxonox/sound/BaseSound.cc (modified) * code/branches/output/src/orxonox/sound/SoundBuffer.cc (modified) * code/branches/output/src/orxonox/sound/SoundManager.cc (modified) * code/branches/output/src/orxonox/sound/SoundStreamer.cc (modified) * code/branches/output/src/orxonox/sound/WorldSound.cc (modified) * code/branches/output/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/output/src/orxonox/worldentities/BigExplosion.cc (modified) * code/branches/output/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/output/src/orxonox/worldentities/ExplosionChunk.cc (modified) * code/branches/output/src/orxonox/worldentities/MobileEntity.cc (modified) * code/branches/output/src/orxonox/worldentities/SpawnPoint.cc (modified) * code/branches/output/src/orxonox/worldentities/StaticEntity.cc (modified) * code/branches/output/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/output/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) * code/branches/output/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Replaced COUT() with orxout() in tools and orxonox library. Requires ... Sun, 31 Jul 2011 21:42:55 GMT landauf [8808] * code/branches/output/src/libraries/core/Loader.cc (modified) * code/branches/output/src/libraries/core/Loader.h (modified) * code/branches/output/src/libraries/core/command/Shell.cc (modified) * code/branches/output/src/libraries/core/command/Shell.h (modified) * code/branches/output/src/libraries/util/Output.h (modified) * code/branches/output/src/libraries/util/output/BaseWriter.cc (modified) * code/branches/output/src/libraries/util/output/BaseWriter.h (modified) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) * code/branches/output/src/libraries/util/output/OutputListener.cc (modified) * code/branches/output/src/libraries/util/output/OutputManager.cc (modified) Removed debugLevel_ from Shell, using correct variable inherited from ... Sun, 31 Jul 2011 19:09:23 GMT landauf [8807] * code/branches/output/src/libraries/network/ChatListener.cc (modified) * code/branches/output/src/libraries/network/Client.cc (modified) * code/branches/output/src/libraries/network/ClientConnection.cc (modified) * code/branches/output/src/libraries/network/Connection.cc (modified) * code/branches/output/src/libraries/network/GamestateManager.cc (modified) * code/branches/output/src/libraries/network/LANDiscoverable.cc (modified) * code/branches/output/src/libraries/network/LANDiscovery.cc (modified) * code/branches/output/src/libraries/network/MasterServer.cc (modified) * code/branches/output/src/libraries/network/MasterServerComm.cc (modified) * code/branches/output/src/libraries/network/PeerList.cc (modified) * code/branches/output/src/libraries/network/Server.cc (modified) * code/branches/output/src/libraries/network/ServerConnection.cc (modified) * code/branches/output/src/libraries/network/TrafficControl.cc (modified) * code/branches/output/src/libraries/network/WANDiscoverable.cc (modified) * code/branches/output/src/libraries/network/WANDiscovery.cc (modified) * code/branches/output/src/libraries/network/packet/Acknowledgement.cc (modified) * code/branches/output/src/libraries/network/packet/ClassID.cc (modified) * code/branches/output/src/libraries/network/packet/DeleteObjects.cc (modified) * code/branches/output/src/libraries/network/packet/FunctionIDs.cc (modified) * code/branches/output/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/output/src/libraries/network/packet/Packet.cc (modified) * code/branches/output/src/libraries/network/packet/Welcome.cc (modified) * code/branches/output/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/output/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/branches/output/src/libraries/network/synchronisable/SynchronisableVariable.h (modified) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) Replaced COUT with orxout in network library. Tried to set levels and ... Sun, 31 Jul 2011 15:15:13 GMT landauf [8806] * code/branches/output/src/libraries/core/BaseObject.cc (modified) * code/branches/output/src/libraries/core/ClassFactory.h (modified) * code/branches/output/src/libraries/core/CommandLineParser.cc (modified) * code/branches/output/src/libraries/core/CommandLineParser.h (modified) * code/branches/output/src/libraries/core/ConfigFileManager.cc (modified) * code/branches/output/src/libraries/core/ConfigValueContainer.cc (modified) * code/branches/output/src/libraries/core/ConfigValueIncludes.h (modified) * code/branches/output/src/libraries/core/Core.cc (modified) * code/branches/output/src/libraries/core/DynLib.cc (modified) * code/branches/output/src/libraries/core/Event.cc (modified) * code/branches/output/src/libraries/core/GUIManager.cc (modified) * code/branches/output/src/libraries/core/Game.cc (modified) * code/branches/output/src/libraries/core/Game.h (modified) * code/branches/output/src/libraries/core/GraphicsManager.cc (modified) * code/branches/output/src/libraries/core/Identifier.cc (modified) * code/branches/output/src/libraries/core/Identifier.h (modified) * code/branches/output/src/libraries/core/Language.cc (modified) * code/branches/output/src/libraries/core/Language.h (modified) * code/branches/output/src/libraries/core/Loader.cc (modified) * code/branches/output/src/libraries/core/LuaState.cc (modified) * code/branches/output/src/libraries/core/MetaObjectList.cc (modified) * code/branches/output/src/libraries/core/NamespaceNode.cc (modified) * code/branches/output/src/libraries/core/OrxonoxClass.cc (modified) * code/branches/output/src/libraries/core/PathConfig.cc (modified) * code/branches/output/src/libraries/core/SubclassIdentifier.h (modified) * code/branches/output/src/libraries/core/Super.h (modified) * code/branches/output/src/libraries/core/Template.cc (modified) * code/branches/output/src/libraries/core/WeakPtr.h (modified) * code/branches/output/src/libraries/core/XMLPort.cc (modified) * code/branches/output/src/libraries/core/XMLPort.h (modified) * code/branches/output/src/libraries/core/command/CommandEvaluation.cc (modified) * code/branches/output/src/libraries/core/command/CommandExecutor.cc (modified) * code/branches/output/src/libraries/core/command/ConsoleCommand.cc (modified) * code/branches/output/src/libraries/core/command/ConsoleCommand.h (modified) * code/branches/output/src/libraries/core/command/ConsoleCommandCompilation.cc (modified) * code/branches/output/src/libraries/core/command/ConsoleCommandCompilation.h (modified) * code/branches/output/src/libraries/core/command/Executor.cc (modified) * code/branches/output/src/libraries/core/command/Executor.h (modified) * code/branches/output/src/libraries/core/command/Functor.h (modified) * code/branches/output/src/libraries/core/command/IOConsoleWindows.cc (modified) * code/branches/output/src/libraries/core/command/IRC.cc (modified) * code/branches/output/src/libraries/core/command/TclBind.cc (modified) * code/branches/output/src/libraries/core/command/TclThreadManager.cc (modified) * code/branches/output/src/libraries/core/input/Button.cc (modified) * code/branches/output/src/libraries/core/input/InputDevice.h (modified) * code/branches/output/src/libraries/core/input/InputManager.cc (modified) * code/branches/output/src/libraries/core/input/JoyStick.cc (modified) * code/branches/output/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/output/src/libraries/core/input/KeyBinderManager.cc (modified) * code/branches/output/src/libraries/util/Sleep.cc (modified) * code/branches/output/src/libraries/util/SubString.cc (modified) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) Replaced COUT with orxout in core. Tried to set levels and contexts ... Sun, 31 Jul 2011 09:45:56 GMT landauf [8805] * code/branches/output/src/libraries/core/GUIManager.cc (modified) * code/branches/output/src/libraries/core/GraphicsManager.cc (modified) * code/branches/output/src/libraries/core/command/IOConsolePOSIX.cc (modified) * code/branches/output/src/libraries/core/command/IOConsoleWindows.cc (modified) * code/branches/output/src/libraries/core/command/Shell.h (modified) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) * code/branches/output/src/libraries/util/output/OutputManager.cc (modified) * code/branches/output/src/orxonox/overlays/InGameConsole.cc (modified) added new output level "message" for output directed to the user Sat, 30 Jul 2011 21:06:36 GMT landauf [8804] * code/branches/output/src/libraries/util/Clipboard.cc (modified) * code/branches/output/src/libraries/util/Convert.h (modified) * code/branches/output/src/libraries/util/Exception.cc (modified) * code/branches/output/src/libraries/util/Exception.h (modified) * code/branches/output/src/libraries/util/ExprParser.h (modified) * code/branches/output/src/libraries/util/MultiType.h (modified) * code/branches/output/src/libraries/util/OrxAssert.h (modified) * code/branches/output/src/libraries/util/Scope.h (modified) * code/branches/output/src/libraries/util/ScopedSingletonManager.h (modified) * code/branches/output/src/libraries/util/SignalHandler.cc (modified) * code/branches/output/src/libraries/util/Singleton.h (modified) * code/branches/output/src/libraries/util/Sleep.cc (modified) * code/branches/output/src/libraries/util/SubString.cc (modified) * code/branches/output/src/libraries/util/SubString.h (modified) Replaced COUT in util with orxout. Used user_error for Exceptions ... Sat, 30 Jul 2011 20:05:49 GMT landauf [8803] * code/branches/output/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) * code/branches/output/src/libraries/core/command/IOConsolePOSIX.cc (modified) * code/branches/output/src/libraries/core/command/IOConsoleWindows.cc (modified) * code/branches/output/src/libraries/core/command/Shell.cc (modified) * code/branches/output/src/libraries/core/command/Shell.h (modified) * code/branches/output/src/orxonox/overlays/InGameConsole.cc (modified) no \n needed after executed command in shell. different color for ... Sat, 30 Jul 2011 19:31:05 GMT landauf [8801] * code/branches/output/src/libraries/core/LuaState.cc (modified) * code/branches/output/src/libraries/core/command/IOConsoleWindows.cc (modified) * code/branches/output/src/libraries/core/command/Shell.cc (modified) * code/branches/output/src/libraries/core/command/Shell.h (modified) * code/branches/output/src/libraries/util/StringUtils.cc (modified) * code/branches/output/src/libraries/util/StringUtils.h (modified) * code/branches/output/src/libraries/util/output/OutputManager.cc (modified) * code/branches/output/src/orxonox/overlays/InGameConsole.cc (modified) fixed bug with multiple lines in shell. adjusted colors in IOConsole ... Sat, 30 Jul 2011 19:25:32 GMT jo [8800] * code/branches/ai2/data/levels/lastTeamStandingII.oxw (modified) * code/branches/ai2/data/levels/missionOne.oxw (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) Some work on the level. Pawndeath trigger doesn't work. Sat, 30 Jul 2011 17:51:08 GMT landauf [8799] * code/branches/output/src/libraries/core/Core.cc (modified) * code/branches/output/src/libraries/core/Core.h (modified) * code/branches/output/src/libraries/core/GUIManager.cc (modified) * code/branches/output/src/libraries/core/command/IOConsolePOSIX.cc (modified) * code/branches/output/src/libraries/core/command/IOConsoleWindows.cc (modified) * code/branches/output/src/libraries/core/command/Shell.cc (modified) * code/branches/output/src/libraries/core/command/Shell.h (modified) * code/branches/output/src/libraries/util/output/BaseWriter.cc (modified) * code/branches/output/src/libraries/util/output/BaseWriter.h (modified) * code/branches/output/src/libraries/util/output/ConsoleWriter.cc (modified) * code/branches/output/src/libraries/util/output/LogWriter.cc (modified) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) * code/branches/output/src/libraries/util/output/OutputManager.cc (modified) * code/branches/output/src/libraries/util/output/OutputManager.h (modified) Code related to config values for output is now implemented in ... Sat, 30 Jul 2011 13:55:35 GMT landauf [8798] * code/branches/output/src/libraries/core/GUIManager.cc (modified) * code/branches/output/src/libraries/core/GUIManager.h (modified) * code/branches/output/src/libraries/core/GraphicsManager.cc (modified) * code/branches/output/src/libraries/core/GraphicsManager.h (modified) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) adjusted output levels for ogre and cegui messages added config ... Sat, 30 Jul 2011 08:39:33 GMT landauf [8797] * code/branches/output/src/libraries/core/command/IOConsolePOSIX.cc (modified) * code/branches/output/src/libraries/core/command/IOConsolePOSIX.h (modified) * code/branches/output/src/libraries/core/command/IOConsoleWindows.cc (modified) * code/branches/output/src/libraries/core/command/IOConsoleWindows.h (modified) * code/branches/output/src/libraries/core/command/Shell.h (modified) * code/branches/output/src/orxonox/overlays/InGameConsole.cc (modified) * code/branches/output/src/orxonox/overlays/InGameConsole.h (modified) removed onlyLastLineChanged() callback from ShellListener, since it's ... Fri, 29 Jul 2011 22:54:55 GMT landauf [8796] * code/branches/output/src/libraries/core/Core.cc (modified) * code/branches/output/src/libraries/core/Core.h (modified) * code/branches/output/src/libraries/core/GUIManager.cc (modified) * code/branches/output/src/libraries/core/GraphicsManager.cc (modified) * code/branches/output/src/libraries/core/LuaState.cc (modified) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) adjusted the rest of the code to the new output system, but some ... Fri, 29 Jul 2011 20:26:45 GMT landauf [8795] * code/branches/output/src/libraries/core/command/IOConsolePOSIX.cc (modified) * code/branches/output/src/libraries/core/command/IOConsoleWindows.cc (modified) * code/branches/output/src/libraries/core/command/Shell.cc (modified) * code/branches/output/src/libraries/core/command/Shell.h (modified) * code/branches/output/src/libraries/util/output/BaseWriter.cc (modified) * code/branches/output/src/libraries/util/output/BaseWriter.h (modified) * code/branches/output/src/libraries/util/output/ConsoleWriter.cc (modified) * code/branches/output/src/libraries/util/output/ConsoleWriter.h (modified) * code/branches/output/src/libraries/util/output/LogWriter.cc (modified) * code/branches/output/src/libraries/util/output/LogWriter.h (modified) * code/branches/output/src/orxonox/overlays/InGameConsole.cc (modified) Shell and its derivatives are now based on the new output system Thu, 28 Jul 2011 20:35:41 GMT landauf [8794] * code/branches/output/src/libraries/util/CMakeLists.txt (modified) * code/branches/output/src/libraries/util/output/BaseWriter.cc (added) * code/branches/output/src/libraries/util/output/BaseWriter.h (added) * code/branches/output/src/libraries/util/output/ConsoleWriter.cc (modified) * code/branches/output/src/libraries/util/output/ConsoleWriter.h (modified) * code/branches/output/src/libraries/util/output/LogWriter.cc (modified) * code/branches/output/src/libraries/util/output/LogWriter.h (modified) * code/branches/output/src/libraries/util/output/MemoryWriter.h (modified) * code/branches/output/src/libraries/util/output/OutputListener.h (modified) added BaseWriter, a common base class of ConsoleWriter, LogWriter, ... Thu, 28 Jul 2011 15:24:32 GMT jo [8793] * code/branches/ai2/data/levels/lastTeamStanding.oxw (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/controllers/WaypointController.cc (modified) Destructor update. Wed, 27 Jul 2011 19:21:29 GMT jo [8792] * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified) Yeay, works. The pickuping efficiency isn't as good as expected though. Tue, 26 Jul 2011 21:41:45 GMT jo [8791] * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) Bug is triggered in AIController.cc @ line 243. Can't find the reason ... Tue, 26 Jul 2011 21:21:43 GMT dafrick [8790] * code/branches/hudimprovements (deleted) Removing hudimprovements branch. (Is already in trunk) Tue, 26 Jul 2011 09:06:01 GMT landauf [8789] * code/branches/output/src/libraries/util/output/ConsoleWriter.cc (modified) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) * code/branches/output/src/libraries/util/output/OutputStream.cc (modified) * code/branches/output/src/libraries/util/output/OutputStream.h (modified) some small details, allow direct usage of OutputStream() Mon, 25 Jul 2011 22:05:23 GMT landauf [8788] * code/branches/output/src/Orxonox.cc (modified) * code/branches/output/src/libraries/core/ClassFactory.h (modified) * code/branches/output/src/libraries/core/CommandLineParser.cc (modified) * code/branches/output/src/libraries/core/Core.cc (modified) * code/branches/output/src/libraries/core/CoreIncludes.h (modified) * code/branches/output/src/libraries/core/CorePrecompiledHeaders.h (modified) * code/branches/output/src/libraries/core/GUIManager.cc (modified) * code/branches/output/src/libraries/core/Game.cc (modified) * code/branches/output/src/libraries/core/Game.h (modified) * code/branches/output/src/libraries/core/GameState.cc (modified) * code/branches/output/src/libraries/core/Identifier.h (modified) * code/branches/output/src/libraries/core/Language.cc (modified) * code/branches/output/src/libraries/core/Loader.cc (modified) * code/branches/output/src/libraries/core/LuaState.cc (modified) * code/branches/output/src/libraries/core/MetaObjectList.cc (modified) * code/branches/output/src/libraries/core/NamespaceNode.cc (modified) * code/branches/output/src/libraries/core/PathConfig.cc (modified) * code/branches/output/src/libraries/core/SubclassIdentifier.h (modified) * code/branches/output/src/libraries/core/Super.h (modified) * code/branches/output/src/libraries/core/Template.cc (modified) * code/branches/output/src/libraries/core/XMLPort.h (modified) * code/branches/output/src/libraries/core/command/ConsoleCommandCompilation.cc (modified) * code/branches/output/src/libraries/core/command/Executor.cc (modified) * code/branches/output/src/libraries/core/command/Functor.h (modified) * code/branches/output/src/libraries/core/command/TclBind.cc (modified) * code/branches/output/src/libraries/core/input/Button.cc (modified) * code/branches/output/src/libraries/core/input/InputDevice.h (modified) * code/branches/output/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/output/src/libraries/core/input/KeyBinderManager.cc (modified) * code/branches/output/src/libraries/network/Client.cc (modified) * code/branches/output/src/libraries/network/ClientConnection.cc (modified) * code/branches/output/src/libraries/network/GamestateManager.cc (modified) * code/branches/output/src/libraries/network/LANDiscoverable.cc (modified) * code/branches/output/src/libraries/network/MasterServerComm.cc (modified) * code/branches/output/src/libraries/network/NetworkPrecompiledHeaders.h (modified) * code/branches/output/src/libraries/network/Server.cc (modified) * code/branches/output/src/libraries/network/ServerConnection.cc (modified) * code/branches/output/src/libraries/network/packet/Acknowledgement.cc (modified) * code/branches/output/src/libraries/network/packet/DeleteObjects.cc (modified) * code/branches/output/src/libraries/network/packet/FunctionIDs.cc (modified) * code/branches/output/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/output/src/libraries/network/packet/Packet.cc (modified) * code/branches/output/src/libraries/network/packet/Welcome.cc (modified) * code/branches/output/src/libraries/util/Clipboard.cc (modified) * code/branches/output/src/libraries/util/Convert.h (modified) * code/branches/output/src/libraries/util/Exception.cc (modified) * code/branches/output/src/libraries/util/Exception.h (modified) * code/branches/output/src/libraries/util/OrxAssert.h (modified) * code/branches/output/src/libraries/util/Scope.h (modified) * code/branches/output/src/libraries/util/SignalHandler.cc (modified) * code/branches/output/src/libraries/util/Sleep.cc (modified) * code/branches/output/src/libraries/util/SubString.cc (modified) * code/branches/output/src/modules/weapons/RocketController.cc (modified) * code/branches/output/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/output/src/orxonox/gamestates/GSClient.cc (modified) * code/branches/output/src/orxonox/gamestates/GSMasterServer.cc (modified) * code/branches/output/src/orxonox/gamestates/GSServer.cc (modified) changed includes from Debug.h to Output.h doesn't compile. Mon, 25 Jul 2011 21:53:17 GMT landauf [8787] * code/branches/output/src/libraries/util/CMakeLists.txt (modified) * code/branches/output/src/libraries/util/Debug.h (deleted) * code/branches/output/src/libraries/util/Output.h (modified) * code/branches/output/src/libraries/util/OutputHandler.cc (deleted) * code/branches/output/src/libraries/util/OutputHandler.h (deleted) * code/branches/output/src/libraries/util/UtilPrereqs.h (modified) * code/branches/output/src/libraries/util/output/ConsoleWriter.cc (modified) * code/branches/output/src/libraries/util/output/ConsoleWriter.h (modified) * code/branches/output/src/libraries/util/output/LogWriter.cc (modified) * code/branches/output/src/libraries/util/output/LogWriter.h (modified) * code/branches/output/src/libraries/util/output/MemoryWriter.cc (modified) * code/branches/output/src/libraries/util/output/MemoryWriter.h (modified) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) * code/branches/output/src/libraries/util/output/OutputListener.cc (modified) * code/branches/output/src/libraries/util/output/OutputListener.h (modified) * code/branches/output/src/libraries/util/output/OutputManager.cc (modified) * code/branches/output/src/libraries/util/output/OutputManager.h (modified) * code/branches/output/src/libraries/util/output/OutputStream.cc (modified) * code/branches/output/src/libraries/util/output/OutputStream.h (modified) removed Debug.h and OutputHandler. removed test namespace from new ... Mon, 25 Jul 2011 21:18:20 GMT jo [8786] * code/branches/ai2/data/levels/missionOne.oxw (modified) * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/ai2/src/orxonox/controllers/WaypointController.cc (modified) Bots can fetch pickups. Waypointmanagement is unstable yet. Mon, 25 Jul 2011 21:07:51 GMT landauf [8785] * code/archive/ggz2 (moved) moved ggz2 branch to archive Mon, 25 Jul 2011 20:27:31 GMT landauf [8784] * code/archive/toonshader (moved) moved toonshader branch to archive. hi lieni, still alive? ;) Mon, 25 Jul 2011 20:17:40 GMT landauf [8783] * code/archive/lod (moved) * code/archive/map (moved) * code/archive/shader (moved) * code/archive/skybox (moved) * code/archive/tutorialFS09 (moved) * code/archive/tutorialHS08 (moved) * code/archive/tutorialHS09 (moved) moved old branches from tags to archive Mon, 25 Jul 2011 20:13:47 GMT landauf [8782] * code/archive (added) created archive directory for unmerged branches Mon, 25 Jul 2011 20:02:05 GMT landauf [8781] * code/branches/environment (deleted) * code/branches/kicklib (deleted) * code/branches/kicklib2 (deleted) * code/branches/lastmanstanding2 (deleted) * code/branches/lastmanstanding3 (deleted) * code/branches/mac_osx (deleted) * code/branches/particleeffects (deleted) * code/branches/unity_build (deleted) removed old branches Mon, 25 Jul 2011 18:03:05 GMT landauf [8780] * code/branches/output/src/libraries/util/CMakeLists.txt (modified) * code/branches/output/src/libraries/util/output/ConsoleWriter.cc (added) * code/branches/output/src/libraries/util/output/ConsoleWriter.h (added) * code/branches/output/src/libraries/util/output/OutputManager.cc (modified) added ConsoleWriter Mon, 25 Jul 2011 16:28:57 GMT landauf [8779] * code/branches/output/src/libraries/util/Output.h (modified) * code/branches/output/src/libraries/util/output/OutputStream.cc (modified) * code/branches/output/src/libraries/util/output/OutputStream.h (modified) small changes regarding context functions and orxout() Mon, 25 Jul 2011 13:00:29 GMT landauf [8778] * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) guess we can afford a small macro in this case Mon, 25 Jul 2011 12:47:49 GMT landauf [8777] * code/branches/output/src/libraries/util/Output.h (modified) * code/branches/output/src/libraries/util/output/LogWriter.cc (modified) * code/branches/output/src/libraries/util/output/MemoryWriter.cc (modified) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) * code/branches/output/src/libraries/util/output/OutputManager.cc (modified) * code/branches/output/src/libraries/util/output/OutputStream.cc (modified) * code/branches/output/src/libraries/util/output/OutputStream.h (modified) output contexts are now defined as functions instead of global ... Mon, 25 Jul 2011 11:05:04 GMT landauf [8776] * code/branches/output/src/libraries/util/output/LogWriter.cc (modified) * code/branches/output/src/libraries/util/output/MemoryWriter.cc (modified) * code/branches/output/src/libraries/util/output/OutputListener.cc (modified) * code/branches/output/src/libraries/util/output/OutputManager.cc (modified) * code/branches/output/src/libraries/util/output/OutputManager.h (modified) * code/branches/output/src/libraries/util/output/OutputStream.cc (modified) in OutputManager: getInstance now only creates an instance of ... Sun, 24 Jul 2011 22:01:30 GMT landauf [8775] * code/branches/output/src/libraries/util/OutputHandler.cc (modified) fixed problem with static initialization in old implementation of the ... Sun, 24 Jul 2011 21:50:20 GMT landauf [8774] * code/branches/output/src/libraries/util/CMakeLists.txt (modified) * code/branches/output/src/libraries/util/output/LogWriter.cc (added) * code/branches/output/src/libraries/util/output/LogWriter.h (added) * code/branches/output/src/libraries/util/output/MemoryWriter.cc (added) * code/branches/output/src/libraries/util/output/MemoryWriter.h (added) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) * code/branches/output/src/libraries/util/output/OutputListener.h (modified) * code/branches/output/src/libraries/util/output/OutputManager.cc (modified) * code/branches/output/src/libraries/util/output/OutputManager.h (modified) added LogWriter and MemoryWriter Sun, 24 Jul 2011 20:40:19 GMT jo [8773] * code/branches/ai2/data/levels/missionOne.oxw (added) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) Just to show a bug in the level. Sun, 24 Jul 2011 14:09:41 GMT landauf [8772] * code/branches/output/src/libraries/util/output/OutputListener.h (modified) * code/branches/output/src/libraries/util/output/OutputManager.cc (modified) * code/branches/output/src/libraries/util/output/OutputManager.h (modified) send the lines of a message as a vector to the output listeners Sat, 23 Jul 2011 23:22:11 GMT landauf [8771] * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) * code/branches/output/src/libraries/util/output/OutputManager.cc (modified) * code/branches/output/src/libraries/util/output/OutputManager.h (modified) * code/branches/output/src/libraries/util/output/OutputStream.h (modified) added function to register new output contexts. OutputManager owns ... Thu, 21 Jul 2011 16:07:00 GMT jo [8770] * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) That was no English :-). Now worldentities can be identified and ... Thu, 21 Jul 2011 15:36:37 GMT jo [8769] * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/ai2/src/orxonox/controllers/WaypointController.cc (modified) * code/branches/ai2/src/orxonox/controllers/WaypointController.h (modified) Moved intern waypoint functionallity from the waypointController to ... Wed, 20 Jul 2011 21:27:53 GMT dafrick [8768] * code/branches/portals (deleted) * code/branches/portals2 (deleted) * code/branches/spaceboundaries (deleted) * code/branches/spaceboundaries2 (deleted) * code/branches/spacerace (deleted) * code/branches/steering (deleted) * code/branches/tetris (deleted) * code/branches/tutoriallevel (deleted) * code/branches/tutoriallevel2 (deleted) * code/branches/tutoriallevel3 (deleted) * code/branches/weapons (deleted) Removing obsolete branches. 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... Tue, 19 Jul 2011 20:27:15 GMT jo [8766] * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai2/src/orxonox/weaponsystem/WeaponSlot.h (modified) Backup before taking the next step. Tue, 19 Jul 2011 19:26:32 GMT landauf [8765] * code/branches/output/src/libraries/util/CMakeLists.txt (modified) * code/branches/output/src/libraries/util/Output.h (added) * code/branches/output/src/libraries/util/output (added) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (added) * code/branches/output/src/libraries/util/output/OutputListener.cc (added) * code/branches/output/src/libraries/util/output/OutputListener.h (added) * code/branches/output/src/libraries/util/output/OutputManager.cc (added) * code/branches/output/src/libraries/util/output/OutputManager.h (added) * code/branches/output/src/libraries/util/output/OutputStream.cc (added) * code/branches/output/src/libraries/util/output/OutputStream.h (added) added draft for the the new output system Mon, 18 Jul 2011 21:07:05 GMT jo [8764] * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) Got the bug. Mon, 18 Jul 2011 20:59:35 GMT jo [8763] * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified) New implementation. New bug. Bots use only yellow energy munition ... Sun, 17 Jul 2011 21:43:20 GMT jo [8762] * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified) Weaponsetup now generic. Munition management has not jet been ... Fri, 15 Jul 2011 08:49:17 GMT jo [8761] * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) Error due to block scope (variables didn't reset in the inner while ... Thu, 14 Jul 2011 21:06:37 GMT jo [8760] * code/branches/ai2/data/levels/includes/weaponSettingsAssff.oxi (modified) Reverted weaponsetting. Thu, 14 Jul 2011 20:46:23 GMT jo [8759] * code/branches/ai2/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) Could this be a probable weaponsetting? Thu, 14 Jul 2011 20:29:18 GMT jo [8758] * code/branches/ai2/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/controllers/Controller.cc (modified) * code/branches/ai2/src/orxonox/controllers/Controller.h (modified) * code/branches/ai2/src/orxonox/worldentities/pawns/Pawn.cc (modified) Code clean up. Wed, 13 Jul 2011 19:42:03 GMT jo [8757] * code/branches/ai2/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified) ai && weapons. Trying to identify each weapon installed on a spaceship. Wed, 13 Jul 2011 17:53:31 GMT jo [8756] * code/trunk/data/levels/fightInOurBack.oxw (modified) Updating 'Fight in our back'. Spaceship is steerable now. New ... Wed, 13 Jul 2011 17:31:00 GMT jo [8755] * code/trunk/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsHXY.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsTransporter.oxi (modified) Updating the weaponsettings. Swallow and further spaceships deal ... Sun, 10 Jul 2011 19:53:17 GMT jo [8741] * code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/ai2/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Correction of camera bug. Sun, 10 Jul 2011 15:46:32 GMT landauf [8740] * code/branches/output (modified) * code/branches/output/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/output/src/orxonox/infos/GametypeInfo.cc (modified) fixed some warnings, added vs to ignore list Sun, 10 Jul 2011 08:41:13 GMT landauf [8739] * code/branches/output (copied) created new branch to work on the console- and log-output 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 Thu, 07 Jul 2011 17:17:39 GMT jo [8736] * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified) Bots use boost now. Thu, 07 Jul 2011 13:59:54 GMT jo [8735] * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/ai2/src/orxonox/controllers/Controller.cc (modified) * code/branches/ai2/src/orxonox/controllers/Controller.h (modified) * code/branches/ai2/src/orxonox/worldentities/pawns/Pawn.cc (modified) Adjust weapon behaviour if bot dies and is respawned with a different ... Wed, 06 Jul 2011 20:50:18 GMT dafrick [8734] * code/branches/ai2/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/ai2/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/ai2/src/orxonox/infos/PlayerInfo.cc (modified) Fix for AI and rockets. Tue, 05 Jul 2011 21:59:37 GMT jo [8733] * code/branches/ai2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/ai2/src/orxonox/worldentities/ControllableEntity.h (modified) Further narrowing down. The bug is triggered, when a bot calls ... Tue, 05 Jul 2011 20:57:40 GMT jo [8732] * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) doFire() is definitely the error's source. Tue, 05 Jul 2011 20:39:50 GMT jo [8731] * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) Narrowed down: Bug triggered in the doFire() function in ... Tue, 05 Jul 2011 20:16:47 GMT jo [8730] * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) Going back one step (version without hud bug). Bots have better ... 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:44:55 GMT dafrick [8728] * code/branches/bigships (deleted) Removing bigships branch. 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 ... Thu, 30 Jun 2011 22:59:23 GMT jo [8724] * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) Buggy version: After being shot dead in a simple level the hud ... Thu, 30 Jun 2011 22:54:47 GMT jo [8723] * code/branches/ai2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/ai2/src/orxonox/controllers/DroneController.cc (modified) * code/branches/ai2/src/orxonox/controllers/DroneController.h (modified) * code/branches/ai2/src/orxonox/worldentities/ControllableEntity.h (modified) 'Stable' update. Merging by hand. Thu, 30 Jun 2011 20:49:24 GMT dafrick [8722] * code/branches/pickup (deleted) Removing pickup branch. Thu, 30 Jun 2011 18:39:58 GMT jo [8721] * code/branches/ai2 (copied) Thu, 30 Jun 2011 18:30:13 GMT jo [8720] * code/branches/ai/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified) Just a backup, before starting to update the ai branch. Thu, 30 Jun 2011 15:20:39 GMT jo [8719] * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified) Trying to find a way to identify a weapon by its munition name. The ... Tue, 28 Jun 2011 02:28:58 GMT rgrieder [8716] * code/branches/unity_build/src/libraries/core/input/Mouse.cc (modified) Fixed Linux build when using build units 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. Wed, 22 Jun 2011 16:57:16 GMT jo [8711] * code/branches/ai/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified) Bots are ready for rocket usage. (The hit rate for rockets is just ... Sat, 18 Jun 2011 11:11:04 GMT FelixSchulthess [8710] * code/branches/presentation/data/levels/myTestLevel.oxw (modified) * code/branches/presentation/src/modules/objects/SpaceBoundaries.cc (modified) * code/branches/presentation/src/modules/objects/SpaceBoundaries.h (modified) * code/branches/presentation/src/orxonox/graphics/Billboard.cc (modified) * code/branches/presentation/src/orxonox/graphics/Billboard.h (modified) space boundary billboard is now animated. test run with myTestLevel.oxw 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 ...