diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/compass.xml b/code/ryzom/client/data/gamedev/syui_v3/syui/compass.xml index eb0cd9194..20f8b3c2a 100644 --- a/code/ryzom/client/data/gamedev/syui_v3/syui/compass.xml +++ b/code/ryzom/client/data/gamedev/syui_v3/syui/compass.xml @@ -265,7 +265,7 @@ fontsize="10" line_maxw="182" shadow="true" - hardtext="No File..." /> + hardtext="uiNoFiles" /> diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/config.xml b/code/ryzom/client/data/gamedev/syui_v3/syui/config.xml index b7e4029c0..a362c0725 100644 --- a/code/ryzom/client/data/gamedev/syui_v3/syui/config.xml +++ b/code/ryzom/client/data/gamedev/syui_v3/syui/config.xml @@ -3327,9 +3327,6 @@ This MUST follow the Enum MISSION_DESC::TIconId - @@ -3348,9 +3345,6 @@ This MUST follow the Enum MISSION_DESC::TIconId - - - - - - - - @@ -1204,7 +1204,7 @@ tooltip_parent="win" /> - @@ -1262,7 +1251,7 @@ target="tab1:active" /> + target="tab6:active" /> @@ -1274,9 +1263,6 @@ target="tab4:active" /> - - - + case_mode="%case_normal" /> - - --> - - - - - - diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/player.lua b/code/ryzom/client/data/gamedev/syui_v3/syui/player.lua index 0dd4db07b..4753d84a1 100644 --- a/code/ryzom/client/data/gamedev/syui_v3/syui/player.lua +++ b/code/ryzom/client/data/gamedev/syui_v3/syui/player.lua @@ -8,6 +8,12 @@ function getDbPropU(dbEntry) return value end +if string.find(_VERSION, "Lua 5.0") then + function math.fmod(a, b) + return math.mod(a, b) + end +end + ------------------------------------------------------------------------------------------------------------ -- create the game namespace without reseting if already created in an other file. if (game==nil) then @@ -803,8 +809,8 @@ end function game:timeInSecondsToReadableTime(regenTime) - local seconds = math.mod(regenTime, 60) - local minutes = math.mod(math.floor(regenTime / 60), 60) + local seconds = math.fmod(regenTime, 60) + local minutes = math.fmod(math.floor(regenTime / 60), 60) local hours = math.floor(regenTime / 3600) local result = "" if seconds > 0 then result = concatUCString(tostring(seconds), i18n.get("uittSecondsShort")) end diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/widgets.xml b/code/ryzom/client/data/gamedev/syui_v3/syui/widgets.xml index ec8eb3fbc..4fd71ff39 100644 --- a/code/ryzom/client/data/gamedev/syui_v3/syui/widgets.xml +++ b/code/ryzom/client/data/gamedev/syui_v3/syui/widgets.xml @@ -225,7 +225,7 @@ opened="true" child_resize_w="true" child_resize_h="true" - w="00" + w="0" h="0" win_priority="%win_priority_world_space" posref="BL BM" @@ -2634,7 +2634,7 @@