#
# ChangeLog for code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc
#
# Generated by Trac 1.0.9
# Jun 2, 2024, 12:10:24 AM

Mon, 10 May 2010 14:57:42 GMT benedict [6895]
	* code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	high on cpout


Mon, 10 May 2010 14:52:34 GMT ebeier [6894]
	* code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	cout again -.-


Mon, 10 May 2010 14:49:45 GMT ebeier [6893]
	* code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	more cout yeahhhhhh


Mon, 10 May 2010 14:41:26 GMT ebeier [6892]
	* code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	inserted cout for troubleshooting


Mon, 10 May 2010 14:23:29 GMT benedict [6884]
	* code/branches/ppspickups3/data/levels/includes/pickups.oxi (modified)
	* code/branches/ppspickups3/data/levels/pickup.oxw (modified)
	* code/branches/ppspickups3/data/levels/templates/pickup_representation_templates.oxt (modified)
	* code/branches/ppspickups3/src/modules/pickup/items/ShieldPickup.cc (modified)
	* code/branches/ppspickups3/src/modules/pickup/items/ShieldPickup.h (modified)
	* code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.h (modified)

	did the shield pickup. upload for testing


Mon, 19 Apr 2010 14:32:54 GMT dafrick [6756]
	* code/branches/ppspickups3 (copied)

	Creating new pps pickups branch for Eric and Benedict.


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.