# # ChangeLog for code/trunk/src/modules/notifications # # Generated by Trac 1.0.9 # Nov 8, 2024, 8:38:06 AM 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. 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 ... 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) ... 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. 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: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 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 ... 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 ... 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, ... Sat, 14 Aug 2010 21:56:56 GMT dafrick [7164] * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/notifications (moved) * code/trunk/src/modules/notifications/CMakeLists.txt (modified) * code/trunk/src/modules/notifications/Notification.h (modified) * code/trunk/src/modules/notifications/NotificationManager.h (modified) * code/trunk/src/modules/notifications/NotificationOverlay.h (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) * code/trunk/src/modules/notifications/NotificationsPrecompiledHeaders.h (added) * code/trunk/src/modules/notifications/NotificationsPrereqs.h (added) * code/trunk/src/modules/questsystem/CMakeLists.txt (modified) * code/trunk/src/modules/questsystem/QuestsystemPrereqs.h (modified) Moving notifications to own module. Wed, 11 Aug 2010 06:55:13 GMT dafrick [7163] * code/trunk (modified) * code/trunk/CMakeLists.txt (modified) * code/trunk/README (modified) * code/trunk/cmake/CapitaliseName.cmake (deleted) * code/trunk/cmake/CheckOGREPlugins.cmake (deleted) * code/trunk/cmake/CompareVersionStrings.cmake (deleted) * code/trunk/cmake/CompilerConfigMSVC.cmake (modified) * code/trunk/cmake/DetermineVersion.cmake (deleted) * code/trunk/cmake/FindALUT.cmake (deleted) * code/trunk/cmake/FindCEGUI.cmake (deleted) * code/trunk/cmake/FindDirectX.cmake (deleted) * code/trunk/cmake/FindENet.cmake (deleted) * code/trunk/cmake/FindLua.cmake (deleted) * code/trunk/cmake/FindOGRE.cmake (deleted) * code/trunk/cmake/FindOgg.cmake (deleted) * code/trunk/cmake/FindPackageHandleAdvancedArgs.cmake (deleted) * code/trunk/cmake/FindVorbis.cmake (deleted) * code/trunk/cmake/FlagUtilities.cmake (deleted) * code/trunk/cmake/GenerateToluaBindings.cmake (deleted) * code/trunk/cmake/GetGCCCompilerFlags.cmake (deleted) * code/trunk/cmake/HandleLibraryTypes.cmake (deleted) * code/trunk/cmake/InstallConfig.cmake (modified) * code/trunk/cmake/LibraryConfig.cmake (modified) * code/trunk/cmake/ParseMacroArguments.cmake (deleted) * code/trunk/cmake/PrecompiledHeaderFiles.cmake (deleted) * code/trunk/cmake/SeparateFlags.cmake (deleted) * code/trunk/cmake/SetCacheAdvanced.cmake (deleted) * code/trunk/cmake/SourceFileUtilities.cmake (deleted) * code/trunk/cmake/TargetUtilities.cmake (deleted) * code/trunk/cmake/tools (copied) * code/trunk/cmake/tools/CapitaliseName.cmake (copied) * code/trunk/cmake/tools/CheckOGREPlugins.cmake (copied) * code/trunk/cmake/tools/CompareVersionStrings.cmake (copied) * code/trunk/cmake/tools/DetermineVersion.cmake (copied) * code/trunk/cmake/tools/FindALUT.cmake (copied) * code/trunk/cmake/tools/FindCEGUI.cmake (copied) * code/trunk/cmake/tools/FindDirectX.cmake (copied) * code/trunk/cmake/tools/FindENet.cmake (copied) * code/trunk/cmake/tools/FindLua.cmake (copied) * code/trunk/cmake/tools/FindOGRE.cmake (copied) * code/trunk/cmake/tools/FindOgg.cmake (copied) * code/trunk/cmake/tools/FindPackageHandleAdvancedArgs.cmake (copied) * code/trunk/cmake/tools/FindVorbis.cmake (copied) * code/trunk/cmake/tools/FlagUtilities.cmake (copied) * code/trunk/cmake/tools/GenerateToluaBindings.cmake (copied) * code/trunk/cmake/tools/GetGCCCompilerFlags.cmake (copied) * code/trunk/cmake/tools/HandleLibraryTypes.cmake (copied) * code/trunk/cmake/tools/ParseMacroArguments.cmake (copied) * code/trunk/cmake/tools/PrecompiledHeaderFiles.cmake (copied) * code/trunk/cmake/tools/SeparateFlags.cmake (copied) * code/trunk/cmake/tools/SetCacheAdvanced.cmake (copied) * code/trunk/cmake/tools/SourceFileUtilities.cmake (copied) * code/trunk/cmake/tools/TargetUtilities.cmake (copied) * code/trunk/data/CMakeLists.txt (modified) * code/trunk/data/DataInstallScript.cmake (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/layouts/ChatBox-inputonly.layout (copied) * code/trunk/data/gui/layouts/ChatBox.layout (copied) * code/trunk/data/gui/layouts/InGamePickupHUD.layout (copied) * code/trunk/data/gui/layouts/MiscConfigMenu.layout (copied) * code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified) * code/trunk/data/gui/layouts/SettingsMenu.layout (modified) * code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/trunk/data/gui/scripts/ChatBox-inputonly.lua (copied) * code/trunk/data/gui/scripts/ChatBox.lua (copied) * code/trunk/data/gui/scripts/GUITools.lua (modified) * code/trunk/data/gui/scripts/HUDSheet.lua (modified) * code/trunk/data/gui/scripts/InGamePickupHUD.lua (copied) * code/trunk/data/gui/scripts/KeyBindMenu.lua (modified) * code/trunk/data/gui/scripts/MainMenu.lua (modified) * code/trunk/data/gui/scripts/MenuSheet.lua (modified) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (copied) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) * code/trunk/data/gui/scripts/SettingsMenu.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/Fight in our Back.oxw (copied) * code/trunk/data/levels/Quest_PirateAttack.oxw (copied) * code/trunk/data/levels/The Time Machine.oxw (copied) * code/trunk/data/levels/empty_level.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fps_test.oxw (copied) * code/trunk/data/levels/gametype_asteroids.oxw (modified) * code/trunk/data/levels/gametype_dynamicmatch.oxw (copied) * code/trunk/data/levels/gametype_underattack.oxw (modified) * code/trunk/data/levels/includes/CuboidSpaceStation.lua (modified) * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/data/levels/includes/weaponsettings3.oxi (modified) * code/trunk/data/levels/includes/weaponsettings_H2.oxi (modified) * code/trunk/data/levels/includes/weaponsettings_HXY.oxi (modified) * code/trunk/data/levels/includes/weaponsettings_fps.oxi (copied) * code/trunk/data/levels/includes/weaponsettings_ghost.oxi (modified) * code/trunk/data/levels/includes/weaponsettings_pirate.oxi (modified) * code/trunk/data/levels/old/presentationLOD.oxw (copied) * code/trunk/data/levels/pickup.oxw (deleted) * code/trunk/data/levels/pickup_pps_invi.oxw (deleted) * code/trunk/data/levels/pickup_ppstest1.oxw (deleted) * code/trunk/data/levels/pickups.oxw (copied) * code/trunk/data/levels/presentation.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationFS10.oxw (copied) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS09b.oxw (modified) * code/trunk/data/levels/presentation_FS10.oxw (copied) * code/trunk/data/levels/presentation_FS10_ed.oxw (copied) * code/trunk/data/levels/presentation_dm.oxw (modified) * code/trunk/data/levels/presentation_pong.oxw (modified) * code/trunk/data/levels/princessaeryn.oxw (modified) * code/trunk/data/levels/quest_test.oxw (deleted) * code/trunk/data/levels/questsystem2.oxw (deleted) * code/trunk/data/levels/screenshot.oxw (copied) * code/trunk/data/levels/sound.oxw (modified) * code/trunk/data/levels/teambasematchlevel.oxw (modified) * code/trunk/data/levels/teamdeathmatch.oxw (modified) * code/trunk/data/levels/templates/fps.oxt (copied) * code/trunk/data/levels/templates/lodinformation.oxt (copied) * code/trunk/data/levels/templates/pickup_representation_templates.oxt (modified) * code/trunk/data/levels/templates/spaceship_pirate.oxt (modified) * code/trunk/data/levels/test_ghost.oxw (deleted) * code/trunk/data/levels/test_stars.oxw (copied) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/data/overlays/dynamicmatchhud.oxo (copied) * code/trunk/data/overlays/hudtamplates_fps.oxo (copied) * code/trunk/data/particle/fog.particle (copied) * code/trunk/data/particle/rocketfire2.particle (copied) * code/trunk/data/particle/simplerocketfire.particle (copied) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/OrxonoxConfig.cmake (modified) * code/trunk/src/external/ceguilua/CMakeLists.txt (modified) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/ceguilua/CEGUILua.h (modified) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/ceguilua/changes_orxonox.diff (modified) * code/trunk/src/external/ceguilua/ceguilua-0.6.1/ceguilua/CEGUILua.h (modified) * code/trunk/src/external/ceguilua/ceguilua-0.6.1/ceguilua/changes_orxonox.diff (modified) * code/trunk/src/external/ceguilua/ceguilua-0.6.2/ceguilua/CEGUILua.h (modified) * code/trunk/src/external/ceguilua/ceguilua-0.6.2/ceguilua/changes_orxonox.diff (modified) * code/trunk/src/external/ogreceguirenderer/CMakeLists.txt (modified) * code/trunk/src/external/ogreceguirenderer/OgreCEGUIRenderer.h (modified) * code/trunk/src/external/ogreceguirenderer/changes_orxonox.diff (modified) * code/trunk/src/external/ois/OISPrereqs.h (modified) * code/trunk/src/external/ois/changes_orxonox.diff (modified) * code/trunk/src/external/tinyxml/CMakeLists.txt (modified) * code/trunk/src/external/tolua/CMakeLists.txt (modified) * code/trunk/src/libraries/core/BaseObject.cc (modified) * code/trunk/src/libraries/core/BaseObject.h (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/ConfigFileManager.cc (modified) * code/trunk/src/libraries/core/ConfigFileManager.h (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Event.cc (modified) * code/trunk/src/libraries/core/EventIncludes.h (modified) * code/trunk/src/libraries/core/Executor.cc (modified) * code/trunk/src/libraries/core/Executor.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/libraries/core/Template.cc (modified) * code/trunk/src/libraries/core/Template.h (modified) * code/trunk/src/libraries/core/XMLPort.cc (modified) * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/network/CMakeLists.txt (modified) * code/trunk/src/libraries/network/ChatListener.cc (modified) * code/trunk/src/libraries/network/ChatListener.h (modified) * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/Client.h (modified) * code/trunk/src/libraries/network/Connection.cc (modified) * code/trunk/src/libraries/network/Connection.h (modified) * code/trunk/src/libraries/network/GamestateClient.cc (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 (copied) * code/trunk/src/libraries/network/LANDiscoverable.h (copied) * code/trunk/src/libraries/network/LANDiscovery.cc (copied) * code/trunk/src/libraries/network/LANDiscovery.h (copied) * 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/packet/CMakeLists.txt (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/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/ServerInformation.cc (copied) * code/trunk/src/libraries/network/packet/ServerInformation.h (copied) * code/trunk/src/libraries/network/synchronisable/Serialise.h (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/libraries/tools/CMakeLists.txt (modified) * code/trunk/src/libraries/tools/ToolsPrereqs.h (modified) * code/trunk/src/libraries/tools/bsp (copied) * code/trunk/src/libraries/tools/bsp/CMakeLists.txt (copied) * code/trunk/src/libraries/tools/bsp/DemoApp.cpp (copied) * code/trunk/src/libraries/tools/bsp/DemoApp.hpp (copied) * code/trunk/src/libraries/tools/bsp/ExampleApplication.h (copied) * code/trunk/src/libraries/tools/bsp/ExampleFrameListener.h (copied) * code/trunk/src/libraries/tools/bsp/OgreFramework.cpp (copied) * code/trunk/src/libraries/tools/bsp/OgreFramework.hpp (copied) * code/trunk/src/libraries/tools/bsp/OgreGpuCommandBufferFlush.cpp (copied) * code/trunk/src/libraries/tools/bsp/OgreGpuCommandBufferFlush.h (copied) * code/trunk/src/libraries/tools/bsp/Q3Map.cpp (copied) * code/trunk/src/libraries/tools/bsp/Q3Map.h (copied) * code/trunk/src/libraries/tools/bsp/Q3Map_Bezier.cpp (copied) * code/trunk/src/libraries/tools/bsp/Q3Map_Bezier.h (copied) * code/trunk/src/libraries/tools/bsp/Q3Map_BspVertex.cpp (copied) * code/trunk/src/libraries/tools/bsp/Q3Map_BspVertex.h (copied) * code/trunk/src/libraries/tools/bsp/Q3Map_misc.h (copied) * code/trunk/src/libraries/util/CMakeLists.txt (modified) * code/trunk/src/libraries/util/Convert.cc (copied) * code/trunk/src/libraries/util/Convert.h (modified) * code/trunk/src/libraries/util/Serialise.h (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/libraries/util/Singleton.h (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/designtools (copied) * code/trunk/src/modules/designtools/CMakeLists.txt (copied) * code/trunk/src/modules/designtools/CreateStars.cc (copied) * code/trunk/src/modules/designtools/CreateStars.h (copied) * code/trunk/src/modules/designtools/DesignToolsPrereqs.h (copied) * code/trunk/src/modules/designtools/ScreenshotManager.cc (copied) * code/trunk/src/modules/designtools/ScreenshotManager.h (copied) * code/trunk/src/modules/designtools/SkyboxGenerator.cc (copied) * code/trunk/src/modules/designtools/SkyboxGenerator.h (copied) * code/trunk/src/modules/objects/CMakeLists.txt (modified) * code/trunk/src/modules/objects/ObjectsPrereqs.h (modified) * code/trunk/src/modules/objects/Planet.cc (modified) * code/trunk/src/modules/objects/Planet.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/EventListener.cc (modified) * code/trunk/src/modules/objects/triggers/CheckPoint.cc (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/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) * code/trunk/src/modules/overlays/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/GUIOverlay.cc (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/GametypeFadingMessage.cc (copied) * code/trunk/src/modules/overlays/hud/GametypeFadingMessage.h (copied) * code/trunk/src/modules/overlays/hud/GametypeStaticMessage.cc (copied) * code/trunk/src/modules/overlays/hud/GametypeStaticMessage.h (copied) * code/trunk/src/modules/overlays/hud/GametypeStatus.cc (modified) * code/trunk/src/modules/overlays/hud/GametypeStatus.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/pickup/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/CollectiblePickup.cc (copied) * code/trunk/src/modules/pickup/CollectiblePickup.h (copied) * code/trunk/src/modules/pickup/DroppedPickup.cc (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/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/PickupRepresentation.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) * code/trunk/src/modules/pickup/items/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/items/DronePickup.cc (copied) * code/trunk/src/modules/pickup/items/DronePickup.h (copied) * 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 (copied) * code/trunk/src/modules/pickup/items/ShieldPickup.h (copied) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.h (modified) * code/trunk/src/modules/pong/CMakeLists.txt (modified) * code/trunk/src/modules/pong/PongBall.h (modified) * code/trunk/src/modules/pong/PongBat.h (modified) * code/trunk/src/modules/pong/PongPrereqs.h (modified) * code/trunk/src/modules/questsystem/AddQuest.cc (modified) * code/trunk/src/modules/questsystem/AddQuestHint.cc (modified) * code/trunk/src/modules/questsystem/AddReward.cc (modified) * code/trunk/src/modules/questsystem/CMakeLists.txt (modified) * code/trunk/src/modules/questsystem/ChangeQuestStatus.cc (modified) * code/trunk/src/modules/questsystem/CompleteQuest.cc (modified) * code/trunk/src/modules/questsystem/FailQuest.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/Quest.h (modified) * code/trunk/src/modules/questsystem/QuestDescription.cc (modified) * code/trunk/src/modules/questsystem/QuestDescription.h (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestGUI.cc (deleted) * code/trunk/src/modules/questsystem/QuestGUI.h (deleted) * code/trunk/src/modules/questsystem/QuestGUINode.cc (deleted) * code/trunk/src/modules/questsystem/QuestGUINode.h (deleted) * 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/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/QuestsystemPrereqs.h (modified) * code/trunk/src/modules/questsystem/notifications/Notification.cc (modified) * code/trunk/src/modules/questsystem/notifications/Notification.h (modified) * code/trunk/src/modules/questsystem/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/questsystem/notifications/NotificationManager.h (modified) * code/trunk/src/modules/questsystem/notifications/NotificationOverlay.cc (modified) * code/trunk/src/modules/questsystem/notifications/NotificationOverlay.h (modified) * code/trunk/src/modules/questsystem/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/questsystem/notifications/NotificationQueue.h (modified) * code/trunk/src/modules/weapons/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/RocketController.cc (copied) * code/trunk/src/modules/weapons/RocketController.h (copied) * code/trunk/src/modules/weapons/WeaponsPrereqs.h (modified) * code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (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 (copied) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.h (copied) * code/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (copied) * code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.h (copied) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/ChatHistory.cc (copied) * code/trunk/src/orxonox/ChatHistory.h (copied) * code/trunk/src/orxonox/ChatInputHandler.cc (copied) * code/trunk/src/orxonox/ChatInputHandler.h (copied) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/Level.h (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/MoodManager.h (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/Radar.cc (modified) * code/trunk/src/orxonox/Radar.h (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/Test.cc (modified) * code/trunk/src/orxonox/Test.h (modified) * code/trunk/src/orxonox/collisionshapes/CollisionShape.h (modified) * code/trunk/src/orxonox/controllers/AIController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.h (modified) * code/trunk/src/orxonox/controllers/CMakeLists.txt (modified) * code/trunk/src/orxonox/controllers/DroneController.cc (copied) * code/trunk/src/orxonox/controllers/DroneController.h (copied) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.h (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.h (modified) * code/trunk/src/orxonox/gamestates/GSClient.cc (modified) * code/trunk/src/orxonox/gamestates/GSClient.h (modified) * code/trunk/src/orxonox/gamestates/GSGraphics.cc (modified) * code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (copied) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (copied) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/graphics/AnimatedModel.cc (copied) * code/trunk/src/orxonox/graphics/AnimatedModel.h (copied) * code/trunk/src/orxonox/graphics/Backlight.h (modified) * code/trunk/src/orxonox/graphics/Billboard.h (modified) * code/trunk/src/orxonox/graphics/BlinkingBillboard.cc (modified) * code/trunk/src/orxonox/graphics/BlinkingBillboard.h (modified) * code/trunk/src/orxonox/graphics/CEGuiSample.cc (copied) * code/trunk/src/orxonox/graphics/CEGuiSample.h (copied) * code/trunk/src/orxonox/graphics/CMakeLists.txt (modified) * code/trunk/src/orxonox/graphics/Camera.cc (modified) * code/trunk/src/orxonox/graphics/FadingBillboard.h (modified) * code/trunk/src/orxonox/graphics/GlobalShader.h (modified) * code/trunk/src/orxonox/graphics/Light.h (modified) * code/trunk/src/orxonox/graphics/MeshLodInformation.cc (copied) * code/trunk/src/orxonox/graphics/MeshLodInformation.h (copied) * code/trunk/src/orxonox/graphics/Model.cc (modified) * code/trunk/src/orxonox/graphics/Model.h (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.h (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/infos/HumanPlayer.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.h (modified) * code/trunk/src/orxonox/interfaces/GametypeMessageListener.h (modified) * code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.h (modified) * 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/interfaces/RadarListener.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/interfaces/Rewardable.h (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/items/MultiStateEngine.h (modified) * code/trunk/src/orxonox/overlays/CMakeLists.txt (modified) * code/trunk/src/orxonox/overlays/GUISheet.cc (modified) * code/trunk/src/orxonox/overlays/Map.cc (deleted) * code/trunk/src/orxonox/overlays/Map.h (deleted) * code/trunk/src/orxonox/pickup/PickupIdentifier.cc (modified) * code/trunk/src/orxonox/pickup/PickupIdentifier.h (modified) * code/trunk/src/orxonox/sound/BaseSound.cc (modified) * code/trunk/src/orxonox/sound/BaseSound.h (modified) * code/trunk/src/orxonox/sound/SoundStreamer.cc (modified) * code/trunk/src/orxonox/sound/SoundStreamer.h (modified) * code/trunk/src/orxonox/sound/WorldSound.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/trunk/src/orxonox/worldentities/BigExplosion.cc (modified) * code/trunk/src/orxonox/worldentities/BigExplosion.h (modified) * code/trunk/src/orxonox/worldentities/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/Drone.cc (copied) * code/trunk/src/orxonox/worldentities/Drone.h (copied) * code/trunk/src/orxonox/worldentities/ExplosionChunk.h (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MovableEntity.h (modified) * code/trunk/src/orxonox/worldentities/StaticEntity.h (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.cc (copied) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.h (copied) * 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.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Spectator.h (modified) Merged presentation3 branch into trunk.