Changeset 10961 for code/branches/presentationHS15/src/modules/pickup/items

Timestamp:

Dec 9, 2015, 2:45:58 PM (9 years ago)

Author:

maxima

Message:

Merged presentation and fabiens branch. Had to modify hoverHUD and invaderHUD, because the text of the healthbar wasn't correctly displayed and the weapon settings of the hovership.

Location:

code/branches/presentationHS15

Files:

• . (modified) (1 prop)
• src/modules/pickup/items/BoostPickup.cc (copied) (copied from code/branches/fabienHS15/src/modules/pickup/items/BoostPickup.cc)
• src/modules/pickup/items/BoostPickup.h (copied) (copied from code/branches/fabienHS15/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/fabienHS15/src/modules/pickup/items/MunitionContainer.cc)
• src/modules/pickup/items/MunitionContainer.h (copied) (copied from code/branches/fabienHS15/src/modules/pickup/items/MunitionContainer.h)
• src/modules/pickup/items/MunitionPickup.cc (copied) (copied from code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.cc)
• src/modules/pickup/items/MunitionPickup.h (copied) (copied from code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.h)

code/branches/presentationHS15/src/modules/pickup/items/CMakeLists.txt

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

code/branches/presentationHS15/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.
-
-
-
     };
 }