Changeset 6552

Timestamp:

Mar 18, 2010, 1:01:56 PM (14 years ago)

Author:

scheusso

Message:

merged revisions 6525:6543 from ppspickups1 into ppspickups1

Location:

code/branches/ppspickups1

Files:

• data/levels/includes/pickups_speed.oxi (added)
• data/levels/pickup_ppstest.oxw (added)
• data/levels/templates/pickup_representation_templates_speed.oxt (added)
• src/modules/pickup/items/CMakeLists.txt (modified) (1 diff)
• src/modules/pickup/items/SpeedPickup.cc (added)
• src/modules/pickup/items/SpeedPickup.h (added)

code/branches/ppspickups1/src/modules/pickup/items/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(PICKUP_SRC_FILES
+
   HealthPickup.cc
+
+  SpeedPickup.cc
   MetaPickup.cc
+
 )