#
# ChangeLog for code
#
# Generated by Trac 1.0.9
# Nov 5, 2024, 11:36:38 PM

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.


Thu, 11 Mar 2010 15:18:06 GMT erwin [6511]
	* code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified)

	You shalt not compile and edit.


Thu, 11 Mar 2010 15:14:53 GMT erwin [6510]
	* code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified)
	* code/branches/sound5/src/orxonox/sound/SoundManager.cc (modified)

	last one for today


Thu, 11 Mar 2010 14:58:42 GMT erwin [6509]
	* code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified)

	Committing spreeeee! Hardcoded source init


Thu, 11 Mar 2010 14:47:35 GMT erwin [6508]
	* code/branches/sound5/src/orxonox/sound/AmbientSound.h (modified)

	Removed unused function declarations


Thu, 11 Mar 2010 14:40:14 GMT erwin [6507]
	* code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified)

	Found a few new places to change things for file streaming


Thu, 11 Mar 2010 14:16:12 GMT scheusso [6506]
	* code/branches/sound5 (modified)
	* code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified)
	* code/branches/sound5/src/orxonox/sound/AmbientSound.h (modified)
	* code/branches/sound5/src/orxonox/sound/BaseSound.cc (modified)
	* code/branches/sound5/src/orxonox/sound/BaseSound.h (modified)
	* code/branches/sound5/src/orxonox/sound/SoundBuffer.h (modified)
	* code/branches/sound5/src/orxonox/sound/SoundManager.cc (modified)
	* code/branches/sound5/src/orxonox/sound/SoundManager.h (modified)
	* code/branches/sound5/src/orxonox/sound/SoundPrereqs.h (copied)
	* code/branches/sound5/src/orxonox/sound/SoundStreamer.cc (modified)
	* code/branches/sound5/src/orxonox/sound/SoundStreamer.h (modified)
	* code/branches/sound5/src/orxonox/sound/WorldSound.h (modified)

	merged sound4 into sound5


Thu, 11 Mar 2010 14:13:23 GMT scheusso [6505]
	* code/branches/sound5 (copied)

	creating new sound5 branch (ogg streaming)


Thu, 11 Mar 2010 14:12:37 GMT erwin [6504]
	* code/branches/sound4/src/orxonox/sound/AmbientSound.cc (modified)
	* code/branches/sound4/src/orxonox/sound/AmbientSound.h (modified)
	* code/branches/sound4/src/orxonox/sound/BaseSound.cc (modified)
	* code/branches/sound4/src/orxonox/sound/SoundManager.cc (modified)

	Commit before rebase, attempt to fix everything ;-)


Thu, 11 Mar 2010 10:44:51 GMT rgrieder [6503]
	* code/trunk/src/libraries/util/CMakeLists.txt (modified)

	Disabled some more warnings in MultiType that OGRE v1.7 revealed.


Thu, 11 Mar 2010 10:34:20 GMT rgrieder [6502]
	* 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/util/Math.h (modified)
	* code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified)
	* code/trunk/src/modules/overlays/stats/CreateLines.cc (modified)
	* code/trunk/src/modules/overlays/stats/Scoreboard.cc (modified)
	* code/trunk/src/modules/overlays/stats/Stats.cc (modified)
	* code/trunk/src/modules/questsystem/QuestGUINode.cc (modified)
	* code/trunk/src/modules/questsystem/notifications/NotificationQueue.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/BillboardProjectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc (modified)
	* code/trunk/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/trunk/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/trunk/src/orxonox/controllers/WaypointPatrolController.cc (modified)
	* code/trunk/src/orxonox/overlays/InGameConsole.cc (modified)
	* code/trunk/src/orxonox/overlays/Map.cc (modified)
	* code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/trunk/src/orxonox/pickup/PickupInventory.cc (modified)
	* code/trunk/src/orxonox/sound/BaseSound.cc (modified)
	* code/trunk/src/orxonox/sound/SoundBuffer.cc (modified)

	Removed a ton of msvc warnings revealed with OGRE v1.7 (they removed ...


Thu, 11 Mar 2010 10:32:01 GMT rgrieder [6501]
	* code/trunk/src/libraries/core/Resource.cc (modified)
	* code/trunk/src/modules/objects/Planet.cc (modified)
	* code/trunk/src/modules/objects/Planet.h (modified)
	* code/trunk/src/orxonox/LevelManager.cc (modified)
	* code/trunk/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/trunk/src/orxonox/graphics/Camera.cc (modified)
	* code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/trunk/src/orxonox/worldentities/WorldEntity.h (modified)

	Ensured OGRE v1.7 "Cthugha" code compatibility. Does not yet seem to ...


Thu, 11 Mar 2010 09:15:35 GMT scheusso [6500]
	* code/branches/tutorial/src/orxonox/controllers/CMakeLists.txt (modified)

	removing dronecontroller from cmakelists in order to build ...


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 14:36:02 GMT rgrieder [6495]
	* code/trunk/cmake/LibraryConfigTardis.cmake (modified)

	Fixed CEGUI library problem on tardis


Mon, 08 Mar 2010 14:36:00 GMT scheusso [6494]
	* code/branches/tutorial/cmake/LibraryConfigTardis.cmake (modified)

	tardis fix


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:53:29 GMT scheusso [6491]
	* code/branches/tutorial/src/orxonox/worldentities/CMakeLists.txt (modified)

	removed Drone.cc from CMakeLists


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:47:11 GMT scheusso [6488]
	* code/branches/tutorial/src/orxonox/worldentities/Drone.cc (modified)

	forgot an important detail


Sun, 07 Mar 2010 22:27:20 GMT rgrieder [6487]
	* code/branches/tutorial (modified)
	* code/branches/tutorial/data/levels/tutorial.oxw (modified)
	* code/branches/tutorial/src/orxonox/controllers/DroneController.cc (modified)
	* code/branches/tutorial/src/orxonox/worldentities/Drone.cc (modified)
	* code/branches/tutorial/src/orxonox/worldentities/Drone.h (modified)

	Merged r5841 that removes the student's code from the tutorial.


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 21:20:51 GMT rgrieder [6483]
	* code/branches/tutorial/src/orxonox/controllers (modified)
	* code/branches/tutorial/src/orxonox/controllers/DroneController.cc (modified)
	* code/branches/tutorial/src/orxonox/controllers/DroneController.h (modified)
	* code/branches/tutorial/src/orxonox/worldentities (modified)
	* code/branches/tutorial/src/orxonox/worldentities/Drone.cc (modified)
	* code/branches/tutorial/src/orxonox/worldentities/Drone.h (modified)

	Cosmetic changes..


Sun, 07 Mar 2010 21:11:31 GMT rgrieder [6482]
	* code/branches/tutorial (modified)
	* code/branches/tutorial/data/levels/tutorial.oxw (modified)
	* code/branches/tutorial/src/orxonox/controllers (modified)
	* code/branches/tutorial/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/tutorial/src/orxonox/controllers/DroneController.cc (copied)
	* code/branches/tutorial/src/orxonox/controllers/DroneController.h (copied)
	* code/branches/tutorial/src/orxonox/pickup/BaseItem.h (modified)
	* code/branches/tutorial/src/orxonox/worldentities (modified)
	* code/branches/tutorial/src/orxonox/worldentities/CMakeLists.txt (modified)
	* code/branches/tutorial/src/orxonox/worldentities/Drone.cc (copied)
	* code/branches/tutorial/src/orxonox/worldentities/Drone.h (copied)

	Merged HS 2009 tutorial in new FS 2010 branch. This includes all the ...


Sun, 07 Mar 2010 21:04:01 GMT rgrieder [6481]
	* code/branches/tutorial (copied)

	Tutorial branch for the FS 2010 PPS.


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.


Sat, 06 Mar 2010 14:08:19 GMT erwin [6476]
	* code/branches/sound4/src/orxonox/sound/AmbientSound.cc (modified)
	* code/branches/sound4/src/orxonox/sound/AmbientSound.h (modified)
	* code/branches/sound4/src/orxonox/sound/SoundStreamer.cc (modified)

	Tried to hack ths sound streaming part in... sound doesn't work at ...


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 ...


Wed, 03 Mar 2010 22:46:32 GMT scheusso [6465]
	* code/branches/network2/src/libraries/core/GraphicsManager.cc (modified)

	stupid mistake


Wed, 03 Mar 2010 19:56:01 GMT scheusso [6464]
	* code/branches/network2/src/libraries/core/GraphicsManager.cc (modified)

	setting default number of mipmaps to unlimited (was 0 before)


Mon, 01 Mar 2010 22:30:21 GMT scheusso [6462]
	* code/branches/network2/data/levels/includes/weaponsettings3.oxi (modified)

	temporarily removing hs-w01 models due to major performance drop ...


Sun, 28 Feb 2010 11:50:59 GMT scheusso [6461]
	* code/trunk/cmake/LibraryConfig.cmake (modified)
	* code/trunk/cmake/LibraryConfigTardis.cmake (modified)

	further tardis hacks/fixes in order to build orxonox on the new ...


Mon, 22 Feb 2010 22:36:11 GMT scheusso [6460]
	* code/trunk/cmake/LibraryConfigTardis.cmake (modified)

	release version now compiling again on tardis


Sun, 24 Jan 2010 16:03:27 GMT rgrieder [6459]
	* code/branches/gamestate/data/gui/scripts/AudioMenu.lua (modified)
	* code/branches/gamestate/data/gui/scripts/BasicGUI.lua (modified)
	* code/branches/gamestate/data/gui/scripts/ControlsMenu.lua (modified)
	* code/branches/gamestate/data/gui/scripts/CreditsMenu.lua (modified)
	* code/branches/gamestate/data/gui/scripts/DecisionPopup.lua (modified)
	* code/branches/gamestate/data/gui/scripts/GameplayMenu.lua (modified)
	* code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua (modified)
	* code/branches/gamestate/data/gui/scripts/InGameMenu.lua (modified)
	* code/branches/gamestate/data/gui/scripts/InfoPopup.lua (modified)
	* code/branches/gamestate/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/branches/gamestate/data/gui/scripts/MainMenu.lua (modified)
	* code/branches/gamestate/data/gui/scripts/MouseControlsMenu.lua (modified)
	* code/branches/gamestate/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/gamestate/data/gui/scripts/MultiplayerOptionsMenu.lua (modified)
	* code/branches/gamestate/data/gui/scripts/PickupInventory.lua (modified)
	* code/branches/gamestate/data/gui/scripts/QuestGUI.lua (modified)
	* code/branches/gamestate/data/gui/scripts/SettingsMenu.lua (modified)
	* code/branches/gamestate/data/gui/scripts/SingleplayerMenu.lua (modified)

	Simplified BasicGUI construction. Just give the name of the GUI as ...


Sat, 23 Jan 2010 15:39:40 GMT scheusso [6458]
	* code/branches/network2/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	changed Pawn::aimPosition_ synchronisation to Client->Server only


Sat, 23 Jan 2010 15:38:41 GMT scheusso [6457]
	* code/branches/network2/src/libraries/network/synchronisable/Synchronisable.h (modified)
	* code/branches/network2/src/orxonox/sound/BaseSound.cc (modified)
	* code/branches/network2/src/orxonox/sound/BaseSound.h (modified)
	* code/branches/network2/src/orxonox/sound/WorldSound.cc (modified)

	changed synchronisation of worldsound state (1 instead of 4 bytes) ...


Fri, 22 Jan 2010 16:49:36 GMT scheusso [6456]
	* code/branches/network2/src/orxonox/graphics/BlinkingBillboard.cc (modified)

	changed BlinkingBillboard Synchronisation in order to reduce traffic ...


Fri, 22 Jan 2010 14:49:23 GMT scheusso [6455]
	* code/branches/network2/src/libraries/network/synchronisable/Synchronisable.cc (modified)
	* code/branches/network2/src/libraries/network/synchronisable/Synchronisable.h (modified)

	unregisterVariable reintroduced
	some style changes


Fri, 22 Jan 2010 13:51:06 GMT rgrieder [6454]
	* code/branches/consolecommands2/src/libraries/core/ConsoleCommand.cc (modified)
	* code/branches/consolecommands2/src/libraries/core/ConsoleCommand.h (modified)
	* code/branches/consolecommands2/src/libraries/util/VA_NARGS.h (modified)

	3 build fixes for MSVC.


Wed, 20 Jan 2010 13:28:48 GMT landauf [6453]
	* code/branches/consolecommands2/src/libraries/core/ConsoleCommand.cc (modified)

	hmm


Wed, 20 Jan 2010 13:21:10 GMT landauf [6452]
	* code/branches/consolecommands2/src/libraries/core/ConsoleCommand.cc (modified)
	* code/branches/consolecommands2/src/libraries/core/ConsoleCommand.h (modified)
	* code/branches/consolecommands2/src/libraries/core/Functor.h (modified)
	* code/branches/consolecommands2/src/libraries/core/LuaState.h (modified)
	* code/branches/consolecommands2/src/libraries/util/Convert.h (modified)
	* code/branches/consolecommands2/src/libraries/util/VA_NARGS.h (added)

	merged current state of the new cc system to the updated branch


Wed, 20 Jan 2010 13:00:45 GMT landauf [6451]
	* code/branches/consolecommands2 (copied)

	annual update of the cc branch


Sun, 17 Jan 2010 23:05:57 GMT scheusso [6450]
	* code/branches/network2/src/libraries/network/GamestateClient.cc (modified)
	* code/branches/network2/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/network2/src/libraries/network/Host.h (modified)
	* code/branches/network2/src/libraries/network/packet/Gamestate.cc (modified)
	* code/branches/network2/src/libraries/network/packet/Gamestate.h (modified)
	* code/branches/network2/src/libraries/network/packet/Packet.cc (modified)
	* code/branches/network2/src/libraries/network/synchronisable/Synchronisable.cc (modified)
	* code/branches/network2/src/libraries/network/synchronisable/Synchronisable.h (modified)

	further traffic reduction:
	- synchronisableheaders are now smaller( ...


Sun, 17 Jan 2010 10:49:48 GMT scheusso [6449]
	* code/branches/network2/src/libraries/network/GamestateClient.cc (modified)
	* code/branches/network2/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/network2/src/libraries/network/GamestateManager.h (modified)
	* code/branches/network2/src/libraries/network/packet/Gamestate.cc (modified)
	* code/branches/network2/src/libraries/network/packet/Gamestate.h (modified)
	* code/branches/network2/src/libraries/network/synchronisable/Serialise.h (modified)
	* code/branches/network2/src/libraries/network/synchronisable/Synchronisable.cc (modified)
	* code/branches/network2/src/libraries/network/synchronisable/Synchronisable.h (modified)

	changed diff behaviour in order to reduce datasize before and after ...


Sun, 17 Jan 2010 10:37:48 GMT scheusso [6448]
	* code/branches/network2/src/modules/objects/Planet.h (modified)
	* code/branches/network2/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified)
	* code/branches/network2/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified)
	* code/branches/network2/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified)
	* code/branches/network2/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified)
	* code/branches/network2/src/modules/pong/PongBall.h (modified)
	* code/branches/network2/src/modules/pong/PongBat.h (modified)
	* code/branches/network2/src/orxonox/CMakeLists.txt (modified)
	* code/branches/network2/src/orxonox/Level.h (modified)
	* code/branches/network2/src/orxonox/Test.h (modified)
	* code/branches/network2/src/orxonox/collisionshapes/CollisionShape.h (modified)
	* code/branches/network2/src/orxonox/graphics/Backlight.h (modified)
	* code/branches/network2/src/orxonox/graphics/Billboard.h (modified)
	* code/branches/network2/src/orxonox/graphics/BlinkingBillboard.h (modified)
	* code/branches/network2/src/orxonox/graphics/FadingBillboard.h (modified)
	* code/branches/network2/src/orxonox/graphics/GlobalShader.h (modified)
	* code/branches/network2/src/orxonox/graphics/Light.h (modified)
	* code/branches/network2/src/orxonox/graphics/Model.h (modified)
	* code/branches/network2/src/orxonox/graphics/ParticleEmitter.h (modified)
	* code/branches/network2/src/orxonox/infos/GametypeInfo.h (modified)
	* code/branches/network2/src/orxonox/infos/HumanPlayer.h (modified)
	* code/branches/network2/src/orxonox/infos/PlayerInfo.h (modified)
	* code/branches/network2/src/orxonox/items/Engine.h (modified)
	* code/branches/network2/src/orxonox/items/MultiStateEngine.h (modified)
	* code/branches/network2/src/orxonox/worldentities/BigExplosion.h (modified)
	* code/branches/network2/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/network2/src/orxonox/worldentities/ExplosionChunk.h (modified)
	* code/branches/network2/src/orxonox/worldentities/MobileEntity.cc (modified)
	* code/branches/network2/src/orxonox/worldentities/MovableEntity.h (modified)
	* code/branches/network2/src/orxonox/worldentities/StaticEntity.h (modified)
	* code/branches/network2/src/orxonox/worldentities/WorldEntity.h (modified)
	* code/branches/network2/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/branches/network2/src/orxonox/worldentities/pawns/SpaceShip.h (modified)
	* code/branches/network2/src/orxonox/worldentities/pawns/Spectator.h (modified)

	made registerVariables always private. otherwise bad things may ...


Mon, 04 Jan 2010 15:15:46 GMT rgrieder [6447]
	* code/tags/0.0.4 (modified)

	Added svn property to 0.0.4 that automatically checks out the data ...


Mon, 04 Jan 2010 15:08:12 GMT rgrieder [6445]
	* code/tags/0.0.4 (copied)

	Added 0.0.4 tag with the results of the 2009 autumn ETH semester.


Mon, 04 Jan 2010 15:06:21 GMT rgrieder [6444]
	* code/trunk/CMakeLists.txt (modified)

	Version bump --> 0.0.4


Mon, 04 Jan 2010 14:52:43 GMT rgrieder [6443]
	* code/trunk/cmake/CompilerConfigMSVC.cmake (modified)
	* code/trunk/src/libraries/util/Debug.h (modified)

	Fixed two problems with the ORXONOX_RELEASE really release version.


Sun, 03 Jan 2010 16:53:05 GMT rgrieder [6442]
	* code/branches/gamestate/src/libraries/core/Core.h (modified)
	* code/branches/gamestate/src/libraries/core/Game.h (modified)
	* code/branches/gamestate/src/libraries/core/IOConsole.cc (modified)
	* code/branches/gamestate/src/libraries/core/IOConsole.h (modified)
	* code/branches/gamestate/src/libraries/core/LuaState.h (modified)
	* code/branches/gamestate/src/libraries/core/Template.cc (modified)
	* code/branches/gamestate/src/libraries/network/TrafficControl.h (modified)
	* code/branches/gamestate/src/libraries/util/Serialise.h (modified)

	Removed unnecessary path qualifiers.


Sun, 03 Jan 2010 14:56:34 GMT rgrieder [6441]
	* code/branches/gamestate/src/libraries/core/GUIManager.cc (modified)
	* code/branches/gamestate/src/libraries/core/GUIManager.h (modified)
	* code/branches/gamestate/src/orxonox/overlays/CMakeLists.txt (modified)
	* code/branches/gamestate/src/orxonox/overlays/GUISheet.cc (added)
	* code/branches/gamestate/src/orxonox/overlays/GUISheet.h (added)

	Added XML loadable wrapper class that can load GUI sheets.


Sun, 03 Jan 2010 14:55:39 GMT rgrieder [6440]
	* code/branches/gamestate/src/modules/questsystem/QuestManager.cc (modified)
	* code/branches/gamestate/src/modules/questsystem/QuestManager.h (modified)

	Fixed typos.


Sun, 03 Jan 2010 14:54:34 GMT rgrieder [6439]
	* code/branches/gamestate/src/libraries/core/Language.h (modified)

	Found two macros that can be replaced by simple inline functions.


Sat, 02 Jan 2010 12:55:45 GMT rgrieder [6438]
	* code/trunk/INSTALL (modified)

	Boost 1.35 currently is the minimum version.


Fri, 01 Jan 2010 21:05:56 GMT rgrieder [6437]
	* code/branches/gamestate/src/libraries/core/ConfigFileManager.cc (modified)
	* code/branches/gamestate/src/libraries/core/ConfigFileManager.h (modified)
	* code/branches/gamestate/src/libraries/core/input/Button.cc (modified)
	* code/branches/gamestate/src/libraries/core/input/Button.h (modified)
	* code/branches/gamestate/src/libraries/core/input/KeyBinder.cc (modified)
	* code/branches/gamestate/src/libraries/core/input/KeyBinder.h (modified)

	Added support for keybindings.ini merging:
	When running development ...


Fri, 01 Jan 2010 20:52:45 GMT rgrieder [6436]
	* code/trunk/data/levels/templates/spaceship_assff.oxt (modified)

	Engine idle sound wasn't looped.


Fri, 01 Jan 2010 17:43:54 GMT rgrieder [6435]
	* code/branches/sound4/src/orxonox/sound/AmbientSound.h (modified)
	* code/branches/sound4/src/orxonox/sound/BaseSound.cc (modified)
	* code/branches/sound4/src/orxonox/sound/BaseSound.h (modified)
	* code/branches/sound4/src/orxonox/sound/SoundBuffer.h (modified)
	* code/branches/sound4/src/orxonox/sound/SoundManager.cc (modified)
	* code/branches/sound4/src/orxonox/sound/SoundManager.h (modified)
	* code/branches/sound4/src/orxonox/sound/SoundPrereqs.h (copied)
	* code/branches/sound4/src/orxonox/sound/SoundStreamer.cc (modified)
	* code/branches/sound4/src/orxonox/sound/SoundStreamer.h (modified)
	* code/branches/sound4/src/orxonox/sound/WorldSound.h (modified)

	Moved getALErrorString function from SoundManager.h to newly created ...


Fri, 01 Jan 2010 17:28:42 GMT rgrieder [6434]
	* code/branches/sound4 (copied)

	Sound streaming branch.


Wed, 30 Dec 2009 14:56:04 GMT scheusso [6433]
	* code/branches/network2 (copied)

	creating network2 branch


Tue, 29 Dec 2009 21:30:19 GMT rgrieder [6432]
	* code/branches/gamestate/data/lua/LuaStateInit.lua (modified)
	* code/branches/gamestate/src/libraries/core/ArgumentCompletionFunctions.cc (modified)
	* code/branches/gamestate/src/libraries/core/ArgumentCompletionFunctions.h (modified)
	* code/branches/gamestate/src/libraries/core/ConfigFileManager.cc (modified)
	* code/branches/gamestate/src/libraries/core/ConfigFileManager.h (modified)
	* code/branches/gamestate/src/libraries/core/ConfigValueContainer.cc (modified)
	* code/branches/gamestate/src/libraries/core/ConfigValueContainer.h (modified)
	* code/branches/gamestate/src/libraries/core/ConfigValueIncludes.h (modified)
	* code/branches/gamestate/src/libraries/core/CorePrereqs.h (modified)
	* code/branches/gamestate/src/libraries/core/Identifier.cc (modified)
	* code/branches/gamestate/src/libraries/core/Identifier.h (modified)
	* code/branches/gamestate/src/libraries/core/Shell.cc (modified)
	* code/branches/gamestate/src/libraries/core/Shell.h (modified)
	* code/branches/gamestate/src/libraries/core/input/Button.cc (modified)
	* code/branches/gamestate/src/libraries/core/input/Button.h (modified)
	* code/branches/gamestate/src/libraries/core/input/JoyStick.cc (modified)
	* code/branches/gamestate/src/libraries/core/input/KeyBinder.cc (modified)
	* code/branches/gamestate/src/libraries/core/input/KeyBinder.h (modified)

	Changed the way config values associated with general settings ...


Tue, 29 Dec 2009 18:16:36 GMT rgrieder [6431]
	* code/branches/gamestate/src/libraries/util/Singleton.h (modified)

	Extended Singleton<T> with a exists() method.


Tue, 29 Dec 2009 09:40:29 GMT rgrieder [6430]
	* code/branches/gamestate (copied)

	Created branch to ditch the GameStates.


Mon, 28 Dec 2009 22:17:18 GMT rgrieder [6429]
	* code/trunk/cmake/CompilerConfigMSVC.cmake (modified)

	No STL iterator bounds checking for MSVC release versions.


Mon, 28 Dec 2009 22:10:37 GMT rgrieder [6428]
	* code/trunk/src/libraries/core/input/Button.cc (modified)
	* code/trunk/src/libraries/core/input/Button.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/KeyDetector.cc (modified)

	Changed config value handling in the KeyBinder. Doesn't change the ...


Mon, 28 Dec 2009 19:35:54 GMT rgrieder [6427]
	* code/trunk/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/trunk/src/libraries/core/ConfigFileManager.h (modified)

	Fixed (whyever it works now) bug in KeyBind menu that caused an error ...


Mon, 28 Dec 2009 09:08:12 GMT rgrieder [6426]
	* code/trunk/src/orxonox/gamestates/GSClient.cc (modified)

	Fixed bug that caused Host to fail an assert when the client failed ...


Sun, 27 Dec 2009 01:30:06 GMT rgrieder [6425]
	* code/trunk/src/libraries/core/ConfigFileManager.cc (modified)
	* code/trunk/src/libraries/core/ConfigFileManager.h (modified)

	Replaced "=" with " = " in our ini files for the config value.
	Also ...


Sun, 27 Dec 2009 01:28:28 GMT rgrieder [6424]
	* code/trunk/src/libraries/util/StringUtils.cc (modified)

	Fixed a bug in removeSlashes: An escape sequence at the third and ...


Sat, 26 Dec 2009 23:09:08 GMT rgrieder [6423]
	* code/trunk/src/libraries/core/ConfigValueIncludes.h (modified)
	* code/trunk/src/libraries/core/CoreIncludes.h (modified)

	Fixed bug that caused derived classes to list the base class's config ...


Sat, 26 Dec 2009 10:18:13 GMT rgrieder [6422]
	* code/trunk/src/libraries/core/ConfigFileManager.cc (modified)
	* code/trunk/src/libraries/core/DynLibManager.cc (modified)
	* code/trunk/src/libraries/core/Game.cc (modified)
	* code/trunk/src/libraries/core/IOConsole.cc (modified)
	* code/trunk/src/libraries/core/Loader.cc (modified)
	* code/trunk/src/libraries/core/input/InputManager.cc (modified)
	* code/trunk/src/libraries/core/input/KeyBinder.cc (modified)
	* code/trunk/src/libraries/core/input/Keyboard.cc (modified)

	Uniform code-styling per file. As if I didn't know what to do ^^


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:
	- ...


Fri, 25 Dec 2009 20:47:45 GMT rgrieder [6416]
	* code/branches/presentation2/src/libraries/core/Core.h (modified)
	* code/branches/presentation2/src/libraries/core/Resource.cc (modified)

	Added missing includes


Fri, 25 Dec 2009 16:18:02 GMT rgrieder [6415]
	* code/branches/presentation2/src/libraries/core/DynLib.cc (modified)

	const std::string& or std::string, but std::string& can yield ...


Fri, 25 Dec 2009 13:07:44 GMT dafrick [6414]
	* code/branches/pickup2/src/libraries/core/DynLib.cc (modified)
	* code/branches/pickup2/src/orxonox/sound/SoundManager.cc (modified)

	Added changes to presentation2 here as well.


Fri, 25 Dec 2009 13:06:28 GMT dafrick [6413]
	* code/branches/presentation2/src/libraries/core/DynLib.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified)

	Resolved some bugs that stood in the way of compiling.
	* In ...


Fri, 25 Dec 2009 12:18:03 GMT dafrick [6412]
	* code/branches/pickup2 (modified)
	* code/branches/pickup2/README (modified)
	* code/branches/pickup2/bin/dedicatedClient.bat.in (modified)
	* code/branches/pickup2/bin/dedicatedClient.in (modified)
	* code/branches/pickup2/cmake/CompilerConfigMSVC.cmake (modified)
	* code/branches/pickup2/cmake/FindLua.cmake (modified)
	* code/branches/pickup2/cmake/FindPackageHandleAdvancedArgs.cmake (modified)
	* code/branches/pickup2/cmake/LibraryConfig.cmake (modified)
	* code/branches/pickup2/cmake/LibraryConfigApple.cmake (modified)
	* code/branches/pickup2/cmake/PrecompiledHeaderFiles.cmake (modified)
	* code/branches/pickup2/cmake/SourceFileUtilities.cmake (modified)
	* code/branches/pickup2/cmake/TargetUtilities.cmake (modified)
	* code/branches/pickup2/data/DataInstallScript.cmake (modified)
	* code/branches/pickup2/data/DefaultResources.oxr (copied)
	* code/branches/pickup2/data/defaultConfig/keybindings.ini (modified)
	* code/branches/pickup2/data/gui/layouts/AudioMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/ControlsMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/CreditsMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/DecisionPopup.layout (copied)
	* code/branches/pickup2/data/gui/layouts/GameplayMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/GraphicsMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/InGameMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/InfoPopup.layout (copied)
	* code/branches/pickup2/data/gui/layouts/KeyBindMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/MainMenu.layout (modified)
	* code/branches/pickup2/data/gui/layouts/MainMenuBackground.layout (copied)
	* code/branches/pickup2/data/gui/layouts/MouseControlsMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/MultiplayerMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/MultiplayerOptionsMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/PickupInventory.layout (modified)
	* code/branches/pickup2/data/gui/layouts/QuestGUI.layout (modified)
	* code/branches/pickup2/data/gui/layouts/SettingsMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/SingleplayerMenu.layout (copied)
	* code/branches/pickup2/data/gui/schemes/OrxonoxGUIScheme.scheme (modified)
	* code/branches/pickup2/data/gui/schemes/TaharezLookWidgetAliases.scheme (modified)
	* code/branches/pickup2/data/gui/scripts/AudioMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/ControlsMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/CreditsMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/DecisionPopup.lua (copied)
	* code/branches/pickup2/data/gui/scripts/GUITools.lua (copied)
	* code/branches/pickup2/data/gui/scripts/GameplayMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/GraphicsMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/InGameMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/InfoPopup.lua (copied)
	* code/branches/pickup2/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/branches/pickup2/data/gui/scripts/KeyBindMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/MainMenu.lua (modified)
	* code/branches/pickup2/data/gui/scripts/MouseControlsMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/MultiplayerMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/MultiplayerOptionsMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/PickupInventory.lua (modified)
	* code/branches/pickup2/data/gui/scripts/QuestGUI.lua (modified)
	* code/branches/pickup2/data/gui/scripts/SettingsMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/SingleplayerMenu.lua (copied)
	* code/branches/pickup2/data/levels/empty_level.oxw (modified)
	* code/branches/pickup2/data/levels/events.oxw (modified)
	* code/branches/pickup2/data/levels/gametype_asteroids.oxw (modified)
	* code/branches/pickup2/data/levels/includes/weaponsettings3.oxi (modified)
	* code/branches/pickup2/data/levels/includes/weaponsettings_HXY.oxi (copied)
	* code/branches/pickup2/data/levels/includes/weaponsettings_Transporter.oxi (copied)
	* code/branches/pickup2/data/levels/includes/weaponsettings_ghost.oxi (copied)
	* code/branches/pickup2/data/levels/old/physicstest.oxw (modified)
	* code/branches/pickup2/data/levels/old/physicstest2.oxw (modified)
	* code/branches/pickup2/data/levels/old/presentation_physics.oxw (modified)
	* code/branches/pickup2/data/levels/old/princessaeryn.oxw (modified)
	* code/branches/pickup2/data/levels/old/questsystem.oxw (modified)
	* code/branches/pickup2/data/levels/old/sample4.oxw (modified)
	* code/branches/pickup2/data/levels/old/spaceshiptemplates_physics.oxw (modified)
	* code/branches/pickup2/data/levels/old/tutorial_hs08.oxw (modified)
	* code/branches/pickup2/data/levels/presentation.oxw (modified)
	* code/branches/pickup2/data/levels/presentation09.oxw (modified)
	* code/branches/pickup2/data/levels/presentation09b.oxw (modified)
	* code/branches/pickup2/data/levels/presentationHS09.oxw (copied)
	* code/branches/pickup2/data/levels/presentationHS09b.oxw (copied)
	* code/branches/pickup2/data/levels/presentation_dm.oxw (modified)
	* code/branches/pickup2/data/levels/princessaeryn.oxw (modified)
	* code/branches/pickup2/data/levels/questsystem2.oxw (copied)
	* code/branches/pickup2/data/levels/sound.oxw (copied)
	* code/branches/pickup2/data/levels/teambasematchlevel.oxw (modified)
	* code/branches/pickup2/data/levels/templates/spaceship_HXY.oxt (copied)
	* code/branches/pickup2/data/levels/templates/spaceship_HXY_SL.oxt (copied)
	* code/branches/pickup2/data/levels/templates/spaceship_Transporter.oxt (copied)
	* code/branches/pickup2/data/levels/templates/spaceship_Transporter_SL.oxt (copied)
	* code/branches/pickup2/data/levels/templates/spaceship_assff.oxt (modified)
	* code/branches/pickup2/data/levels/templates/spaceship_ghost.oxt (copied)
	* code/branches/pickup2/data/levels/test_ghost.oxw (copied)
	* code/branches/pickup2/data/lua/LuaStateInit.lua (modified)
	* code/branches/pickup2/data/overlays/OrxonoxLoading.overlay (modified)
	* code/branches/pickup2/data/overlays/debug.oxo (modified)
	* code/branches/pickup2/data/overlays/hudtemplates3.oxo (modified)
	* code/branches/pickup2/data/overlays/stats.oxo (modified)
	* code/branches/pickup2/data/particle/Steam.particle (copied)
	* code/branches/pickup2/data/particle/bigexplosion.particle (copied)
	* code/branches/pickup2/data/particle/explosion4.particle (copied)
	* code/branches/pickup2/data/particle/laser.particle (copied)
	* code/branches/pickup2/data/particle/load.particle (copied)
	* code/branches/pickup2/data/particle/particlecanon.particle (copied)
	* code/branches/pickup2/data/particle/rocketfire.particle (copied)
	* code/branches/pickup2/data/particle/smoke.particle (copied)
	* code/branches/pickup2/data/particle/tes3.particle (copied)
	* code/branches/pickup2/data/resources.oxr (deleted)
	* code/branches/pickup2/doc/CMakeLists.txt (modified)
	* code/branches/pickup2/doc/api/CMakeLists.txt (modified)
	* code/branches/pickup2/doc/api/doxy.config.in (modified)
	* code/branches/pickup2/doc/api/main.dox (modified)
	* code/branches/pickup2/src/Orxonox.cc (modified)
	* code/branches/pickup2/src/external/ceguilua/CMakeLists.txt (modified)
	* code/branches/pickup2/src/external/ceguilua/ceguilua-0.5.0/CMakeLists.txt (modified)
	* code/branches/pickup2/src/libraries/core/ArgumentCompletionFunctions.cc (modified)
	* code/branches/pickup2/src/libraries/core/BaseObject.cc (modified)
	* code/branches/pickup2/src/libraries/core/BaseObject.h (modified)
	* code/branches/pickup2/src/libraries/core/CMakeLists.txt (modified)
	* code/branches/pickup2/src/libraries/core/ClassTreeMask.cc (modified)
	* code/branches/pickup2/src/libraries/core/CommandEvaluation.cc (modified)
	* code/branches/pickup2/src/libraries/core/CommandEvaluation.h (modified)
	* code/branches/pickup2/src/libraries/core/CommandExecutor.cc (modified)
	* code/branches/pickup2/src/libraries/core/CommandExecutor.h (modified)
	* code/branches/pickup2/src/libraries/core/CommandLine.cc (deleted)
	* code/branches/pickup2/src/libraries/core/CommandLine.h (deleted)
	* code/branches/pickup2/src/libraries/core/CommandLineParser.cc (copied)
	* code/branches/pickup2/src/libraries/core/CommandLineParser.h (copied)
	* code/branches/pickup2/src/libraries/core/ConfigFileManager.cc (modified)
	* code/branches/pickup2/src/libraries/core/ConfigFileManager.h (modified)
	* code/branches/pickup2/src/libraries/core/ConfigValueContainer.h (modified)
	* code/branches/pickup2/src/libraries/core/ConfigValueIncludes.h (modified)
	* code/branches/pickup2/src/libraries/core/ConsoleCommandCompilation.cc (modified)
	* code/branches/pickup2/src/libraries/core/Core.cc (modified)
	* code/branches/pickup2/src/libraries/core/Core.h (modified)
	* code/branches/pickup2/src/libraries/core/CorePrereqs.h (modified)
	* code/branches/pickup2/src/libraries/core/DynLib.cc (modified)
	* code/branches/pickup2/src/libraries/core/DynLib.h (modified)
	* code/branches/pickup2/src/libraries/core/DynLibManager.cc (modified)
	* code/branches/pickup2/src/libraries/core/Event.cc (modified)
	* code/branches/pickup2/src/libraries/core/Event.h (modified)
	* code/branches/pickup2/src/libraries/core/EventIncludes.h (modified)
	* code/branches/pickup2/src/libraries/core/Executor.cc (modified)
	* code/branches/pickup2/src/libraries/core/Executor.h (modified)
	* code/branches/pickup2/src/libraries/core/Functor.h (modified)
	* code/branches/pickup2/src/libraries/core/GUIManager.cc (modified)
	* code/branches/pickup2/src/libraries/core/GUIManager.h (modified)
	* code/branches/pickup2/src/libraries/core/Game.cc (modified)
	* code/branches/pickup2/src/libraries/core/Game.h (modified)
	* code/branches/pickup2/src/libraries/core/GameMode.h (modified)
	* code/branches/pickup2/src/libraries/core/GameState.cc (modified)
	* code/branches/pickup2/src/libraries/core/GraphicsManager.cc (modified)
	* code/branches/pickup2/src/libraries/core/GraphicsManager.h (modified)
	* code/branches/pickup2/src/libraries/core/IOConsole.cc (copied)
	* code/branches/pickup2/src/libraries/core/IOConsole.h (copied)
	* code/branches/pickup2/src/libraries/core/IRC.cc (modified)
	* code/branches/pickup2/src/libraries/core/Identifier.cc (modified)
	* code/branches/pickup2/src/libraries/core/Identifier.h (modified)
	* code/branches/pickup2/src/libraries/core/Language.cc (modified)
	* code/branches/pickup2/src/libraries/core/Language.h (modified)
	* code/branches/pickup2/src/libraries/core/Loader.cc (modified)
	* code/branches/pickup2/src/libraries/core/LuaState.cc (modified)
	* code/branches/pickup2/src/libraries/core/LuaState.h (modified)
	* code/branches/pickup2/src/libraries/core/MemoryArchive.cc (modified)
	* code/branches/pickup2/src/libraries/core/MemoryArchive.h (modified)
	* code/branches/pickup2/src/libraries/core/Namespace.cc (modified)
	* code/branches/pickup2/src/libraries/core/NamespaceNode.cc (modified)
	* code/branches/pickup2/src/libraries/core/OrxonoxClass.cc (modified)
	* code/branches/pickup2/src/libraries/core/OrxonoxClass.h (modified)
	* code/branches/pickup2/src/libraries/core/PathConfig.cc (modified)
	* code/branches/pickup2/src/libraries/core/PathConfig.h (modified)
	* code/branches/pickup2/src/libraries/core/Resource.cc (modified)
	* code/branches/pickup2/src/libraries/core/Resource.h (modified)
	* code/branches/pickup2/src/libraries/core/ScopedSingletonManager.cc (modified)
	* code/branches/pickup2/src/libraries/core/ScopedSingletonManager.h (modified)
	* code/branches/pickup2/src/libraries/core/Shell.cc (modified)
	* code/branches/pickup2/src/libraries/core/Shell.h (modified)
	* code/branches/pickup2/src/libraries/core/SmartPtr.h (modified)
	* code/branches/pickup2/src/libraries/core/SubclassIdentifier.h (modified)
	* code/branches/pickup2/src/libraries/core/TclBind.cc (modified)
	* code/branches/pickup2/src/libraries/core/TclBind.h (modified)
	* code/branches/pickup2/src/libraries/core/TclThreadManager.cc (modified)
	* code/branches/pickup2/src/libraries/core/TclThreadManager.h (modified)
	* code/branches/pickup2/src/libraries/core/Template.cc (modified)
	* code/branches/pickup2/src/libraries/core/Template.h (modified)
	* code/branches/pickup2/src/libraries/core/Thread.cc (modified)
	* code/branches/pickup2/src/libraries/core/Thread.h (modified)
	* code/branches/pickup2/src/libraries/core/ThreadPool.cc (modified)
	* code/branches/pickup2/src/libraries/core/ThreadPool.h (modified)
	* code/branches/pickup2/src/libraries/core/WeakPtr.h (modified)
	* code/branches/pickup2/src/libraries/core/XMLFile.h (modified)
	* code/branches/pickup2/src/libraries/core/XMLPort.h (modified)
	* code/branches/pickup2/src/libraries/core/input/Button.cc (modified)
	* code/branches/pickup2/src/libraries/core/input/Button.h (modified)
	* code/branches/pickup2/src/libraries/core/input/InputBuffer.cc (modified)
	* code/branches/pickup2/src/libraries/core/input/InputBuffer.h (modified)
	* code/branches/pickup2/src/libraries/core/input/InputCommands.h (modified)
	* code/branches/pickup2/src/libraries/core/input/InputDevice.h (modified)
	* code/branches/pickup2/src/libraries/core/input/InputHandler.h (modified)
	* code/branches/pickup2/src/libraries/core/input/InputManager.cc (modified)
	* code/branches/pickup2/src/libraries/core/input/InputManager.h (modified)
	* code/branches/pickup2/src/libraries/core/input/InputPrereqs.h (modified)
	* code/branches/pickup2/src/libraries/core/input/InputState.cc (modified)
	* code/branches/pickup2/src/libraries/core/input/JoyStick.cc (modified)
	* code/branches/pickup2/src/libraries/core/input/JoyStickQuantityListener.h (modified)
	* code/branches/pickup2/src/libraries/core/input/KeyBinder.cc (modified)
	* code/branches/pickup2/src/libraries/core/input/KeyBinder.h (modified)
	* code/branches/pickup2/src/libraries/core/input/KeyBinderManager.cc (modified)
	* code/branches/pickup2/src/libraries/core/input/KeyBinderManager.h (modified)
	* code/branches/pickup2/src/libraries/core/input/KeyDetector.cc (modified)
	* code/branches/pickup2/src/libraries/core/input/KeyDetector.h (modified)
	* code/branches/pickup2/src/libraries/core/input/Keyboard.cc (modified)
	* code/branches/pickup2/src/libraries/network/Client.cc (modified)
	* code/branches/pickup2/src/libraries/network/Client.h (modified)
	* code/branches/pickup2/src/libraries/network/ClientConnection.cc (modified)
	* code/branches/pickup2/src/libraries/network/ClientConnection.h (modified)
	* code/branches/pickup2/src/libraries/network/ClientConnectionListener.cc (modified)
	* code/branches/pickup2/src/libraries/network/ClientConnectionListener.h (modified)
	* code/branches/pickup2/src/libraries/network/ClientInformation.cc (modified)
	* code/branches/pickup2/src/libraries/network/Connection.cc (modified)
	* code/branches/pickup2/src/libraries/network/Connection.h (modified)
	* code/branches/pickup2/src/libraries/network/FunctionCallManager.cc (modified)
	* code/branches/pickup2/src/libraries/network/FunctionCallManager.h (modified)
	* code/branches/pickup2/src/libraries/network/GamestateClient.cc (modified)
	* code/branches/pickup2/src/libraries/network/GamestateHandler.cc (modified)
	* code/branches/pickup2/src/libraries/network/GamestateHandler.h (modified)
	* code/branches/pickup2/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/pickup2/src/libraries/network/Host.cc (modified)
	* code/branches/pickup2/src/libraries/network/Host.h (modified)
	* code/branches/pickup2/src/libraries/network/NetworkFunction.cc (modified)
	* code/branches/pickup2/src/libraries/network/NetworkFunction.h (modified)
	* code/branches/pickup2/src/libraries/network/NetworkPrereqs.h (modified)
	* code/branches/pickup2/src/libraries/network/Server.cc (modified)
	* code/branches/pickup2/src/libraries/network/Server.h (modified)
	* code/branches/pickup2/src/libraries/network/ServerConnection.cc (modified)
	* code/branches/pickup2/src/libraries/network/ServerConnection.h (modified)
	* code/branches/pickup2/src/libraries/network/TrafficControl.cc (modified)
	* code/branches/pickup2/src/libraries/network/TrafficControl.h (modified)
	* code/branches/pickup2/src/libraries/network/packet/Acknowledgement.cc (modified)
	* code/branches/pickup2/src/libraries/network/packet/Acknowledgement.h (modified)
	* code/branches/pickup2/src/libraries/network/packet/Chat.cc (modified)
	* code/branches/pickup2/src/libraries/network/packet/Chat.h (modified)
	* code/branches/pickup2/src/libraries/network/packet/ClassID.cc (modified)
	* code/branches/pickup2/src/libraries/network/packet/ClassID.h (modified)
	* code/branches/pickup2/src/libraries/network/packet/DeleteObjects.cc (modified)
	* code/branches/pickup2/src/libraries/network/packet/DeleteObjects.h (modified)
	* code/branches/pickup2/src/libraries/network/packet/FunctionCalls.cc (modified)
	* code/branches/pickup2/src/libraries/network/packet/FunctionCalls.h (modified)
	* code/branches/pickup2/src/libraries/network/packet/FunctionIDs.cc (modified)
	* code/branches/pickup2/src/libraries/network/packet/FunctionIDs.h (modified)
	* code/branches/pickup2/src/libraries/network/packet/Gamestate.cc (modified)
	* code/branches/pickup2/src/libraries/network/packet/Gamestate.h (modified)
	* code/branches/pickup2/src/libraries/network/packet/Packet.cc (modified)
	* code/branches/pickup2/src/libraries/network/packet/Packet.h (modified)
	* code/branches/pickup2/src/libraries/network/packet/Welcome.h (modified)
	* code/branches/pickup2/src/libraries/network/synchronisable/CMakeLists.txt (modified)
	* code/branches/pickup2/src/libraries/network/synchronisable/NetworkCallback.h (modified)
	* code/branches/pickup2/src/libraries/network/synchronisable/NetworkCallbackManager.cc (modified)
	* code/branches/pickup2/src/libraries/network/synchronisable/NetworkCallbackManager.h (modified)
	* code/branches/pickup2/src/libraries/network/synchronisable/Serialise.h (copied)
	* code/branches/pickup2/src/libraries/network/synchronisable/Synchronisable.cc (modified)
	* code/branches/pickup2/src/libraries/network/synchronisable/Synchronisable.h (modified)
	* code/branches/pickup2/src/libraries/network/synchronisable/SynchronisableSpecialisations.cc (deleted)
	* code/branches/pickup2/src/libraries/network/synchronisable/SynchronisableVariable.h (modified)
	* code/branches/pickup2/src/libraries/tools/BillboardSet.cc (modified)
	* code/branches/pickup2/src/libraries/tools/CMakeLists.txt (modified)
	* code/branches/pickup2/src/libraries/tools/Mesh.cc (modified)
	* code/branches/pickup2/src/libraries/tools/ParticleInterface.cc (modified)
	* code/branches/pickup2/src/libraries/tools/ResourceCollection.h (modified)
	* code/branches/pickup2/src/libraries/tools/ResourceLocation.cc (modified)
	* code/branches/pickup2/src/libraries/tools/Shader.cc (modified)
	* code/branches/pickup2/src/libraries/tools/TextureGenerator.cc (modified)
	* code/branches/pickup2/src/libraries/tools/Timer.cc (modified)
	* code/branches/pickup2/src/libraries/tools/Timer.h (modified)
	* code/branches/pickup2/src/libraries/tools/interfaces/TimeFactorListener.h (modified)
	* code/branches/pickup2/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified)
	* code/branches/pickup2/src/libraries/util/CMakeLists.txt (modified)
	* code/branches/pickup2/src/libraries/util/Clipboard.cc (modified)
	* code/branches/pickup2/src/libraries/util/Clock.cc (modified)
	* code/branches/pickup2/src/libraries/util/Clock.h (modified)
	* code/branches/pickup2/src/libraries/util/Convert.h (modified)
	* code/branches/pickup2/src/libraries/util/Debug.h (modified)
	* code/branches/pickup2/src/libraries/util/DisplayStringConversions.h (copied)
	* code/branches/pickup2/src/libraries/util/Exception.cc (modified)
	* code/branches/pickup2/src/libraries/util/Exception.h (modified)
	* code/branches/pickup2/src/libraries/util/ExprParser.cc (modified)
	* code/branches/pickup2/src/libraries/util/ExprParser.h (modified)
	* code/branches/pickup2/src/libraries/util/Math.cc (modified)
	* code/branches/pickup2/src/libraries/util/Math.h (modified)
	* code/branches/pickup2/src/libraries/util/MathConvert.h (modified)
	* code/branches/pickup2/src/libraries/util/MultiType.h (modified)
	* code/branches/pickup2/src/libraries/util/MultiTypeValue.h (modified)
	* code/branches/pickup2/src/libraries/util/OrxAssert.h (modified)
	* code/branches/pickup2/src/libraries/util/OutputBuffer.cc (deleted)
	* code/branches/pickup2/src/libraries/util/OutputBuffer.h (deleted)
	* code/branches/pickup2/src/libraries/util/OutputHandler.cc (modified)
	* code/branches/pickup2/src/libraries/util/OutputHandler.h (modified)
	* code/branches/pickup2/src/libraries/util/Serialise.h (modified)
	* code/branches/pickup2/src/libraries/util/Singleton.h (modified)
	* code/branches/pickup2/src/libraries/util/StringUtils.cc (modified)
	* code/branches/pickup2/src/libraries/util/SubString.cc (modified)
	* code/branches/pickup2/src/libraries/util/UTFStringConversions.h (deleted)
	* code/branches/pickup2/src/libraries/util/UtilPrereqs.h (modified)
	* code/branches/pickup2/src/libraries/util/mbool.h (modified)
	* code/branches/pickup2/src/modules/objects/Attacher.cc (modified)
	* code/branches/pickup2/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified)
	* code/branches/pickup2/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified)
	* code/branches/pickup2/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified)
	* code/branches/pickup2/src/modules/objects/eventsystem/EventFilter.cc (modified)
	* code/branches/pickup2/src/modules/objects/eventsystem/EventListener.cc (modified)
	* code/branches/pickup2/src/modules/objects/eventsystem/EventTarget.cc (modified)
	* code/branches/pickup2/src/modules/objects/eventsystem/EventTarget.h (modified)
	* code/branches/pickup2/src/modules/objects/triggers/DistanceTrigger.cc (modified)
	* code/branches/pickup2/src/modules/objects/triggers/Trigger.cc (modified)
	* code/branches/pickup2/src/modules/overlays/GUIOverlay.cc (modified)
	* code/branches/pickup2/src/modules/overlays/OverlayText.cc (modified)
	* code/branches/pickup2/src/modules/overlays/hud/ChatOverlay.cc (modified)
	* code/branches/pickup2/src/modules/overlays/hud/ChatOverlay.h (modified)
	* code/branches/pickup2/src/modules/overlays/hud/HUDBar.cc (modified)
	* code/branches/pickup2/src/modules/overlays/hud/HUDHealthBar.cc (modified)
	* code/branches/pickup2/src/modules/overlays/hud/HUDHealthBar.h (modified)
	* code/branches/pickup2/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/pickup2/src/modules/overlays/hud/HUDNavigation.h (modified)
	* code/branches/pickup2/src/modules/overlays/hud/HUDRadar.cc (modified)
	* code/branches/pickup2/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified)
	* code/branches/pickup2/src/modules/overlays/hud/UnderAttackHealthBar.cc (modified)
	* code/branches/pickup2/src/modules/overlays/hud/UnderAttackHealthBar.h (modified)
	* code/branches/pickup2/src/modules/overlays/stats/CreateLines.cc (modified)
	* code/branches/pickup2/src/modules/overlays/stats/CreateLines.h (modified)
	* code/branches/pickup2/src/modules/overlays/stats/Scoreboard.cc (modified)
	* code/branches/pickup2/src/modules/pong/Pong.cc (modified)
	* code/branches/pickup2/src/modules/pong/PongAI.cc (modified)
	* code/branches/pickup2/src/modules/pong/PongBall.cc (modified)
	* code/branches/pickup2/src/modules/pong/PongScore.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/AddQuestHint.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/AddReward.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/ChangeQuestStatus.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/CompleteQuest.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/FailQuest.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/GlobalQuest.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/LocalQuest.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/Quest.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestDescription.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestEffect.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestGUI.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestGUI.h (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestGUINode.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestGUINode.h (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestHint.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestItem.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestListener.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestManager.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestManager.h (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestNotification.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/notifications/Notification.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/notifications/NotificationManager.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/notifications/NotificationQueue.cc (modified)
	* code/branches/pickup2/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/pickup2/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified)
	* code/branches/pickup2/src/modules/weapons/projectiles/Projectile.cc (modified)
	* code/branches/pickup2/src/modules/weapons/projectiles/Rocket.cc (copied)
	* code/branches/pickup2/src/modules/weapons/projectiles/Rocket.h (copied)
	* code/branches/pickup2/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/pickup2/src/modules/weapons/weaponmodes/HsW01.cc (modified)
	* code/branches/pickup2/src/modules/weapons/weaponmodes/HsW01.h (modified)
	* code/branches/pickup2/src/modules/weapons/weaponmodes/LightningGun.cc (modified)
	* code/branches/pickup2/src/modules/weapons/weaponmodes/LightningGun.h (modified)
	* code/branches/pickup2/src/modules/weapons/weaponmodes/RocketFire.cc (copied)
	* code/branches/pickup2/src/modules/weapons/weaponmodes/RocketFire.h (copied)
	* code/branches/pickup2/src/orxonox/CMakeLists.txt (modified)
	* code/branches/pickup2/src/orxonox/CameraManager.cc (modified)
	* code/branches/pickup2/src/orxonox/Level.cc (modified)
	* code/branches/pickup2/src/orxonox/LevelManager.cc (modified)
	* code/branches/pickup2/src/orxonox/LevelManager.h (modified)
	* code/branches/pickup2/src/orxonox/Main.cc (modified)
	* code/branches/pickup2/src/orxonox/MoodManager.cc (copied)
	* code/branches/pickup2/src/orxonox/MoodManager.h (copied)
	* code/branches/pickup2/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/pickup2/src/orxonox/PlayerManager.cc (modified)
	* code/branches/pickup2/src/orxonox/PlayerManager.h (modified)
	* code/branches/pickup2/src/orxonox/Radar.cc (modified)
	* code/branches/pickup2/src/orxonox/Radar.h (modified)
	* code/branches/pickup2/src/orxonox/Scene.cc (modified)
	* code/branches/pickup2/src/orxonox/Scene.h (modified)
	* code/branches/pickup2/src/orxonox/Test.cc (modified)
	* code/branches/pickup2/src/orxonox/Test.h (modified)
	* code/branches/pickup2/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/pickup2/src/orxonox/controllers/ArtificialController.h (modified)
	* code/branches/pickup2/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/pickup2/src/orxonox/controllers/Controller.cc (modified)
	* code/branches/pickup2/src/orxonox/controllers/Controller.h (modified)
	* code/branches/pickup2/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/pickup2/src/orxonox/controllers/HumanController.h (modified)
	* code/branches/pickup2/src/orxonox/controllers/NewHumanController.cc (copied)
	* code/branches/pickup2/src/orxonox/controllers/NewHumanController.h (copied)
	* code/branches/pickup2/src/orxonox/gamestates/CMakeLists.txt (modified)
	* code/branches/pickup2/src/orxonox/gamestates/GSClient.cc (modified)
	* code/branches/pickup2/src/orxonox/gamestates/GSDedicated.cc (deleted)
	* code/branches/pickup2/src/orxonox/gamestates/GSDedicated.h (deleted)
	* code/branches/pickup2/src/orxonox/gamestates/GSDedicatedClient.cc (deleted)
	* code/branches/pickup2/src/orxonox/gamestates/GSDedicatedClient.h (deleted)
	* code/branches/pickup2/src/orxonox/gamestates/GSGraphics.cc (modified)
	* code/branches/pickup2/src/orxonox/gamestates/GSGraphics.h (modified)
	* code/branches/pickup2/src/orxonox/gamestates/GSIOConsole.cc (deleted)
	* code/branches/pickup2/src/orxonox/gamestates/GSIOConsole.h (deleted)
	* code/branches/pickup2/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/branches/pickup2/src/orxonox/gamestates/GSLevel.h (modified)
	* code/branches/pickup2/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/branches/pickup2/src/orxonox/gamestates/GSMainMenu.h (modified)
	* code/branches/pickup2/src/orxonox/gamestates/GSRoot.cc (modified)
	* code/branches/pickup2/src/orxonox/gamestates/GSRoot.h (modified)
	* code/branches/pickup2/src/orxonox/gamestates/GSServer.cc (modified)
	* code/branches/pickup2/src/orxonox/gametypes/Asteroids.cc (modified)
	* code/branches/pickup2/src/orxonox/gametypes/Deathmatch.cc (modified)
	* code/branches/pickup2/src/orxonox/gametypes/Gametype.cc (modified)
	* code/branches/pickup2/src/orxonox/gametypes/Gametype.h (modified)
	* code/branches/pickup2/src/orxonox/gametypes/TeamDeathmatch.cc (modified)
	* code/branches/pickup2/src/orxonox/gametypes/UnderAttack.cc (modified)
	* code/branches/pickup2/src/orxonox/graphics/Billboard.cc (modified)
	* code/branches/pickup2/src/orxonox/graphics/BlinkingBillboard.cc (modified)
	* code/branches/pickup2/src/orxonox/graphics/Camera.cc (modified)
	* code/branches/pickup2/src/orxonox/graphics/Camera.h (modified)
	* code/branches/pickup2/src/orxonox/infos/Bot.cc (modified)
	* code/branches/pickup2/src/orxonox/infos/HumanPlayer.cc (modified)
	* code/branches/pickup2/src/orxonox/infos/PlayerInfo.cc (modified)
	* code/branches/pickup2/src/orxonox/infos/PlayerInfo.h (modified)
	* code/branches/pickup2/src/orxonox/interfaces/RadarViewable.cc (modified)
	* code/branches/pickup2/src/orxonox/interfaces/Rewardable.h (modified)
	* code/branches/pickup2/src/orxonox/items/Engine.h (modified)
	* code/branches/pickup2/src/orxonox/items/MultiStateEngine.cc (modified)
	* code/branches/pickup2/src/orxonox/items/MultiStateEngine.h (modified)
	* code/branches/pickup2/src/orxonox/overlays/InGameConsole.cc (modified)
	* code/branches/pickup2/src/orxonox/overlays/InGameConsole.h (modified)
	* code/branches/pickup2/src/orxonox/overlays/Map.cc (modified)
	* code/branches/pickup2/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/branches/pickup2/src/orxonox/overlays/OrxonoxOverlay.h (modified)
	* code/branches/pickup2/src/orxonox/overlays/OverlayGroup.cc (modified)
	* code/branches/pickup2/src/orxonox/overlays/OverlayGroup.h (modified)
	* code/branches/pickup2/src/orxonox/pickup/DroppedItem.cc (added)
	* code/branches/pickup2/src/orxonox/pickup/ModifierPickup.cc (modified)
	* code/branches/pickup2/src/orxonox/pickup/PickupCollection.cc (modified)
	* code/branches/pickup2/src/orxonox/pickup/PickupInventory.cc (modified)
	* code/branches/pickup2/src/orxonox/pickup/PickupSpawner.cc (added)
	* code/branches/pickup2/src/orxonox/pickup/UsableItem.cc (modified)
	* code/branches/pickup2/src/orxonox/sound/AmbientSound.cc (modified)
	* code/branches/pickup2/src/orxonox/sound/AmbientSound.h (modified)
	* code/branches/pickup2/src/orxonox/sound/BaseSound.cc (modified)
	* code/branches/pickup2/src/orxonox/sound/BaseSound.h (modified)
	* code/branches/pickup2/src/orxonox/sound/CMakeLists.txt (modified)
	* code/branches/pickup2/src/orxonox/sound/SoundBuffer.cc (copied)
	* code/branches/pickup2/src/orxonox/sound/SoundBuffer.h (copied)
	* code/branches/pickup2/src/orxonox/sound/SoundManager.cc (modified)
	* code/branches/pickup2/src/orxonox/sound/SoundManager.h (modified)
	* code/branches/pickup2/src/orxonox/sound/SoundStreamer.cc (copied)
	* code/branches/pickup2/src/orxonox/sound/SoundStreamer.h (copied)
	* code/branches/pickup2/src/orxonox/sound/WorldSound.cc (modified)
	* code/branches/pickup2/src/orxonox/sound/WorldSound.h (modified)
	* code/branches/pickup2/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/pickup2/src/orxonox/weaponsystem/WeaponMode.h (modified)
	* code/branches/pickup2/src/orxonox/weaponsystem/WeaponPack.cc (modified)
	* code/branches/pickup2/src/orxonox/weaponsystem/WeaponPack.h (modified)
	* code/branches/pickup2/src/orxonox/weaponsystem/WeaponSystem.cc (modified)
	* code/branches/pickup2/src/orxonox/weaponsystem/WeaponSystem.h (modified)
	* code/branches/pickup2/src/orxonox/worldentities/CMakeLists.txt (modified)
	* code/branches/pickup2/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/pickup2/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/pickup2/src/orxonox/worldentities/EffectContainer.cc (copied)
	* code/branches/pickup2/src/orxonox/worldentities/EffectContainer.h (copied)
	* code/branches/pickup2/src/orxonox/worldentities/MovableEntity.cc (modified)
	* code/branches/pickup2/src/orxonox/worldentities/MovableEntity.h (modified)
	* code/branches/pickup2/src/orxonox/worldentities/StaticEntity.cc (modified)
	* code/branches/pickup2/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/branches/pickup2/src/orxonox/worldentities/WorldEntity.h (modified)
	* code/branches/pickup2/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/pickup2/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/branches/pickup2/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/branches/pickup2/src/orxonox/worldentities/pawns/Spectator.cc (modified)
	* code/branches/pickup2/src/orxonox/worldentities/pawns/Spectator.h (modified)

	Merged presentation2 branch into pickup2 branch.


Thu, 24 Dec 2009 15:01:23 GMT rgrieder [6411]
	* code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified)

	BaseSound should release the buffer upon destruction and the ...


Thu, 24 Dec 2009 14:56:22 GMT rgrieder [6410]
	* code/branches/presentation2/src/libraries/core/GraphicsManager.cc (modified)

	Just a small mistake...