# # ChangeLog for code/branches/ppspickups3 # # Generated by Trac 1.0.9 # Nov 28, 2024, 11:09:58 AM 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:30:01 GMT ebeier [6887] * code/branches/ppspickups3/src/modules/pickup/items/ShieldPickup.cc (modified) small correction 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, 10 May 2010 11:28:19 GMT ebeier [6869] * code/branches/ppspickups3/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/ppspickups3/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/ppspickups3/src/modules/pickup/items/ShieldPickup.cc (added) * code/branches/ppspickups3/src/modules/pickup/items/ShieldPickup.h (added) added files for ShieldPickup, nothing implemented yet. Mon, 19 Apr 2010 14:32:54 GMT dafrick [6756] * code/branches/ppspickups3 (copied) Creating new pps pickups branch for Eric and Benedict. Mon, 19 Apr 2010 14:12:23 GMT dafrick [6755] * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) Fixed Segfault upon dropping of InvisiblePickup, while it was being used.