Changeset 6906 for code/trunk/data/gui

Timestamp:

May 17, 2010, 1:22:26 PM (15 years ago)

Author:

dafrick

Message:

Added DistanceTriggerBeacon, which is a device which can be attached to objects to trigger a DistanceTrigger (both the (single) DistanceTrigger and DistanceMultiTrigger) based on the name of the DistanceTri$
Also some minor adjustements in QuestEffectBeacon: Removed some output and adjusted the outputlevel of some other output.
And started working on PickupInventory again (though no significant changes yet).

File:

• code/trunk/data/gui/scripts/PickupInventory.lua (modified) (2 diffs)

code/trunk/data/gui/scripts/PickupInventory.lua

@@ -74 +74 @@
 
     local name = "orxonox/PickupInventory/Carrier" .. index
-        
+    
     --Design parameters:
     local imageHeight = 50
@@ -86 +86 @@
     box:setPosition(CEGUI.UVector2(CEGUI.UDim(0, horizontalOffset), CEGUI.UDim(0, 0)))
     box:setSize(CEGUI.UVector2(CEGUI.UDim(1.0, -horizontalOffset), CEGUI.UDim(1, 0)))
-    
-    offset = offset+textHeight
-    local title = winMgr:createWindow("MenuWidgets/StaticText", name .. "/Title")
-    title:setText(carrier:getCarrierName())
-    title:setSize(CEGUI.UVector2(CEGUI.UDim(1, 0), CEGUI.UDim(0, offset)))
-    title:setProperty("FrameEnabled", "set:False")
-    box:addChildWindow(title)
     
     local numPickups = orxonox.PickupManager:getInstance():getNumPickups(carrier)