Changeset 2088

Timestamp:

Nov 1, 2008, 7:16:27 PM (15 years ago)

Author:

landauf

Message:

merged pickups back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/core/XMLIncludes.h (modified) (1 prop)
• src/orxonox/objects/infos/Level.cc (modified) (1 prop)
• src/orxonox/objects/infos/Level.h (modified) (1 prop)
• src/orxonox/objects/pickup (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup)
• src/orxonox/objects/pickup/ShipEquipment.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/ShipEquipment.h)
• src/orxonox/objects/pickup/ShipEquipmentClasses.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/ShipEquipmentClasses.cc)
• src/orxonox/objects/pickup/ShipEquipmentClasses.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/ShipEquipmentClasses.h)
• src/orxonox/objects/pickup/ShipItem.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/ShipItem.cc)
• src/orxonox/objects/pickup/ShipItem.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/ShipItem.h)
• src/orxonox/objects/pickup/Usable.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/Usable.h)
• src/tolua/tolua-5.1.pkg (modified) (1 prop)
• src/util (modified) (1 prop)
• src/util/Exception.cc (modified) (1 prop)
• src/util/Exception.h (modified) (1 prop)
• visual_studio/vc8/audio.vsprops (modified) (1 prop)
• visual_studio/vc8/base.vsprops (modified) (1 prop)
• visual_studio/vc8/ceguilua.vsprops (modified) (1 prop)
• visual_studio/vc8/core.vsprops (modified) (1 prop)
• visual_studio/vc8/cpptcl.vsprops (modified) (1 prop)
• visual_studio/vc8/debug.vsprops (modified) (1 prop)
• visual_studio/vc8/directories.vsprops (modified) (1 prop)
• visual_studio/vc8/lua.vsprops (modified) (1 prop)
• visual_studio/vc8/network.vsprops (modified) (1 prop)
• visual_studio/vc8/orxonox.vsprops (modified) (1 prop)
• visual_studio/vc8/orxonox_vc8.sln (modified) (1 prop)
• visual_studio/vc8/release.vsprops (modified) (1 prop)
• visual_studio/vc8/tinyxml.vcproj (modified) (1 prop)
• visual_studio/vc8/tinyxml.vsprops (modified) (1 prop)
• visual_studio/vc8/tolua.vsprops (modified) (1 prop)
• visual_studio/vc8/toluagen.vcproj (modified) (1 prop)
• visual_studio/vc8/toluagen.vsprops (modified) (1 prop)
• visual_studio/vc8/toluagen_orxonox.vcproj (modified) (1 prop)
• visual_studio/vc8/toluagen_orxonox.vsprops (modified) (1 prop)
• visual_studio/vc8/util.vsprops (modified) (1 prop)