Changeset 11052 for code/trunk/src/modules/pickup

Timestamp:

Jan 9, 2016, 6:26:20 PM (9 years ago)

Author:

landauf

Message:

merged branch presentationHS15 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/pickup/PickupPrereqs.h (modified) (1 diff)
• src/modules/pickup/PickupRepresentation.cc (modified) (1 diff)
• src/modules/pickup/items/BoostPickup.cc (copied) (copied from code/branches/presentationHS15/src/modules/pickup/items/BoostPickup.cc)
• src/modules/pickup/items/BoostPickup.h (copied) (copied from code/branches/presentationHS15/src/modules/pickup/items/BoostPickup.h)
• src/modules/pickup/items/CMakeLists.txt (modified) (1 diff)
• src/modules/pickup/items/DronePickup.h (modified) (2 diffs)
• src/modules/pickup/items/MunitionContainer.cc (copied) (copied from code/branches/presentationHS15/src/modules/pickup/items/MunitionContainer.cc)
• src/modules/pickup/items/MunitionContainer.h (copied) (copied from code/branches/presentationHS15/src/modules/pickup/items/MunitionContainer.h)
• src/modules/pickup/items/MunitionPickup.cc (copied) (copied from code/branches/presentationHS15/src/modules/pickup/items/MunitionPickup.cc)
• src/modules/pickup/items/MunitionPickup.h (copied) (copied from code/branches/presentationHS15/src/modules/pickup/items/MunitionPickup.h)

code/trunk/src/modules/pickup/PickupPrereqs.h

@@ -85 +85 @@
     class ShrinkPickup;
     class DamageBoostPickup;
+    class MunitionPickup;
+    class MunitionContainer;
 }
 

code/trunk/src/modules/pickup/PickupRepresentation.cc

@@ -187 +187 @@
         Billboard* icon = new Billboard(spawner->getContext());
         icon->setColour(ColourValue(0.89f, 0.79f, 0.08f));
-        icon->setMaterial("asterisk");
+        icon->setMaterial("Unknown");
         icon->setScale(0.5);
         sphere->attach(icon);

code/trunk/src/modules/pickup/items/CMakeLists.txt

@@ -8 +8 @@
   ShrinkPickup.cc
   DamageBoostPickup.cc
+  BoostPickup.cc
+  MunitionPickup.cc
+  MunitionContainer.cc
 )

code/trunk/src/modules/pickup/items/DronePickup.h

@@ -43 +43 @@
 #include "tools/interfaces/Tickable.h"
 
-namespace orxonox {
+namespace orxonox
+{
 
     /**
@@ -80 +81 @@
             std::string droneTemplate_; //!< The name of the template, based upon which the Drone is created.
             Pawn* carrierToPawnHelper(void); //!< Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
-
-
-
     };
 }