#
# ChangeLog for code/branches/pickup2
#
# Generated by Trac 1.0.9
# Jun 20, 2024, 6:56:53 AM

Wed, 14 Oct 2009 14:36:56 GMT dafrick [5953]
	* code/branches/pickup2 (modified)
	* code/branches/pickup2/src/orxonox/pickup/DroppedItem.cc (modified)
	* code/branches/pickup2/src/orxonox/pickup/DroppedItem.h (modified)
	* code/branches/pickup2/src/orxonox/pickup/PickupSpawner.cc (modified)
	* code/branches/pickup2/src/orxonox/pickup/PickupSpawner.h (modified)

	Made DroppedItem inherit from PickupSpawner. Also minor changes in ...


Wed, 14 Oct 2009 11:44:19 GMT rgrieder [5947]
	* code/branches/pickup2/src/orxonox/pickup/BaseItem.cc (modified)
	* code/branches/pickup2/src/orxonox/pickup/BaseItem.h (modified)
	* code/branches/pickup2/src/orxonox/pickup/DroppedItem.cc (modified)
	* code/branches/pickup2/src/orxonox/pickup/DroppedItem.h (modified)
	* code/branches/pickup2/src/orxonox/pickup/EquipmentItem.cc (modified)
	* code/branches/pickup2/src/orxonox/pickup/EquipmentItem.h (modified)
	* code/branches/pickup2/src/orxonox/pickup/ModifierPickup.cc (modified)
	* code/branches/pickup2/src/orxonox/pickup/ModifierPickup.h (modified)
	* code/branches/pickup2/src/orxonox/pickup/ModifierType.h (modified)
	* code/branches/pickup2/src/orxonox/pickup/PassiveItem.cc (modified)
	* code/branches/pickup2/src/orxonox/pickup/PassiveItem.h (modified)
	* code/branches/pickup2/src/orxonox/pickup/PickupCollection.h (modified)
	* code/branches/pickup2/src/orxonox/pickup/PickupInventory.cc (modified)
	* code/branches/pickup2/src/orxonox/pickup/PickupInventory.h (modified)
	* code/branches/pickup2/src/orxonox/pickup/PickupSpawner.cc (modified)
	* code/branches/pickup2/src/orxonox/pickup/PickupSpawner.h (modified)
	* code/branches/pickup2/src/orxonox/pickup/UsableItem.cc (modified)
	* code/branches/pickup2/src/orxonox/pickup/UsableItem.h (modified)
	* code/branches/pickup2/src/orxonox/pickup/items/HealthImmediate.cc (modified)
	* code/branches/pickup2/src/orxonox/pickup/items/HealthImmediate.h (modified)
	* code/branches/pickup2/src/orxonox/pickup/items/HealthUsable.cc (modified)
	* code/branches/pickup2/src/orxonox/pickup/items/Jump.h (modified)

	Merged pickup branch revisions to pickup2.