Changeset 6524 for code/trunk/src/orxonox/pickup

Timestamp:

Mar 15, 2010, 3:27:09 PM (15 years ago)

Author:

dafrick

Message:

Merged pickup branch into trunk. Yay. Persisting bugs will be fixed, very soon.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/pickup/BaseItem.cc (deleted)
• src/orxonox/pickup/BaseItem.h (deleted)
• src/orxonox/pickup/CMakeLists.txt (modified) (1 diff)
• src/orxonox/pickup/DroppedItem.cc (deleted)
• src/orxonox/pickup/DroppedItem.h (deleted)
• src/orxonox/pickup/EquipmentItem.cc (deleted)
• src/orxonox/pickup/EquipmentItem.h (deleted)
• src/orxonox/pickup/ModifierPickup.cc (deleted)
• src/orxonox/pickup/ModifierPickup.h (deleted)
• src/orxonox/pickup/ModifierType.h (deleted)
• src/orxonox/pickup/PassiveItem.cc (deleted)
• src/orxonox/pickup/PassiveItem.h (deleted)
• src/orxonox/pickup/PickupCollection.cc (deleted)
• src/orxonox/pickup/PickupCollection.h (deleted)
• src/orxonox/pickup/PickupIdentifier.cc (copied) (copied from code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.cc)
• src/orxonox/pickup/PickupIdentifier.h (copied) (copied from code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.h)
• src/orxonox/pickup/PickupInventory.cc (deleted)
• src/orxonox/pickup/PickupInventory.h (deleted)
• src/orxonox/pickup/PickupSpawner.cc (deleted)
• src/orxonox/pickup/PickupSpawner.h (deleted)
• src/orxonox/pickup/UsableItem.cc (deleted)
• src/orxonox/pickup/UsableItem.h (deleted)
• src/orxonox/pickup/items (deleted)

code/trunk/src/orxonox/pickup/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
-  BaseItem.cc
-  DroppedItem.cc
-  EquipmentItem.cc
-  ModifierPickup.cc
-  PassiveItem.cc
-  PickupCollection.cc
-  PickupInventory.cc
-  PickupSpawner.cc
-  UsableItem.cc
+  PickupIdentifier.cc
 )
 
-ADD_SUBDIRECTORY(items)