Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jul 5, 2016, 11:46:10 PM (8 years ago)
Author:
bknecht
Message:

Merging cegui0.8 branch into ogre1.9 branch

Location:
code/branches/ogre1.9
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • code/branches/ogre1.9

  • code/branches/ogre1.9/data/gui/scripts/PickupInventory.lua

    r9348 r11211  
    117117
    118118    local image = winMgr:createWindow("MenuWidgets/StaticImage", name .. "/Image")
    119     image:setProperty("Image", "set:PickupInventory image:" .. representation:getInventoryRepresentation())
     119    image:setProperty("Image", "PickupInventory/" .. representation:getInventoryRepresentation())
    120120    image:setProperty("BackgroundEnabled", "set:False")
    121121    image:setProperty("FrameEnabled", "set:True")
    … …  
    218218   
    219219    local image = winMgr:createWindow("MenuWidgets/StaticImage", name .. "/Image")
    220     image:setProperty("Image", "set:PickupInventory image:" .. representation:getInventoryRepresentation())
     220    image:setProperty("Image", "PickupInventory/" .. representation:getInventoryRepresentation())
    221221    image:setProperty("BackgroundEnabled", "set:False")
    222222    image:setProperty("FrameEnabled", "set:True")
Note: See TracChangeset for help on using the changeset viewer.