Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Feb 21, 2018, 12:03:52 AM (6 years ago)
Author:
landauf
Message:

merged ogre1.9 (including cegui0.8) into new branch

Location:
code/branches/cegui0.8_ogre1.9
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • code/branches/cegui0.8_ogre1.9

  • code/branches/cegui0.8_ogre1.9/data/gui/scripts/PickupInventory.lua

    r11710 r11795  
    115115
    116116    local image = winMgr:createWindow("MenuWidgets/StaticImage", name .. "/Image")
    117     image:setProperty("Image", "set:PickupInventory image:" .. representation:getInventoryRepresentation())
     117    image:setProperty("Image", "PickupInventory/" .. representation:getInventoryRepresentation())
    118118    image:setProperty("BackgroundEnabled", "set:False")
    119119    image:setProperty("FrameEnabled", "set:True")
    … …  
    215215   
    216216    local image = winMgr:createWindow("MenuWidgets/StaticImage", name .. "/Image")
    217     image:setProperty("Image", "set:PickupInventory image:" .. representation:getInventoryRepresentation())
     217    image:setProperty("Image", "PickupInventory/" .. representation:getInventoryRepresentation())
    218218    image:setProperty("BackgroundEnabled", "set:False")
    219219    image:setProperty("FrameEnabled", "set:True")
Note: See TracChangeset for help on using the changeset viewer.