#
# ChangeLog for code/branches/presentation3/src/orxonox/OrxonoxPrereqs.h
#
# Generated by Trac 1.0.9
# May 23, 2024, 6:12:11 PM

Mon, 31 May 2010 03:31:50 GMT landauf [7034]
	* code/branches/presentation3 (modified)
	* code/branches/presentation3/data/levels/pickups.oxw (modified)
	* code/branches/presentation3/data/levels/templates/pickup_representation_templates.oxt (modified)
	* code/branches/presentation3/data/levels/templates/spaceship_pirate.oxt (modified)
	* code/branches/presentation3/src/modules/pickup/PickupPrereqs.h (modified)
	* code/branches/presentation3/src/modules/pickup/items/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/pickup/items/DronePickup.cc (copied)
	* code/branches/presentation3/src/modules/pickup/items/DronePickup.h (copied)
	* code/branches/presentation3/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/presentation3/src/orxonox/controllers/ArtificialController.h (modified)
	* code/branches/presentation3/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/presentation3/src/orxonox/controllers/DroneController.cc (copied)
	* code/branches/presentation3/src/orxonox/controllers/DroneController.h (copied)
	* code/branches/presentation3/src/orxonox/controllers/WaypointPatrolController.cc (modified)
	* code/branches/presentation3/src/orxonox/controllers/WaypointPatrolController.h (modified)
	* code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h (modified)
	* code/branches/presentation3/src/orxonox/worldentities/CMakeLists.txt (modified)
	* code/branches/presentation3/src/orxonox/worldentities/Drone.cc (copied)
	* code/branches/presentation3/src/orxonox/worldentities/Drone.h (copied)

	merged ai branch to presentation3


Mon, 31 May 2010 02:42:57 GMT landauf [7031]
	* code/branches/presentation3 (modified)
	* code/branches/presentation3/data/levels/gametype_dynamicmatch.oxw (copied)
	* code/branches/presentation3/data/overlays/dynamicmatchhud.oxo (copied)
	* code/branches/presentation3/src/modules/overlays/OverlaysPrereqs.h (modified)
	* code/branches/presentation3/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/overlays/hud/GametypeFadingMessage.cc (copied)
	* code/branches/presentation3/src/modules/overlays/hud/GametypeFadingMessage.h (copied)
	* code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.cc (copied)
	* code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.h (copied)
	* code/branches/presentation3/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/presentation3/src/orxonox/gametypes/CMakeLists.txt (modified)
	* code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.cc (copied)
	* code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.h (copied)
	* code/branches/presentation3/src/orxonox/infos/GametypeInfo.cc (modified)
	* code/branches/presentation3/src/orxonox/infos/GametypeInfo.h (modified)
	* code/branches/presentation3/src/orxonox/interfaces/GametypeMessageListener.h (modified)

	merged dynamicmatch to presentation3


Mon, 17 May 2010 13:31:49 GMT scheusso [6912]
	* code/branches/presentation3 (copied)

	creating new presentation merger branch


Mon, 15 Mar 2010 14:27:09 GMT dafrick [6524]
	* code/trunk (modified)
	* code/trunk/data/levels/empty_level.oxw (modified)
	* code/trunk/data/levels/includes/pickups.oxi (copied)
	* code/trunk/data/levels/pickup.oxw (copied)
	* code/trunk/data/levels/templates/pickup_representation_templates.oxt (copied)
	* code/trunk/src/libraries/core/BaseObject.cc (modified)
	* code/trunk/src/libraries/core/BaseObject.h (modified)
	* code/trunk/src/libraries/core/GraphicsManager.cc (modified)
	* code/trunk/src/libraries/core/OrxonoxClass.h (modified)
	* code/trunk/src/libraries/core/Super.h (modified)
	* code/trunk/src/modules/CMakeLists.txt (modified)
	* code/trunk/src/modules/pickup (copied)
	* code/trunk/src/modules/pickup/CMakeLists.txt (copied)
	* code/trunk/src/modules/pickup/DroppedPickup.cc (copied)
	* code/trunk/src/modules/pickup/DroppedPickup.h (copied)
	* code/trunk/src/modules/pickup/Pickup.cc (copied)
	* code/trunk/src/modules/pickup/Pickup.h (copied)
	* code/trunk/src/modules/pickup/PickupCollection.cc (copied)
	* code/trunk/src/modules/pickup/PickupCollection.h (copied)
	* code/trunk/src/modules/pickup/PickupCollectionIdentifier.cc (copied)
	* code/trunk/src/modules/pickup/PickupCollectionIdentifier.h (copied)
	* code/trunk/src/modules/pickup/PickupManager.cc (copied)
	* code/trunk/src/modules/pickup/PickupManager.h (copied)
	* code/trunk/src/modules/pickup/PickupPrecompiledHeaders.h (copied)
	* code/trunk/src/modules/pickup/PickupPrereqs.h (copied)
	* code/trunk/src/modules/pickup/PickupRepresentation.cc (copied)
	* code/trunk/src/modules/pickup/PickupRepresentation.h (copied)
	* code/trunk/src/modules/pickup/PickupSpawner.cc (copied)
	* code/trunk/src/modules/pickup/PickupSpawner.h (copied)
	* code/trunk/src/modules/pickup/items (copied)
	* code/trunk/src/modules/pickup/items/CMakeLists.txt (copied)
	* code/trunk/src/modules/pickup/items/HealthPickup.cc (copied)
	* code/trunk/src/modules/pickup/items/HealthPickup.h (copied)
	* code/trunk/src/modules/pickup/items/MetaPickup.cc (copied)
	* code/trunk/src/modules/pickup/items/MetaPickup.h (copied)
	* code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/interfaces/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified)
	* code/trunk/src/orxonox/interfaces/PickupCarrier.h (copied)
	* code/trunk/src/orxonox/interfaces/Pickupable.cc (copied)
	* code/trunk/src/orxonox/interfaces/Pickupable.h (copied)
	* code/trunk/src/orxonox/items/Engine.cc (modified)
	* code/trunk/src/orxonox/pickup/BaseItem.cc (deleted)
	* code/trunk/src/orxonox/pickup/BaseItem.h (deleted)
	* code/trunk/src/orxonox/pickup/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/pickup/DroppedItem.cc (deleted)
	* code/trunk/src/orxonox/pickup/DroppedItem.h (deleted)
	* code/trunk/src/orxonox/pickup/EquipmentItem.cc (deleted)
	* code/trunk/src/orxonox/pickup/EquipmentItem.h (deleted)
	* code/trunk/src/orxonox/pickup/ModifierPickup.cc (deleted)
	* code/trunk/src/orxonox/pickup/ModifierPickup.h (deleted)
	* code/trunk/src/orxonox/pickup/ModifierType.h (deleted)
	* code/trunk/src/orxonox/pickup/PassiveItem.cc (deleted)
	* code/trunk/src/orxonox/pickup/PassiveItem.h (deleted)
	* code/trunk/src/orxonox/pickup/PickupCollection.cc (deleted)
	* code/trunk/src/orxonox/pickup/PickupCollection.h (deleted)
	* code/trunk/src/orxonox/pickup/PickupIdentifier.cc (copied)
	* code/trunk/src/orxonox/pickup/PickupIdentifier.h (copied)
	* code/trunk/src/orxonox/pickup/PickupInventory.cc (deleted)
	* code/trunk/src/orxonox/pickup/PickupInventory.h (deleted)
	* code/trunk/src/orxonox/pickup/PickupSpawner.cc (deleted)
	* code/trunk/src/orxonox/pickup/PickupSpawner.h (deleted)
	* code/trunk/src/orxonox/pickup/UsableItem.cc (deleted)
	* code/trunk/src/orxonox/pickup/UsableItem.h (deleted)
	* code/trunk/src/orxonox/pickup/items (deleted)
	* 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)

	Merged pickup branch into trunk. Yay. Persisting bugs will be fixed, ...