Changeset 3073 for code/trunk/src/orxonox/objects/pickup
- Timestamp:
- May 25, 2009, 8:30:15 PM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 9 deleted
- 2 edited
- 27 copied
-
. (modified) (2 props)
-
src/orxonox/objects/pickup/BaseItem.cc (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/BaseItem.cc)
-
src/orxonox/objects/pickup/BaseItem.h (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/BaseItem.h)
-
src/orxonox/objects/pickup/CMakeLists.txt (modified) (1 diff)
-
src/orxonox/objects/pickup/DroppedItem.cc (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/DroppedItem.cc)
-
src/orxonox/objects/pickup/DroppedItem.h (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/DroppedItem.h)
-
src/orxonox/objects/pickup/EquipmentItem.cc (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/EquipmentItem.cc)
-
src/orxonox/objects/pickup/EquipmentItem.h (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/EquipmentItem.h)
-
src/orxonox/objects/pickup/ModifierPickup.cc (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.cc)
-
src/orxonox/objects/pickup/ModifierPickup.h (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.h)
-
src/orxonox/objects/pickup/ModifierType.h (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/ModifierType.h)
-
src/orxonox/objects/pickup/PassiveItem.cc (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/PassiveItem.cc)
-
src/orxonox/objects/pickup/PassiveItem.h (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/PassiveItem.h)
-
src/orxonox/objects/pickup/PickupCollection.cc (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc)
-
src/orxonox/objects/pickup/PickupCollection.h (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.h)
-
src/orxonox/objects/pickup/PickupInventory.cc (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/PickupInventory.cc)
-
src/orxonox/objects/pickup/PickupInventory.h (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/PickupInventory.h)
-
src/orxonox/objects/pickup/PickupSpawner.cc (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc)
-
src/orxonox/objects/pickup/PickupSpawner.h (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h)
-
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/pickups2/src/orxonox/objects/pickup/UsableItem.cc)
-
src/orxonox/objects/pickup/UsableItem.h (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/UsableItem.h)
-
src/orxonox/objects/pickup/items (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/items)
-
src/orxonox/objects/pickup/items/CMakeLists.txt (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/items/CMakeLists.txt)
-
src/orxonox/objects/pickup/items/HealthImmediate.cc (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/items/HealthImmediate.cc)
-
src/orxonox/objects/pickup/items/HealthImmediate.h (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/items/HealthImmediate.h)
-
src/orxonox/objects/pickup/items/HealthUsable.cc (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/items/HealthUsable.cc)
-
src/orxonox/objects/pickup/items/HealthUsable.h (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/items/HealthUsable.h)
-
src/orxonox/objects/pickup/items/Jump.cc (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/items/Jump.cc)
-
src/orxonox/objects/pickup/items/Jump.h (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/items/Jump.h)
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:ignore
-
old new 1 1 build 2 2 codeblocks 3 dependencies
-
- Property svn:mergeinfo changed
/code/branches/pickups merged: 2828,2831,2864,2900 /code/branches/pickups2 merged: 2916-2917,2972,3001,3016,3040-3042,3046,3063
- Property svn:ignore
-
code/trunk/src/orxonox/objects/pickup/CMakeLists.txt
r2710 r3073 1 1 ADD_SOURCE_FILES(ORXONOX_SRC_FILES 2 BaseItem.cc 3 DroppedItem.cc 4 EquipmentItem.cc 5 ModifierPickup.cc 6 PassiveItem.cc 7 PickupCollection.cc 8 PickupInventory.cc 2 9 PickupSpawner.cc 3 BaseItem.cc 4 Turbo.cc 5 ShipEquipment.cc 10 UsableItem.cc 6 11 ) 12 13 ADD_SUBDIRECTORY(items)
Note: See TracChangeset
for help on using the changeset viewer.
