Changeset 6555

Timestamp:

Mar 18, 2010, 1:08:55 PM (14 years ago)

Author:

scheusso

Message:

merging revisions 6526:6532 from ppspickups2 into new ppspickups2

Location:

code/branches/ppspickups2

Files:

• . (modified) (1 prop)
• data/levels/pickup_pps_invi.oxw (copied) (copied from code/branches/ppspickups2/data/levels/pickup_pps_invi.oxw)
• src/modules/pickup/items/InvisiblePickup.cc (copied) (copied from code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.cc)
• src/modules/pickup/items/InvisiblePickup.h (copied) (copied from code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.h)