Changeset 6524 for code/trunk/src/modules/pickup/items

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/modules/pickup (copied) (copied from code/branches/pickup3/src/modules/pickup)
• src/modules/pickup/items (copied) (copied from code/branches/pickup3/src/modules/pickup/items)
• src/modules/pickup/items/CMakeLists.txt (copied) (copied from code/branches/pickup3/src/modules/pickup/items/CMakeLists.txt)
• src/modules/pickup/items/HealthPickup.cc (copied) (copied from code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc)
• src/modules/pickup/items/HealthPickup.h (copied) (copied from code/branches/pickup3/src/modules/pickup/items/HealthPickup.h)
• src/modules/pickup/items/MetaPickup.cc (copied) (copied from code/branches/pickup3/src/modules/pickup/items/MetaPickup.cc)
• src/modules/pickup/items/MetaPickup.h (copied) (copied from code/branches/pickup3/src/modules/pickup/items/MetaPickup.h)