Changeset 11354 for code/trunk

Timestamp:

Mar 9, 2017, 2:50:27 PM (8 years ago)

Author:

patricwi

Message:

merged updated HUD branch to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/levels/pickups.oxw (modified) (1 diff)
• data/overlays/HUDPickupTemplate.oxo (copied) (copied from code/branches/HUD_HS16/data/overlays/HUDPickupTemplate.oxo)
• data/overlays/HUDTemplates3.oxo (modified) (1 diff)
• src/modules/overlays/hud/HUDPickupSystem.cc (modified) (1 diff)
• src/modules/overlays/hud/HUDPickupSystem.h (modified) (1 diff)

code/trunk/data/levels/pickups.oxw

@@ -9 +9 @@
 <?lua
   include("stats.oxo")
-  include("HUDTemplates3.oxo")
+  include("HUDPickupTemplate.oxo")
 ?>
 

code/trunk/data/overlays/HUDTemplates3.oxo

@@ -190 +190 @@
      position               = "0.32, 0.81"
      pickpoint              = "0.0, 0.0"
-     visible                = "true"
+     visible                = "false"
     />
 

code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc

@@ -61 +61 @@
         }
     }
+
+    void HUDPickupSystem::sizeChanged()
+    {
+        OrxonoxOverlay::sizeChanged();
+
+    }
+    
 
     void HUDPickupSystem::updatePickupList(std::vector<Pickupable*> picks, std::map<Pickupable*, uint32_t> indexes_)

code/trunk/src/modules/overlays/hud/HUDPickupSystem.h

@@ -56 +56 @@
         virtual ~HUDPickupSystem();
 
+        void sizeChanged();
         void updatePickupList(std::vector<Pickupable*> picks, std::map<Pickupable*, uint32_t> indexes_);  
         void createPickupList();