Changeset 2917 for code/branches/pickups2/src/orxonox/objects/pickup

Timestamp:

Apr 15, 2009, 5:03:58 PM (16 years ago)

Author:

landauf

Message:

merged pickup into pickup2

Location:

code/branches/pickups2

Files:

• . (modified) (2 props)
• src/orxonox/objects/pickup/BaseItem.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/BaseItem.cc) (1 prop)
• src/orxonox/objects/pickup/BaseItem.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/BaseItem.h) (1 prop)
• src/orxonox/objects/pickup/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/pickup/DroppedItem.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/DroppedItem.cc) (1 prop)
• src/orxonox/objects/pickup/DroppedItem.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/DroppedItem.h) (1 prop)
• src/orxonox/objects/pickup/EquipmentItem.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/EquipmentItem.cc) (1 prop)
• src/orxonox/objects/pickup/EquipmentItem.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/EquipmentItem.h) (1 prop)
• src/orxonox/objects/pickup/Jump.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/Jump.cc) (1 prop)
• src/orxonox/objects/pickup/Jump.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/Jump.h) (1 prop)
• src/orxonox/objects/pickup/ModifierPickup.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/ModifierPickup.cc) (1 prop)
• src/orxonox/objects/pickup/ModifierPickup.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/ModifierPickup.h) (1 prop)
• src/orxonox/objects/pickup/ModifierType.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/ModifierType.h) (1 prop)
• src/orxonox/objects/pickup/PassiveItem.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/PassiveItem.cc) (1 prop)
• src/orxonox/objects/pickup/PassiveItem.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/PassiveItem.h) (1 prop)
• src/orxonox/objects/pickup/PickupCollection.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/PickupCollection.cc) (1 prop)
• src/orxonox/objects/pickup/PickupCollection.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/PickupCollection.h) (1 prop)
• src/orxonox/objects/pickup/PickupSpawner.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/PickupSpawner.cc) (1 prop)
• src/orxonox/objects/pickup/PickupSpawner.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/PickupSpawner.h) (1 prop)
• src/orxonox/objects/pickup/ShipEquipment.cc (deleted)
• src/orxonox/objects/pickup/ShipEquipment.h (deleted)
• src/orxonox/objects/pickup/ShipEquipmentClasses.cc (deleted)
• src/orxonox/objects/pickup/ShipEquipmentClasses.h (deleted)
• src/orxonox/objects/pickup/ShipItem.cc (deleted)
• src/orxonox/objects/pickup/ShipItem.h (deleted)
• src/orxonox/objects/pickup/Turbo.cc (deleted)
• src/orxonox/objects/pickup/Turbo.h (deleted)
• src/orxonox/objects/pickup/Usable.h (deleted)
• src/orxonox/objects/pickup/UsableItem.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/UsableItem.cc) (1 prop)
• src/orxonox/objects/pickup/UsableItem.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/UsableItem.h) (1 prop)

code/branches/pickups2/src/orxonox/objects/pickup/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+  BaseItem.cc
+  DroppedItem.cc
+  EquipmentItem.cc
+  Jump.cc
+  ModifierPickup.cc
+  PassiveItem.cc
+  PickupCollection.cc
   PickupSpawner.cc
-  BaseItem.cc
-  Turbo.cc
-  ShipEquipment.cc
+  UsableItem.cc
 )