#
# ChangeLog for code/trunk/src/modules/pickup/PickupPrereqs.h
#
# Generated by Trac 1.0.9
# Jun 5, 2024, 8:58:02 AM

Tue, 13 Apr 2010 08:16:10 GMT dafrick [6711]
	* code/trunk (modified)
	* code/trunk/data/gui/layouts/PickupInventory.layout (modified)
	* code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme (modified)
	* code/trunk/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/trunk/data/gui/scripts/PickupInventory.lua (modified)
	* code/trunk/data/gui/scripts/QuestGUI.lua (modified)
	* code/trunk/data/levels/includes/pickups.oxi (modified)
	* code/trunk/data/levels/pickup.oxw (modified)
	* code/trunk/data/levels/templates/pickup_representation_templates.oxt (modified)
	* code/trunk/data/overlays/hudtemplates3.oxo (modified)
	* code/trunk/src/modules/pickup/CMakeLists.txt (modified)
	* code/trunk/src/modules/pickup/PickupManager.cc (modified)
	* code/trunk/src/modules/pickup/PickupManager.h (modified)
	* code/trunk/src/modules/pickup/PickupPrereqs.h (modified)
	* code/trunk/src/modules/pickup/PickupRepresentation.cc (modified)
	* code/trunk/src/modules/pickup/PickupRepresentation.h (modified)
	* code/trunk/src/modules/pickup/PickupSpawner.cc (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified)
	* code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified)
	* code/trunk/src/orxonox/items/Engine.cc (modified)
	* code/trunk/src/orxonox/items/Engine.h (modified)
	* code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	Merged pickup4 branch back to trunk.


Tue, 13 Apr 2010 07:50:11 GMT dafrick [6710]
	* code/trunk (modified)
	* code/trunk/data/levels/includes/pickups_invisible.oxi (copied)
	* code/trunk/data/levels/pickup_pps_invi.oxw (copied)
	* code/trunk/data/levels/templates/pickup_representation_templates_invisible.oxt (copied)
	* code/trunk/src/modules/pickup/PickupPrereqs.h (modified)
	* code/trunk/src/modules/pickup/items/CMakeLists.txt (modified)
	* code/trunk/src/modules/pickup/items/InvisiblePickup.cc (copied)
	* code/trunk/src/modules/pickup/items/InvisiblePickup.h (copied)
	* code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified)

	Merged ppspickups2 branch into trunk.


Tue, 13 Apr 2010 07:32:08 GMT dafrick [6709]
	* code/trunk (modified)
	* code/trunk/data/levels/includes/pickups_speed.oxi (copied)
	* code/trunk/data/levels/pickup_ppstest1.oxw (copied)
	* code/trunk/data/levels/templates/pickup_representation_templates_speed.oxt (copied)
	* code/trunk/src/modules/pickup/Pickup.cc (modified)
	* code/trunk/src/modules/pickup/Pickup.h (modified)
	* code/trunk/src/modules/pickup/PickupPrereqs.h (modified)
	* code/trunk/src/modules/pickup/items/CMakeLists.txt (modified)
	* code/trunk/src/modules/pickup/items/HealthPickup.cc (modified)
	* code/trunk/src/modules/pickup/items/HealthPickup.h (modified)
	* code/trunk/src/modules/pickup/items/MetaPickup.cc (modified)
	* code/trunk/src/modules/pickup/items/MetaPickup.h (modified)
	* code/trunk/src/modules/pickup/items/SpeedPickup.cc (copied)
	* code/trunk/src/modules/pickup/items/SpeedPickup.h (copied)
	* code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified)
	* code/trunk/src/orxonox/items/Engine.cc (modified)
	* code/trunk/src/orxonox/items/Engine.h (modified)
	* code/trunk/src/orxonox/items/MultiStateEngine.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	Merged ppspickups1 into trunk.


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


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.