# # ChangeLog for code/branches/pickup3 # # Generated by Trac 1.0.9 # Nov 25, 2024, 5:34:19 PM Mon, 15 Mar 2010 14:07:21 GMT dafrick [6523] * code/branches/pickup3/src/orxonox/interfaces/Pickupable.h (modified) Whitespace removal. Mon, 15 Mar 2010 06:33:11 GMT dafrick [6521] * code/branches/pickup3/src/libraries/core/Super.h (modified) * code/branches/pickup3/src/modules/pickup/Pickup.cc (modified) * code/branches/pickup3/src/modules/pickup/Pickup.h (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.h (modified) * code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.h (modified) Added changedPickedUp method to Pickupable to solve a problem in ... Sun, 14 Mar 2010 09:27:41 GMT dafrick [6520] * code/branches/pickup3/data/levels/pickup.oxw (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified) Small fix in HealthPickup. Sat, 13 Mar 2010 14:32:34 GMT dafrick [6519] * code/branches/pickup3/data/levels/includes/pickups.oxi (modified) * code/branches/pickup3/data/levels/pickup.oxw (modified) * code/branches/pickup3/data/levels/templates/pickup_representation_templates.oxt (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.h (modified) * code/branches/pickup3/src/modules/pickup/PickupCollectionIdentifier.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollectionIdentifier.h (modified) * code/branches/pickup3/src/modules/pickup/items/MetaPickup.cc (modified) * code/branches/pickup3/src/modules/pickup/items/MetaPickup.h (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.h (modified) Started documenting MetaPcikup, resolved some bugs in ... Fri, 12 Mar 2010 07:56:04 GMT dafrick [6518] * code/branches/pickup3/data/levels/pickup.oxw (modified) * code/branches/pickup3/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/pickup3/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/pickup3/src/modules/pickup/items/MetaPickup.cc (moved) * code/branches/pickup3/src/modules/pickup/items/MetaPickup.h (moved) * code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h (modified) Renamed TestPickup to MetaPickup. Fri, 12 Mar 2010 07:42:18 GMT dafrick [6517] * code/branches/pickup3/src/modules/pickup/items/TestPickup.cc (modified) TestPickup now more universal, as it accepts all PickupCarriers as ... Thu, 11 Mar 2010 21:59:37 GMT dafrick [6516] * code/branches/pickup3/src/modules/pickup/DroppedPickup.cc (modified) * code/branches/pickup3/src/modules/pickup/DroppedPickup.h (modified) * code/branches/pickup3/src/modules/pickup/PickupRepresentation.cc (modified) Resolved DroppedPickup bug, where the pickup picked up from a ... Thu, 11 Mar 2010 16:00:09 GMT scheusso [6515] * code/branches/pickup3/src/modules/pickup/Pickup.cc (modified) permanent creation of DroppedPickup instead of temporary Thu, 11 Mar 2010 15:43:12 GMT rgrieder [6514] * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) Fixed intialisation bug in PickupSpawner. Thu, 11 Mar 2010 15:30:30 GMT dafrick [6512] * code/branches/pickup3/data/levels/pickup.oxw (added) * code/branches/pickup3/data/levels/templates/pickup_representation_templates.oxt (modified) * code/branches/pickup3/src/modules/pickup/DroppedPickup.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/pickup3/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.h (modified) * code/branches/pickup3/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/pickup3/src/modules/pickup/items/TestPickup.cc (added) * code/branches/pickup3/src/modules/pickup/items/TestPickup.h (added) * code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (modified) Added additional pickup (TestPickup), and did some bug $fixing. Tue, 09 Mar 2010 22:06:08 GMT dafrick [6499] * code/branches/pickup3/src/modules/pickup/Pickup.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.cc (modified) Some small changes regarding output. Mon, 08 Mar 2010 20:45:28 GMT dafrick [6498] * code/branches/pickup3/data/levels/includes/pickups.oxi (added) * code/branches/pickup3/data/levels/templates/pickup_representation_templates.oxt (added) Added some preconfigured health pickups. Mon, 08 Mar 2010 20:17:22 GMT dafrick [6497] * code/branches/pickup3/src/libraries/core/OrxonoxClass.h (modified) * code/branches/pickup3/src/modules/pickup/Pickup.cc (modified) * code/branches/pickup3/src/modules/pickup/Pickup.h (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.h (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.h (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.h (modified) Fixed bug in clone() (Argument needed to be as reference). Pickups ... Mon, 08 Mar 2010 19:07:48 GMT rgrieder [6496] * code/branches/pickup3/src/modules/pickup/DroppedPickup.h (modified) * code/branches/pickup3/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.h (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.h (modified) Fixed DLL interface on Windows. Mon, 08 Mar 2010 11:49:25 GMT dafrick [6492] * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (modified) Small error in Pickup Spawner. Mon, 08 Mar 2010 08:39:47 GMT dafrick [6490] * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.h (modified) Added target to HealthPickup, which I had forgotten. Mon, 08 Mar 2010 07:09:17 GMT dafrick [6489] * code/branches/pickup3/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/pickup3/src/orxonox/worldentities/WorldEntity.h (modified) Changed changedActivity and changedVisibility such that when ... Sun, 07 Mar 2010 22:16:54 GMT dafrick [6486] * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) Simplification in PickupSpawner due to previous commit. Sun, 07 Mar 2010 22:16:03 GMT dafrick [6485] * code/branches/pickup3/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/pickup3/src/orxonox/worldentities/WorldEntity.h (modified) Added changedActivity and changedVisibility method to WorldEntity, ... Sun, 07 Mar 2010 22:00:05 GMT dafrick [6484] * code/branches/pickup3/src/modules/pickup/PickupManager.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.cc (modified) Cleanup and bug fixes. Sun, 07 Mar 2010 13:05:05 GMT dafrick [6480] * code/branches/pickup3/src/modules/pickup/Pickup.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollectionIdentifier.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollectionIdentifier.h (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.cc (modified) * code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.h (modified) Simplification in creation of PickupIdentifier. Sun, 07 Mar 2010 10:07:03 GMT dafrick [6479] * code/branches/pickup3/src/libraries/core/BaseObject.cc (modified) * code/branches/pickup3/src/libraries/core/BaseObject.h (modified) Added XMLPortParam to add one single template to BaseObject for ease ... Sun, 07 Mar 2010 09:55:23 GMT dafrick [6478] * code/branches/pickup3/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.cc (modified) More bug fixes. Sat, 06 Mar 2010 18:44:04 GMT dafrick [6477] * code/branches/pickup3/src/modules/pickup/Pickup.cc (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.h (modified) * code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (modified) Some more documenting. Completed HealthPickup. Fri, 05 Mar 2010 17:26:54 GMT dafrick [6475] * code/branches/pickup3/src/modules/pickup/CMakeLists.txt (modified) * code/branches/pickup3/src/modules/pickup/DroppedPickup.cc (moved) * code/branches/pickup3/src/modules/pickup/DroppedPickup.h (moved) * code/branches/pickup3/src/modules/pickup/Pickup.cc (modified) * code/branches/pickup3/src/modules/pickup/Pickup.h (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.h (modified) * code/branches/pickup3/src/modules/pickup/PickupCollectionIdentifier.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollectionIdentifier.h (modified) * code/branches/pickup3/src/modules/pickup/PickupManager.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupManager.h (modified) * code/branches/pickup3/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/pickup3/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupRepresentation.h (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.h (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.h (modified) * code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.cc (modified) * code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.h (modified) * code/branches/pickup3/src/orxonox/worldentities/pawns/Pawn.h (modified) Additional documentation, code niceifying and potential bug fixing. ... Fri, 05 Mar 2010 08:49:56 GMT dafrick [6474] * code/branches/pickup3/src/modules/pickup/Pickup.cc (added) * code/branches/pickup3/src/modules/pickup/Pickup.h (added) * code/branches/pickup3/src/modules/pickup/PickupCollectionIdentifier.cc (added) * code/branches/pickup3/src/modules/pickup/PickupCollectionIdentifier.h (added) * code/branches/pickup3/src/modules/pickup/PickupManager.cc (added) * code/branches/pickup3/src/modules/pickup/PickupManager.h (added) * code/branches/pickup3/src/modules/pickup/PickupRepresentation.cc (added) * code/branches/pickup3/src/modules/pickup/PickupRepresentation.h (added) * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/pickup3/src/modules/pickup/items (added) * code/branches/pickup3/src/modules/pickup/items/CMakeLists.txt (added) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (added) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.h (added) * code/branches/pickup3/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (added) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.h (modified) * code/branches/pickup3/src/orxonox/pickup/BaseItem.cc (deleted) * code/branches/pickup3/src/orxonox/pickup/BaseItem.h (deleted) * code/branches/pickup3/src/orxonox/pickup/DroppedItem.cc (deleted) * code/branches/pickup3/src/orxonox/pickup/EquipmentItem.cc (deleted) * code/branches/pickup3/src/orxonox/pickup/EquipmentItem.h (deleted) * code/branches/pickup3/src/orxonox/pickup/ModifierPickup.cc (deleted) * code/branches/pickup3/src/orxonox/pickup/ModifierPickup.h (deleted) * code/branches/pickup3/src/orxonox/pickup/ModifierType.h (deleted) * code/branches/pickup3/src/orxonox/pickup/PassiveItem.cc (deleted) * code/branches/pickup3/src/orxonox/pickup/PassiveItem.h (deleted) * code/branches/pickup3/src/orxonox/pickup/PickupCollection.cc (deleted) * code/branches/pickup3/src/orxonox/pickup/PickupCollection.h (deleted) * code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.cc (added) * code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.h (added) * code/branches/pickup3/src/orxonox/pickup/PickupInventory.cc (deleted) * code/branches/pickup3/src/orxonox/pickup/PickupInventory.h (deleted) * code/branches/pickup3/src/orxonox/pickup/PickupSpawner.cc (deleted) * code/branches/pickup3/src/orxonox/pickup/UsableItem.cc (deleted) * code/branches/pickup3/src/orxonox/pickup/UsableItem.h (deleted) * code/branches/pickup3/src/orxonox/pickup/items (deleted) Some documenting done. Added files, that I had forgotten to add. ... Thu, 04 Mar 2010 11:11:21 GMT dafrick [6467] * code/branches/pickup3/src/orxonox/items/Engine.cc (modified) Steering works now. The lesson is: Don't comment out stuff you don't ... Thu, 04 Mar 2010 10:56:26 GMT dafrick [6466] * code/branches/pickup3/src/libraries/core/OrxonoxClass.h (modified) * code/branches/pickup3/src/libraries/core/Super.h (modified) * code/branches/pickup3/src/modules/pickup/CMakeLists.txt (modified) * code/branches/pickup3/src/modules/pickup/DroppedItem.cc (modified) * code/branches/pickup3/src/modules/pickup/DroppedItem.h (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.h (modified) * code/branches/pickup3/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.h (modified) * code/branches/pickup3/src/orxonox/CMakeLists.txt (modified) * code/branches/pickup3/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/pickup3/src/orxonox/interfaces/CMakeLists.txt (modified) * code/branches/pickup3/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.h (modified) * code/branches/pickup3/src/orxonox/pickup/CMakeLists.txt (modified) * code/branches/pickup3/src/orxonox/worldentities/pawns/Pawn.h (modified) Lots of things done in pickups module. Compiles, but it seems, that ... Sat, 26 Dec 2009 09:06:54 GMT dafrick [6421] * code/branches/pickup3/src/modules/pickup/DroppedItem.cc (modified) * code/branches/pickup3/src/modules/pickup/DroppedItem.h (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.h (modified) * code/branches/pickup3/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.h (modified) * code/branches/pickup3/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h (modified) Some Documenting and bug fixes. Fri, 25 Dec 2009 22:08:24 GMT rgrieder [6420] * code/branches/pickup3/src/modules/pickup/CMakeLists.txt (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.h (modified) * code/branches/pickup3/src/modules/pickup/PickupPrecompiledHeaders.h (modified) * code/branches/pickup3/src/modules/pickup/PickupPrereqs.h (modified) svn:eol-style "native" for all text files. Fri, 25 Dec 2009 22:07:09 GMT rgrieder [6419] * code/branches/pickup3 (modified) * code/branches/pickup3/src/libraries/core/Super.h (modified) * code/branches/pickup3/src/modules/CMakeLists.txt (modified) * code/branches/pickup3/src/modules/pickup (copied) * code/branches/pickup3/src/modules/pickup/CMakeLists.txt (copied) * code/branches/pickup3/src/modules/pickup/DroppedItem.cc (copied) * code/branches/pickup3/src/modules/pickup/DroppedItem.h (copied) * code/branches/pickup3/src/modules/pickup/PickupCollection.cc (copied) * code/branches/pickup3/src/modules/pickup/PickupCollection.h (copied) * code/branches/pickup3/src/modules/pickup/PickupPrecompiledHeaders.h (copied) * code/branches/pickup3/src/modules/pickup/PickupPrereqs.h (copied) * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (copied) * code/branches/pickup3/src/modules/pickup/PickupSpawner.h (copied) * code/branches/pickup3/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/pickup3/src/orxonox/CMakeLists.txt (modified) * code/branches/pickup3/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/pickup3/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h (copied) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.h (copied) * code/branches/pickup3/src/orxonox/items/Engine.cc (modified) * code/branches/pickup3/src/orxonox/pickup/BaseItem.cc (modified) * code/branches/pickup3/src/orxonox/pickup/BaseItem.h (modified) * code/branches/pickup3/src/orxonox/pickup/CMakeLists.txt (modified) * code/branches/pickup3/src/orxonox/pickup/DroppedItem.h (deleted) * code/branches/pickup3/src/orxonox/pickup/EquipmentItem.cc (modified) * code/branches/pickup3/src/orxonox/pickup/EquipmentItem.h (modified) * code/branches/pickup3/src/orxonox/pickup/ModifierPickup.cc (modified) * code/branches/pickup3/src/orxonox/pickup/ModifierPickup.h (modified) * code/branches/pickup3/src/orxonox/pickup/ModifierType.h (modified) * code/branches/pickup3/src/orxonox/pickup/PassiveItem.cc (modified) * code/branches/pickup3/src/orxonox/pickup/PassiveItem.h (modified) * code/branches/pickup3/src/orxonox/pickup/PickupCollection.cc (modified) * code/branches/pickup3/src/orxonox/pickup/PickupCollection.h (modified) * code/branches/pickup3/src/orxonox/pickup/PickupInventory.cc (modified) * code/branches/pickup3/src/orxonox/pickup/PickupInventory.h (modified) * code/branches/pickup3/src/orxonox/pickup/PickupSpawner.h (deleted) * code/branches/pickup3/src/orxonox/pickup/UsableItem.cc (modified) * code/branches/pickup3/src/orxonox/pickup/UsableItem.h (modified) * code/branches/pickup3/src/orxonox/pickup/items/HealthImmediate.cc (modified) * code/branches/pickup3/src/orxonox/pickup/items/HealthImmediate.h (modified) * code/branches/pickup3/src/orxonox/pickup/items/HealthUsable.cc (modified) * code/branches/pickup3/src/orxonox/pickup/items/Jump.h (modified) * code/branches/pickup3/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/pickup3/src/orxonox/worldentities/pawns/Pawn.h (modified) Merged pickup2 into pickup3. Fri, 25 Dec 2009 21:48:10 GMT rgrieder [6418] * code/branches/pickup3 (copied) New branch to make pickup2 work easier. Fri, 25 Dec 2009 21:23:58 GMT rgrieder [6417] * code/trunk (modified) * code/trunk/README (modified) * code/trunk/bin/dedicatedClient.bat.in (modified) * code/trunk/bin/dedicatedClient.in (modified) * code/trunk/cmake/FindLua.cmake (modified) * code/trunk/cmake/FindPackageHandleAdvancedArgs.cmake (modified) * code/trunk/cmake/LibraryConfig.cmake (modified) * code/trunk/cmake/LibraryConfigApple.cmake (modified) * code/trunk/cmake/PrecompiledHeaderFiles.cmake (modified) * code/trunk/cmake/SourceFileUtilities.cmake (modified) * code/trunk/data/DataInstallScript.cmake (modified) * code/trunk/data/DefaultResources.oxr (copied) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/layouts/AudioMenu.layout (copied) * code/trunk/data/gui/layouts/ControlsMenu.layout (copied) * code/trunk/data/gui/layouts/CreditsMenu.layout (copied) * code/trunk/data/gui/layouts/DecisionPopup.layout (copied) * code/trunk/data/gui/layouts/GameplayMenu.layout (copied) * code/trunk/data/gui/layouts/GraphicsMenu.layout (copied) * code/trunk/data/gui/layouts/InGameMenu.layout (copied) * code/trunk/data/gui/layouts/InfoPopup.layout (copied) * code/trunk/data/gui/layouts/KeyBindMenu.layout (copied) * code/trunk/data/gui/layouts/MainMenu.layout (modified) * code/trunk/data/gui/layouts/MainMenuBackground.layout (copied) * code/trunk/data/gui/layouts/MouseControlsMenu.layout (copied) * code/trunk/data/gui/layouts/MultiplayerMenu.layout (copied) * code/trunk/data/gui/layouts/MultiplayerOptionsMenu.layout (copied) * code/trunk/data/gui/layouts/PickupInventory.layout (modified) * code/trunk/data/gui/layouts/QuestGUI.layout (modified) * code/trunk/data/gui/layouts/SettingsMenu.layout (copied) * code/trunk/data/gui/layouts/SingleplayerMenu.layout (copied) * code/trunk/data/gui/scripts/AudioMenu.lua (copied) * code/trunk/data/gui/scripts/ControlsMenu.lua (copied) * code/trunk/data/gui/scripts/CreditsMenu.lua (copied) * code/trunk/data/gui/scripts/DecisionPopup.lua (copied) * code/trunk/data/gui/scripts/GUITools.lua (copied) * code/trunk/data/gui/scripts/GameplayMenu.lua (copied) * code/trunk/data/gui/scripts/GraphicsMenu.lua (copied) * code/trunk/data/gui/scripts/InGameMenu.lua (copied) * code/trunk/data/gui/scripts/InfoPopup.lua (copied) * code/trunk/data/gui/scripts/InitialiseGUI.lua (modified) * code/trunk/data/gui/scripts/KeyBindMenu.lua (copied) * code/trunk/data/gui/scripts/MainMenu.lua (modified) * code/trunk/data/gui/scripts/MouseControlsMenu.lua (copied) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (copied) * code/trunk/data/gui/scripts/MultiplayerOptionsMenu.lua (copied) * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) * code/trunk/data/gui/scripts/SettingsMenu.lua (copied) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (copied) * code/trunk/data/levels/empty_level.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/gametype_asteroids.oxw (modified) * code/trunk/data/levels/includes/weaponsettings3.oxi (modified) * code/trunk/data/levels/includes/weaponsettings_HXY.oxi (copied) * code/trunk/data/levels/includes/weaponsettings_Transporter.oxi (copied) * code/trunk/data/levels/includes/weaponsettings_ghost.oxi (modified) * code/trunk/data/levels/old/physicstest.oxw (modified) * code/trunk/data/levels/old/physicstest2.oxw (modified) * code/trunk/data/levels/old/presentation_physics.oxw (modified) * code/trunk/data/levels/old/princessaeryn.oxw (modified) * code/trunk/data/levels/old/questsystem.oxw (modified) * code/trunk/data/levels/old/sample4.oxw (modified) * code/trunk/data/levels/old/spaceshiptemplates_physics.oxw (modified) * code/trunk/data/levels/old/tutorial_hs08.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/presentationHS09.oxw (copied) * code/trunk/data/levels/presentationHS09b.oxw (copied) * code/trunk/data/levels/presentation_dm.oxw (modified) * code/trunk/data/levels/princessaeryn.oxw (modified) * code/trunk/data/levels/questsystem2.oxw (modified) * code/trunk/data/levels/sound.oxw (copied) * code/trunk/data/levels/teambasematchlevel.oxw (modified) * code/trunk/data/levels/templates/spaceship_HXY.oxt (copied) * code/trunk/data/levels/templates/spaceship_HXY_SL.oxt (copied) * code/trunk/data/levels/templates/spaceship_Transporter.oxt (copied) * code/trunk/data/levels/templates/spaceship_Transporter_SL.oxt (copied) * code/trunk/data/levels/templates/spaceship_assff.oxt (modified) * code/trunk/data/levels/templates/spaceship_ghost.oxt (modified) * code/trunk/data/levels/test_ghost.oxw (modified) * code/trunk/data/lua/LuaStateInit.lua (modified) * code/trunk/data/overlays/OrxonoxLoading.overlay (modified) * code/trunk/data/overlays/debug.oxo (modified) * code/trunk/data/overlays/stats.oxo (modified) * code/trunk/data/particle/Steam.particle (copied) * code/trunk/data/particle/bigexplosion.particle (copied) * code/trunk/data/particle/explosion4.particle (copied) * code/trunk/data/particle/laser.particle (copied) * code/trunk/data/particle/load.particle (copied) * code/trunk/data/particle/particlecanon.particle (copied) * code/trunk/data/particle/rocketfire.particle (copied) * code/trunk/data/particle/smoke.particle (copied) * code/trunk/data/particle/tes3.particle (copied) * code/trunk/data/resources.oxr (deleted) * code/trunk/doc/CMakeLists.txt (modified) * code/trunk/doc/api/CMakeLists.txt (modified) * code/trunk/doc/api/main.dox (modified) * code/trunk/src/Orxonox.cc (modified) * code/trunk/src/external/ceguilua/CMakeLists.txt (modified) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/CMakeLists.txt (modified) * code/trunk/src/libraries/core/ArgumentCompletionFunctions.cc (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/ClassTreeMask.cc (modified) * code/trunk/src/libraries/core/CommandEvaluation.cc (modified) * code/trunk/src/libraries/core/CommandEvaluation.h (modified) * code/trunk/src/libraries/core/CommandExecutor.cc (modified) * code/trunk/src/libraries/core/CommandExecutor.h (modified) * code/trunk/src/libraries/core/CommandLineParser.cc (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/ConsoleCommandCompilation.cc (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/DynLib.cc (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 (modified) * code/trunk/src/libraries/core/Executor.h (modified) * code/trunk/src/libraries/core/Functor.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/Game.h (modified) * code/trunk/src/libraries/core/GameMode.h (modified) * code/trunk/src/libraries/core/GameState.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/IOConsole.cc (modified) * code/trunk/src/libraries/core/IOConsole.h (modified) * code/trunk/src/libraries/core/IRC.cc (modified) * code/trunk/src/libraries/core/Identifier.cc (modified) * code/trunk/src/libraries/core/Identifier.h (modified) * code/trunk/src/libraries/core/Language.cc (modified) * code/trunk/src/libraries/core/Language.h (modified) * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/core/LuaState.cc (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/Namespace.cc (modified) * code/trunk/src/libraries/core/NamespaceNode.cc (modified) * code/trunk/src/libraries/core/OrxonoxClass.cc (modified) * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/PathConfig.cc (modified) * code/trunk/src/libraries/core/PathConfig.h (modified) * code/trunk/src/libraries/core/Resource.cc (modified) * code/trunk/src/libraries/core/Resource.h (modified) * code/trunk/src/libraries/core/ScopedSingletonManager.h (modified) * code/trunk/src/libraries/core/Shell.cc (modified) * code/trunk/src/libraries/core/Shell.h (modified) * code/trunk/src/libraries/core/SmartPtr.h (modified) * code/trunk/src/libraries/core/SubclassIdentifier.h (modified) * code/trunk/src/libraries/core/TclBind.cc (modified) * code/trunk/src/libraries/core/TclBind.h (modified) * code/trunk/src/libraries/core/TclThreadManager.cc (modified) * code/trunk/src/libraries/core/TclThreadManager.h (modified) * code/trunk/src/libraries/core/Template.cc (modified) * code/trunk/src/libraries/core/Template.h (modified) * 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/XMLFile.h (modified) * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/core/input/Button.cc (modified) * code/trunk/src/libraries/core/input/Button.h (modified) * code/trunk/src/libraries/core/input/InputBuffer.cc (modified) * code/trunk/src/libraries/core/input/InputBuffer.h (modified) * code/trunk/src/libraries/core/input/InputCommands.h (modified) * code/trunk/src/libraries/core/input/InputDevice.h (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/core/input/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/JoyStick.cc (modified) * code/trunk/src/libraries/core/input/JoyStickQuantityListener.h (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/core/input/KeyBinder.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/Keyboard.cc (modified) * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/ClientConnection.cc (modified) * code/trunk/src/libraries/network/ClientConnection.h (modified) * code/trunk/src/libraries/network/ClientConnectionListener.cc (modified) * code/trunk/src/libraries/network/ClientConnectionListener.h (modified) * code/trunk/src/libraries/network/ClientInformation.cc (modified) * code/trunk/src/libraries/network/Connection.cc (modified) * code/trunk/src/libraries/network/Connection.h (modified) * code/trunk/src/libraries/network/FunctionCallManager.cc (modified) * code/trunk/src/libraries/network/FunctionCallManager.h (modified) * code/trunk/src/libraries/network/GamestateClient.cc (modified) * code/trunk/src/libraries/network/GamestateHandler.cc (modified) * code/trunk/src/libraries/network/GamestateManager.cc (modified) * code/trunk/src/libraries/network/NetworkFunction.cc (modified) * code/trunk/src/libraries/network/NetworkFunction.h (modified) * code/trunk/src/libraries/network/NetworkPrereqs.h (modified) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/Server.h (modified) * code/trunk/src/libraries/network/ServerConnection.cc (modified) * code/trunk/src/libraries/network/ServerConnection.h (modified) * code/trunk/src/libraries/network/TrafficControl.cc (modified) * code/trunk/src/libraries/network/TrafficControl.h (modified) * code/trunk/src/libraries/network/packet/Acknowledgement.cc (modified) * code/trunk/src/libraries/network/packet/Chat.cc (modified) * code/trunk/src/libraries/network/packet/ClassID.cc (modified) * code/trunk/src/libraries/network/packet/ClassID.h (modified) * code/trunk/src/libraries/network/packet/DeleteObjects.cc (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.cc (modified) * code/trunk/src/libraries/network/packet/FunctionIDs.cc (modified) * code/trunk/src/libraries/network/packet/FunctionIDs.h (modified) * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) * code/trunk/src/libraries/network/packet/Packet.cc (modified) * code/trunk/src/libraries/network/synchronisable/CMakeLists.txt (modified) * code/trunk/src/libraries/network/synchronisable/NetworkCallback.h (modified) * code/trunk/src/libraries/network/synchronisable/NetworkCallbackManager.cc (modified) * code/trunk/src/libraries/network/synchronisable/NetworkCallbackManager.h (modified) * code/trunk/src/libraries/network/synchronisable/Serialise.h (copied) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/libraries/network/synchronisable/SynchronisableSpecialisations.cc (deleted) * code/trunk/src/libraries/network/synchronisable/SynchronisableVariable.h (modified) * code/trunk/src/libraries/tools/BillboardSet.cc (modified) * code/trunk/src/libraries/tools/CMakeLists.txt (modified) * code/trunk/src/libraries/tools/Mesh.cc (modified) * code/trunk/src/libraries/tools/ParticleInterface.cc (modified) * code/trunk/src/libraries/tools/ResourceLocation.cc (modified) * code/trunk/src/libraries/tools/Shader.cc (modified) * code/trunk/src/libraries/tools/TextureGenerator.cc (modified) * code/trunk/src/libraries/tools/Timer.cc (modified) * code/trunk/src/libraries/tools/Timer.h (modified) * code/trunk/src/libraries/tools/interfaces/TimeFactorListener.h (modified) * code/trunk/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified) * code/trunk/src/libraries/util/Clipboard.cc (modified) * code/trunk/src/libraries/util/Clock.cc (modified) * code/trunk/src/libraries/util/Clock.h (modified) * code/trunk/src/libraries/util/Convert.h (modified) * code/trunk/src/libraries/util/Debug.h (modified) * code/trunk/src/libraries/util/DisplayStringConversions.h (copied) * code/trunk/src/libraries/util/Exception.cc (modified) * code/trunk/src/libraries/util/Exception.h (modified) * code/trunk/src/libraries/util/ExprParser.cc (modified) * code/trunk/src/libraries/util/ExprParser.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.h (modified) * code/trunk/src/libraries/util/MultiTypeValue.h (modified) * code/trunk/src/libraries/util/OutputHandler.cc (modified) * code/trunk/src/libraries/util/Serialise.h (modified) * code/trunk/src/libraries/util/Singleton.h (modified) * code/trunk/src/libraries/util/StringUtils.cc (modified) * code/trunk/src/libraries/util/SubString.cc (modified) * code/trunk/src/libraries/util/UTFStringConversions.h (deleted) * code/trunk/src/libraries/util/UtilPrereqs.h (modified) * code/trunk/src/libraries/util/mbool.h (modified) * code/trunk/src/modules/objects/Attacher.cc (modified) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventFilter.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventListener.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventTarget.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventTarget.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/Trigger.cc (modified) * code/trunk/src/modules/overlays/GUIOverlay.cc (modified) * code/trunk/src/modules/overlays/OverlayText.cc (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.h (modified) * code/trunk/src/modules/overlays/hud/HUDBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.cc (modified) * code/trunk/src/modules/overlays/stats/CreateLines.cc (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/PongAI.cc (modified) * code/trunk/src/modules/pong/PongBall.cc (modified) * code/trunk/src/modules/pong/PongScore.cc (modified) * code/trunk/src/modules/questsystem/AddQuestHint.cc (modified) * code/trunk/src/modules/questsystem/AddReward.cc (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/QuestDescription.cc (modified) * code/trunk/src/modules/questsystem/QuestEffect.cc (modified) * code/trunk/src/modules/questsystem/QuestGUI.cc (modified) * code/trunk/src/modules/questsystem/QuestGUI.h (modified) * code/trunk/src/modules/questsystem/QuestGUINode.cc (modified) * code/trunk/src/modules/questsystem/QuestGUINode.h (modified) * code/trunk/src/modules/questsystem/QuestHint.cc (modified) * code/trunk/src/modules/questsystem/QuestItem.cc (modified) * code/trunk/src/modules/questsystem/QuestListener.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.h (modified) * code/trunk/src/modules/questsystem/QuestNotification.cc (modified) * code/trunk/src/modules/questsystem/notifications/Notification.cc (modified) * code/trunk/src/modules/questsystem/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/questsystem/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (copied) * code/trunk/src/modules/weapons/projectiles/Rocket.h (copied) * code/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.h (modified) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc (copied) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.h (copied) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/MoodManager.cc (copied) * code/trunk/src/orxonox/MoodManager.h (copied) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/PlayerManager.cc (modified) * code/trunk/src/orxonox/Radar.cc (modified) * code/trunk/src/orxonox/Radar.h (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/Scene.h (modified) * code/trunk/src/orxonox/Test.cc (modified) * code/trunk/src/orxonox/Test.h (modified) * code/trunk/src/orxonox/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/Controller.cc (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/controllers/NewHumanController.cc (copied) * code/trunk/src/orxonox/controllers/NewHumanController.h (copied) * code/trunk/src/orxonox/gamestates/GSDedicated.cc (deleted) * code/trunk/src/orxonox/gamestates/GSDedicatedClient.cc (deleted) * code/trunk/src/orxonox/gamestates/GSGraphics.cc (modified) * code/trunk/src/orxonox/gamestates/GSGraphics.h (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.h (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.h (modified) * code/trunk/src/orxonox/gametypes/Asteroids.cc (modified) * code/trunk/src/orxonox/gametypes/Deathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/graphics/Billboard.cc (modified) * code/trunk/src/orxonox/graphics/BlinkingBillboard.cc (modified) * code/trunk/src/orxonox/graphics/Camera.cc (modified) * code/trunk/src/orxonox/graphics/Camera.h (modified) * code/trunk/src/orxonox/infos/Bot.cc (modified) * code/trunk/src/orxonox/infos/HumanPlayer.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/interfaces/Rewardable.h (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/overlays/InGameConsole.cc (modified) * code/trunk/src/orxonox/overlays/InGameConsole.h (modified) * code/trunk/src/orxonox/overlays/Map.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/pickup/DroppedItem.cc (modified) * code/trunk/src/orxonox/pickup/ModifierPickup.cc (modified) * code/trunk/src/orxonox/pickup/ModifierPickup.h (modified) * code/trunk/src/orxonox/pickup/PickupCollection.cc (modified) * code/trunk/src/orxonox/pickup/PickupInventory.cc (modified) * code/trunk/src/orxonox/pickup/PickupSpawner.cc (modified) * code/trunk/src/orxonox/pickup/UsableItem.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.h (modified) * code/trunk/src/orxonox/sound/BaseSound.cc (modified) * code/trunk/src/orxonox/sound/BaseSound.h (modified) * code/trunk/src/orxonox/sound/CMakeLists.txt (modified) * code/trunk/src/orxonox/sound/SoundBuffer.cc (copied) * code/trunk/src/orxonox/sound/SoundBuffer.h (copied) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.h (modified) * code/trunk/src/orxonox/sound/SoundStreamer.cc (copied) * code/trunk/src/orxonox/sound/SoundStreamer.h (copied) * code/trunk/src/orxonox/sound/WorldSound.cc (modified) * code/trunk/src/orxonox/sound/WorldSound.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponPack.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.h (modified) * code/trunk/src/orxonox/worldentities/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/EffectContainer.cc (copied) * code/trunk/src/orxonox/worldentities/EffectContainer.h (copied) * code/trunk/src/orxonox/worldentities/MovableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MovableEntity.h (modified) * code/trunk/src/orxonox/worldentities/StaticEntity.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Spectator.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Spectator.h (modified) Merged presentation2 branch back to trunk. Major new features: - ...