#
# ChangeLog for code/branches/presentation3/src/modules/pickup
#
# Generated by Trac 1.0.9
# Jun 20, 2024, 8:29:18 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 ...


Thu, 27 May 2010 21:50:24 GMT dafrick [6998]
	* code/branches/presentation3 (modified)
	* code/branches/presentation3/data/levels/includes/pickups.oxi (modified)
	* code/branches/presentation3/data/levels/pickup.oxw (modified)
	* code/branches/presentation3/data/levels/pickup_pps_invi.oxw (deleted)
	* code/branches/presentation3/data/levels/pickup_ppstest1.oxw (deleted)
	* code/branches/presentation3/data/levels/templates/pickup_representation_templates.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/ShieldPickup.cc (copied)
	* code/branches/presentation3/src/modules/pickup/items/ShieldPickup.h (copied)
	* code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.h (modified)

	Merged pickup branch into presentation3 branch.
	Seems to be working ...


Thu, 27 May 2010 20:44:10 GMT dafrick [6996]
	* code/branches/presentation3/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/branches/presentation3/data/gui/scripts/PickupInventory.lua (modified)
	* code/branches/presentation3/src/libraries/core/GUIManager.h (modified)
	* code/branches/presentation3/src/modules/pickup/PickupManager.cc (modified)
	* code/branches/presentation3/src/modules/pickup/PickupManager.h (modified)
	* code/branches/presentation3/src/orxonox/gametypes/Gametype.cc (modified)
	* code/branches/presentation3/src/orxonox/interfaces/Pickupable.cc (modified)
	* code/branches/presentation3/src/orxonox/interfaces/Pickupable.h (modified)
	* code/branches/presentation3/src/orxonox/interfaces/Rewardable.h (modified)

	Loads of changes.
	1) PickupInventory should now be working even for ...


Mon, 24 May 2010 14:59:23 GMT dafrick [6965]
	* code/branches/presentation3/data/gui/scripts/PickupInventory.lua (modified)
	* code/branches/presentation3/src/modules/pickup/PickupManager.cc (modified)
	* code/branches/presentation3/src/modules/pickup/PickupManager.h (modified)
	* code/branches/presentation3/src/orxonox/CMakeLists.txt (modified)
	* code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h (modified)
	* code/branches/presentation3/src/orxonox/interfaces/Pickupable.h (modified)

	Cleaned up in PickupInventory, to be able to improve it at a later
	stage.


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

	creating new presentation merger branch


Sat, 15 May 2010 06:47:07 GMT dafrick [6901]
	* code/trunk/data/levels/pickup.oxw (modified)
	* code/trunk/src/modules/pickup/PickupCollection.cc (modified)
	* code/trunk/src/orxonox/interfaces/Pickupable.cc (modified)
	* code/trunk/src/orxonox/interfaces/Pickupable.h (modified)

	Fixed PickupCollection. It works now the way it was intended and no ...