#
# ChangeLog for code/branches/presentation3/src/modules/pickup/Pickup.cc
#
# Generated by Trac 1.0.9
# Jun 16, 2024, 1:24:40 PM

Sat, 29 May 2010 19:33:33 GMT dafrick [7008]
	* code/branches/presentation3/data/levels/pickups.oxw (modified)
	* code/branches/presentation3/src/libraries/core/OrxonoxClass.h (modified)
	* code/branches/presentation3/src/modules/pickup/Pickup.cc (modified)
	* code/branches/presentation3/src/modules/pickup/Pickup.h (modified)
	* code/branches/presentation3/src/modules/pickup/items/HealthPickup.cc (modified)

	Fixed a bug in pickups that caused the clone method of Pickup.h not ...


Sat, 29 May 2010 18:41:19 GMT dafrick [7007]
	* code/branches/presentation3/data/levels/empty_level.oxw (modified)
	* code/branches/presentation3/data/levels/gametype_asteroids.oxw (modified)
	* code/branches/presentation3/data/levels/gametype_underattack.oxw (modified)
	* code/branches/presentation3/data/levels/mylevel.oxw (modified)
	* code/branches/presentation3/data/levels/pickups.oxw (moved)
	* code/branches/presentation3/data/levels/presentation09.oxw (modified)
	* code/branches/presentation3/data/levels/presentation09b.oxw (modified)
	* code/branches/presentation3/data/levels/presentationHS09.oxw (modified)
	* code/branches/presentation3/data/levels/presentationHS09b.oxw (modified)
	* code/branches/presentation3/data/levels/presentationLOD.oxw (modified)
	* code/branches/presentation3/data/levels/presentationLODdif.oxw (modified)
	* code/branches/presentation3/data/levels/presentation_dm.oxw (modified)
	* code/branches/presentation3/data/levels/presentation_pong.oxw (modified)
	* code/branches/presentation3/data/levels/princessaeryn.oxw (modified)
	* code/branches/presentation3/data/levels/questsystem2.oxw (deleted)
	* code/branches/presentation3/data/levels/sound.oxw (modified)
	* code/branches/presentation3/data/levels/teambasematchlevel.oxw (modified)
	* code/branches/presentation3/data/levels/teamdeathmatch.oxw (modified)
	* code/branches/presentation3/data/levels/test_ghost.oxw (modified)
	* code/branches/presentation3/data/levels/tutorial.oxw (modified)
	* code/branches/presentation3/data/levels/waypoints.oxw (modified)
	* code/branches/presentation3/src/modules/pickup/Pickup.cc (modified)

	Tested and cleaned all levels (except for the ones that someone is ...


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

	creating new presentation merger branch


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.