Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #1433 Merge changes from patch 1.13

Browse source
This commit is contained in:
kervala 2012-02-27 23:48:36 +01:00
parent 6c43baaa1c
commit a09943f1f0
23 changed files with 1478 additions and 873 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/CMakeModules/nel.cmake
View file

@ -405,7 +405,7 @@ MACRO(NL_SETUP_BUILD)
SET(NL_RELEASE_CFLAGS "/MD /D NDEBUG ${SPEED_OPTIMIZATIONS}")
SET(NL_DEBUG_LINKFLAGS "/NODEFAULTLIB:msvcrt /INCREMENTAL:YES")
SET(NL_RELEASE_LINKFLAGS "/OPT:REF /OPT:ICF /INCREMENTAL:NO")
ELSE(WIN32)
ELSE(MSVC)
IF(HOST_CPU STREQUAL "x86_64" AND TARGET_CPU STREQUAL "x86")
SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -m32 -march=i686")
ENDIF(HOST_CPU STREQUAL "x86_64" AND TARGET_CPU STREQUAL "x86")
@ -414,7 +414,7 @@ MACRO(NL_SETUP_BUILD)
SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -m64")
ENDIF(HOST_CPU STREQUAL "x86" AND TARGET_CPU STREQUAL "x86_64")
SET(PLATFORM_CFLAGS "{PLATFORM_CFLAGS} -g -D_REENTRANT -pipe -ftemplate-depth-48 -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-unused -fno-strict-aliasing")
SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -g -D_REENTRANT -pipe -ftemplate-depth-48 -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-unused -fno-strict-aliasing")
IF(WITH_COVERAGE)
SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}")
@ -437,7 +437,7 @@ MACRO(NL_SETUP_BUILD)
SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -D_DEBUG")
SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -DNDEBUG -O6")
ENDIF(WIN32)
ENDIF(MSVC)
ENDMACRO(NL_SETUP_BUILD)
MACRO(NL_SETUP_BUILD_FLAGS)

4
code/nel/src/misc/events.cpp
View file

@ -178,8 +178,8 @@ static const CStringConversion<TKey>::CPair stringTable [] =
{ "KeyZOOM", KeyZOOM },
{ "KeyNONAME", KeyNONAME },
{ "KeyPA1", KeyPA1 },
{ "KeyOEM_CLEAR", KeyOEM_CLEAR },
}
{ "KeyOEM_CLEAR", KeyOEM_CLEAR }
};
static CStringConversion<TKey> KeyConversion(stringTable, sizeof(stringTable) / sizeof(stringTable[0]), KeyCount);

14
code/ryzom/client/client_default.cfg
View file

@ -354,8 +354,8 @@ SystemInfoColors =
// NEW System Info Categories
"SYS", "255 255 255 255 normal", // Default system messages
"BC", "255 255 255 255 center", // Broadcast messages
"TAGBC", "255 255 255 255 center", // Taged broadcast messages : color should remain white as some word are tagged
"BC", "255 255 255 255 centeraround", // Broadcast messages
"TAGBC", "255 255 255 255 centeraround", // Taged broadcast messages : color should remain white as some word are tagged
"XP", "255 255 64 255 over", // XP Gain
"SP", "255 255 64 255 over", // SP Gain
"TTL", "255 255 64 255 over", // Title
@ -443,6 +443,7 @@ R2EDReloadFiles = {
XMLInterfaceFiles = {
"config.xml",
"widgets.xml",
"webig_widgets.xml",
"player.xml",
"inventory.xml",
"interaction.xml",
@ -559,6 +560,15 @@ HelpPages =
"de=http://forums.ryzom.com/forum/showthread.php?t=29131"
};
WebIgMainDomain = "atys.ryzom.com";
WebIgTrustedDomains =
{
"atys.ryzom.com"
};
PatchletUrl = "http://atys.ryzom.com/start/app_patchlet.php?patch=preload";
SelectedSlot = 0;
BuildName = "RELEASE_HEAD";

17
code/ryzom/client/client_default.cfg.in
View file

@ -80,6 +80,9 @@ XMLOutGameInterfaceFiles = {
"out_v2_keys.xml",
};
TexturesInterface = "texture_interfaces_v3";
TexturesInterfaceDXTC = "texture_interfaces_dxtc";
// The ligo primitive class file
LigoPrimitiveClass = "world_editor_classes.xml";
@ -352,8 +355,8 @@ SystemInfoColors =
// NEW System Info Categories
"SYS", "255 255 255 255 normal", // Default system messages
"BC", "255 255 255 255 center", // Broadcast messages
"TAGBC", "255 255 255 255 center", // Taged broadcast messages : color should remain white as some word are tagged
"BC", "255 255 255 255 centeraround", // Broadcast messages
"TAGBC", "255 255 255 255 centeraround", // Taged broadcast messages : color should remain white as some word are tagged
"XP", "255 255 64 255 over", // XP Gain
"SP", "255 255 64 255 over", // SP Gain
"TTL", "255 255 64 255 over", // Title
@ -441,6 +444,7 @@ R2EDReloadFiles = {
XMLInterfaceFiles = {
"config.xml",
"widgets.xml",
"webig_widgets.xml",
"player.xml",
"inventory.xml",
"interaction.xml",
@ -557,6 +561,15 @@ HelpPages =
"de=http://forums.ryzom.com/forum/showthread.php?t=29131"
};
WebIgMainDomain = "atys.ryzom.com";
WebIgTrustedDomains =
{
"atys.ryzom.com"
};
PatchletUrl = "http://atys.ryzom.com/start/app_patchlet.php?patch=preload";
SelectedSlot = 0;
BuildName = "RELEASE_HEAD";

BIN
code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.tga
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4 MiB

After

Width:  |  Height:  |  Size: 4 MiB

1282
code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.txt
View file

File diff suppressed because it is too large Load diff

11
code/ryzom/client/data/gamedev/interfaces_v3/commands.xml
View file

@ -78,9 +78,18 @@
<command name="guildinvite" action="command" params="a guildInvite $" />
<command name="invite" action="command" params="a teamInvite $" />
<command name="channel" action="command" params="a connectUserChannel +" />
<command name="channel" action="command" params='a connectUserChannel "$"' />
<command name="channel" action="command" params='a connectUserChannel "$" +' />
<command name="leaguekick" action="command" params="a leagueKick $" />
<command name="leaguequit" action="command" params="a setLeague" />
<command name="leagueinvite" action="command" params="a leagueInvite $" />
<command name="league" action="command" params='a setLeague "$"' />
<command name="resetname" action="command" params="a resetName"/>
<!-- WebIG -->
<command name="go" action="browse" params="name=ui:interface:webig:content:html|url=home"/>
<command name="webdev" action="browse" params="name=ui:interface:webig:content:html|url=http://localhost/index.html"/>
</interface_config>

65
code/ryzom/client/data/gamedev/interfaces_v3/config.xml
View file

@ -258,6 +258,9 @@
<variable entry="UI:SAVE:INSCENE:USER:TITLE"
type="bool"
value="false" />
<variable entry="UI:SAVE:INSCENE:USER:RPTAGS"
type="bool"
value="false" />
<variable entry="UI:SAVE:INSCENE:USER:GUILD_NAME"
type="bool"
value="false" />
@ -291,6 +294,9 @@
<variable entry="UI:SAVE:INSCENE:FRIEND:TITLE"
type="bool"
value="true" />
<variable entry="UI:SAVE:INSCENE:FRIEND:RPTAGS"
type="bool"
value="true" />
<variable entry="UI:SAVE:INSCENE:FRIEND:GUILD_NAME"
type="bool"
value="true" />
@ -327,6 +333,9 @@
<variable entry="UI:SAVE:INSCENE:ENEMY:TITLE"
type="bool"
value="true" />
<variable entry="UI:SAVE:INSCENE:ENEMY:RPTAGS"
type="bool"
value="true" />
<variable entry="UI:SAVE:INSCENE:ENEMY:GUILD_NAME"
type="bool"
value="true" />
@ -2797,6 +2806,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
<variable entry="UI:SAVE:GUILD_LIST:SORT_ORDER"
type="sint32"
value="0" />
<variable entry="UI:SAVE:CHATLOG_STATE"
type="sint32"
value="0" />
<!-- Auto Convert ACT_TSTART end TEND from server to smoothServerTick -->
<link expr="@SERVER:USER:ACT_TSTART"
action="set"
@ -2963,7 +2975,28 @@ This MUST follow the Enum MISSION_DESC::TIconId
<variable entry="UI:SAVE:CHAT:COLORS:TELL"
type="rgba"
value="170 170 170 255" />
<variable entry="UI:SAVE:CHAT:COLORS:DYN"
<variable entry="UI:SAVE:CHAT:COLORS:DYN:0"
type="rgba"
value="162 255 173 255" />
<variable entry="UI:SAVE:CHAT:COLORS:DYN:1"
type="rgba"
value="162 255 173 255" />
<variable entry="UI:SAVE:CHAT:COLORS:DYN:2"
type="rgba"
value="162 255 173 255" />
<variable entry="UI:SAVE:CHAT:COLORS:DYN:3"
type="rgba"
value="162 255 173 255" />
<variable entry="UI:SAVE:CHAT:COLORS:DYN:4"
type="rgba"
value="162 255 173 255" />
<variable entry="UI:SAVE:CHAT:COLORS:DYN:5"
type="rgba"
value="162 255 173 255" />
<variable entry="UI:SAVE:CHAT:COLORS:DYN:6"
type="rgba"
value="162 255 173 255" />
<variable entry="UI:SAVE:CHAT:COLORS:DYN:7"
type="rgba"
value="162 255 173 255" />
<variable entry="UI:SAVE:CHAT:ENTER_DONT_QUIT_CB"
@ -2975,6 +3008,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
<variable entry="UI:SAVE:CHAT:SHOW_DYN_CHANNEL_NAME_IN_CHAT_CB"
type="bool"
value="false" />
<variable entry="UI:SAVE:CHAT:SHOW_ONLINE_OFFLINE_NOTIFICATIONS_CB"
type="bool"
value="true" />
<!-- ***************************** -->
<!-- * SYSTEM INFO COLORS * -->
<!-- ***************************** -->
@ -3045,6 +3081,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
<variable entry="UI:SAVE:INV_BAG:FILTER_MISSMP"
type="sint32"
value="1" />
<variable entry="UI:SAVE:INV_BAG:FILTER_TP"
type="sint32"
value="1" />
<variable entry="UI:SAVE:INV_PA0:SORT_TYPE"
type="sint32"
value="0" />
@ -3066,6 +3105,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
<variable entry="UI:SAVE:INV_PA0:FILTER_MISSMP"
type="sint32"
value="1" />
<variable entry="UI:SAVE:INV_PA0:FILTER_TP"
type="sint32"
value="1" />
<variable entry="UI:SAVE:INV_PA1:SORT_TYPE"
type="sint32"
value="0" />
@ -3087,6 +3129,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
<variable entry="UI:SAVE:INV_PA1:FILTER_MISSMP"
type="sint32"
value="1" />
<variable entry="UI:SAVE:INV_PA1:FILTER_TP"
type="sint32"
value="1" />
<variable entry="UI:SAVE:INV_PA2:SORT_TYPE"
type="sint32"
value="0" />
@ -3108,6 +3153,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
<variable entry="UI:SAVE:INV_PA2:FILTER_MISSMP"
type="sint32"
value="1" />
<variable entry="UI:SAVE:INV_PA2:FILTER_TP"
type="sint32"
value="1" />
<variable entry="UI:SAVE:INV_PA3:SORT_TYPE"
type="sint32"
value="0" />
@ -3129,6 +3177,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
<variable entry="UI:SAVE:INV_PA3:FILTER_MISSMP"
type="sint32"
value="1" />
<variable entry="UI:SAVE:INV_PA3:FILTER_TP"
type="sint32"
value="1" />
<variable entry="UI:SAVE:INV_GUILD:SORT_TYPE"
type="sint32"
value="1" />
@ -3151,6 +3202,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
<variable entry="UI:SAVE:INV_GUILD:FILTER_MISSMP"
type="sint32"
value="1" />
<variable entry="UI:SAVE:INV_GUILD:FILTER_TP"
type="sint32"
value="1" />
<variable entry="UI:SAVE:INV_ROOM:SORT_TYPE"
type="sint32"
value="1" />
@ -3173,6 +3227,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
<variable entry="UI:SAVE:INV_ROOM:FILTER_MISSMP"
type="sint32"
value="1" />
<variable entry="UI:SAVE:INV_ROOM:FILTER_TP"
type="sint32"
value="1" />
<!-- List Menu 1 -->
<variable entry="UI:VARIABLES:ISACTIVE:SETS"
type="sint32"
@ -3809,4 +3866,10 @@ This MUST follow the Enum MISSION_DESC::TIconId
<variable entry="UI:TEMP:R2_DRAW_ARRAY"
type="bool"
value="0" />
<variable entry="UI:TEMP:DEFAULT_WEB_RETRY_TIMEOUT"
type="sint32"
value="2" />
<variable entry="UI:SAVE:WEBIG_RETRY_DELAY"
type="sint32"
value="2" />
</interface_config>

2
code/ryzom/client/data/gamedev/interfaces_v3/encyclopedia.xml
View file

@ -11,7 +11,7 @@
<variable entry="UI:VARIABLES:ENCY:REWARDBRICK:SHEET" type="sint32" value="0" />
<variable entry="UI:VARIABLES:ENCY:ALBUMBRICK:SHEET" type="sint32" value="0" />
<style style="ency_title" type="text" color="255 255 255 255" fontsize="14" shadow="true" case_mode="%case_first_string_letter_up"/>
<style style="ency_title" type="text" color="255 255 255 255" fontsize="14" shadow="true" case_mode="%case_normal"/>
<style style="ency_title2" type="text" color="255 255 255 192" fontsize="12" shadow="true" />

174
code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml
View file

@ -1615,19 +1615,82 @@
x="0"
y="-4" />
<instance template="tgcw_color"
id="cc_dyn"
text="uiDynColor"
title="uiCCDDyn"
tooltip="uittChooseDynColor"
id="cc_dyn0"
text="uiDynColor0"
title="uiCCDDyn0"
tooltip="uittChooseDynColor0"
posref="BL TL"
posparent="cc_shout"
x="0"
y="-4" />
<instance template="tgcw_color"
id="cc_dyn1"
text="uiDynColor1"
title="uiCCDDyn1"
tooltip="uittChooseDynColor1"
posref="BL TL"
posparent="cc_dyn0"
x="0"
y="-4" />
<instance template="tgcw_color"
id="cc_dyn2"
text="uiDynColor2"
title="uiCCDDyn2"
tooltip="uittChooseDynColor2"
posref="BL TL"
posparent="cc_dyn1"
x="0"
y="-4" />
<instance template="tgcw_color"
id="cc_dyn3"
text="uiDynColor3"
title="uiCCDDyn3"
tooltip="uittChooseDynColor3"
posref="BL TL"
posparent="cc_dyn2"
x="0"
y="-4" />
<instance template="tgcw_color"
id="cc_dyn4"
text="uiDynColor4"
title="uiCCDDyn4"
tooltip="uittChooseDynColor4"
posref="BL TL"
posparent="cc_dyn3"
x="0"
y="-4" />
<instance template="tgcw_color"
id="cc_dyn5"
text="uiDynColor5"
title="uiCCDDyn5"
tooltip="uittChooseDynColor5"
posref="BL TL"
posparent="cc_dyn4"
x="0"
y="-4" />
<instance template="tgcw_color"
id="cc_dyn6"
text="uiDynColor6"
title="uiCCDDyn6"
tooltip="uittChooseDynColor6"
posref="BL TL"
posparent="cc_dyn5"
x="0"
y="-4" />
<instance template="tgcw_color"
id="cc_dyn7"
text="uiDynColor7"
title="uiCCDDyn7"
tooltip="uittChooseDynColor7"
posref="BL TL"
posparent="cc_dyn6"
x="0"
y="-4" />
<instance template="tgcw_checkbox"
id="enter_dontquit_cb"
text="uiEnterDontQuitCB"
tooltip="uittChatEnter"
posparent="cc_dyn"
posparent="cc_dyn7"
posref="BL TL"
x="0"
y="-8" />
@ -1647,11 +1710,19 @@
posref="BL TL"
x="0"
y="-8" />
<instance template="tgcw_checkbox"
id="show_online_offline_notifications_cb"
text="uiShowOnlineOfflineNotifications"
tooltip="uittShowOnlineOfflineNotifications"
posparent="show_dyn_channel_name_in_chat_cb"
posref="BL TL"
x="0"
y="-8" />
<instance template="tgcw_scrollbarint"
id="font_size"
text="uiFontSize"
posref="BL TL"
posparent="show_dyn_channel_name_in_chat_cb"
posparent="show_online_offline_notifications_cb"
x="0"
y="-8" />
<link expr="@UI:SAVE:CHAT:ENTER_DONT_QUIT_CB"
@ -1660,6 +1731,8 @@
target="show_times_in_chat_cb:c:pushed" />
<link expr="@UI:SAVE:CHAT:SHOW_DYN_CHANNEL_NAME_IN_CHAT_CB"
target="show_dyn_channel_name_in_chat_cb:c:pushed" />
<link expr="@UI:SAVE:CHAT:SHOW_ONLINE_OFFLINE_NOTIFICATIONS_CB"
target="show_online_offline_notifications_cb:c:pushed" />
</group>
<ctrl style="skin_scroll"
id="sb_chat_colors"
@ -1886,12 +1959,20 @@
posparent="is_user_name"
x="0"
y="-4" />
<instance template="tgcw_checkbox"
id="is_user_rptags"
text="uiRpTags"
tooltip="uittRpTags"
posref="BL TL"
posparent="is_user_title"
x="0"
y="-4" />
<instance template="tgcw_checkbox"
id="is_user_guild_name"
text="uigcGuildName"
tooltip="uittGuildName"
posref="BL TL"
posparent="is_user_title"
posparent="is_user_rptags"
x="0"
y="-4" />
<instance template="tgcw_checkbox"
@ -1995,12 +2076,20 @@
posparent="is_friend_name"
x="0"
y="-4" />
<instance template="tgcw_checkbox"
id="is_friend_rptags"
text="uiRpTags"
tooltip="uittRpTags"
posref="BL TL"
posparent="is_friend_title"
x="0"
y="-4" />
<instance template="tgcw_checkbox"
id="is_friend_guild_name"
text="uigcGuildName"
tooltip="uittGuildName"
posref="BL TL"
posparent="is_friend_title"
posparent="is_friend_rptags"
x="0"
y="-4" />
<instance template="tgcw_checkbox"
@ -2112,12 +2201,20 @@
posparent="is_enemy_name"
x="0"
y="-4" />
<instance template="tgcw_checkbox"
id="is_enemy_rptags"
text="uiRpTags"
tooltip="uittRpTags"
posref="BL TL"
posparent="is_enemy_title"
x="0"
y="-4" />
<instance template="tgcw_checkbox"
id="is_enemy_guild_name"
text="uigcGuildName"
tooltip="uittGuildName"
posref="BL TL"
posparent="is_enemy_title"
posparent="is_enemy_rptags"
x="0"
y="-4" />
<instance template="tgcw_checkbox"
@ -3095,10 +3192,45 @@
widget="colbut"
link="UI:SAVE:CHAT:COLORS:SHOUT"
realtime="true" />
<param ui="chat_colors:cc_dyn:c"
<param ui="chat_colors:cc_dyn0:c"
type="db"
widget="colbut"
link="UI:SAVE:CHAT:COLORS:DYN"
link="UI:SAVE:CHAT:COLORS:DYN:0"
realtime="true" />
<param ui="chat_colors:cc_dyn1:c"
type="db"
widget="colbut"
link="UI:SAVE:CHAT:COLORS:DYN:1"
realtime="true" />
<param ui="chat_colors:cc_dyn2:c"
type="db"
widget="colbut"
link="UI:SAVE:CHAT:COLORS:DYN:2"
realtime="true" />
<param ui="chat_colors:cc_dyn3:c"
type="db"
widget="colbut"
link="UI:SAVE:CHAT:COLORS:DYN:3"
realtime="true" />
<param ui="chat_colors:cc_dyn4:c"
type="db"
widget="colbut"
link="UI:SAVE:CHAT:COLORS:DYN:4"
realtime="true" />
<param ui="chat_colors:cc_dyn5:c"
type="db"
widget="colbut"
link="UI:SAVE:CHAT:COLORS:DYN:5"
realtime="true" />
<param ui="chat_colors:cc_dyn6:c"
type="db"
widget="colbut"
link="UI:SAVE:CHAT:COLORS:DYN:6"
realtime="true" />
<param ui="chat_colors:cc_dyn7:c"
type="db"
widget="colbut"
link="UI:SAVE:CHAT:COLORS:DYN:7"
realtime="true" />
<!--
<param ui="chat_colors:cc_shout:c" type="db" widget="colbut" link="UI:SAVE:CHAT:COLORS:SHOUT" realtime="true" />
@ -3120,6 +3252,11 @@
widget="boolbut"
link="UI:SAVE:CHAT:SHOW_DYN_CHANNEL_NAME_IN_CHAT_CB"
realtime="true" />
<param ui="chat_colors:show_online_offline_notifications_cb:c"
type="db"
widget="boolbut"
link="UI:SAVE:CHAT:SHOW_ONLINE_OFFLINE_NOTIFICATIONS_CB"
realtime="true" />
<param ui="chat_colors:font_size:c"
type="db"
widget="sbint"
@ -3222,6 +3359,11 @@
widget="boolbut"
link="UI:SAVE:INSCENE:USER:TITLE"
realtime="true" />
<param ui="in_scene_user:is_user_rptags:c"
type="db"
widget="boolbut"
link="UI:SAVE:INSCENE:USER:RPTAGS"
realtime="true" />
<param ui="in_scene_user:is_user_guild_name:c"
type="db"
widget="boolbut"
@ -3272,6 +3414,11 @@
widget="boolbut"
link="UI:SAVE:INSCENE:FRIEND:TITLE"
realtime="true" />
<param ui="in_scene_friend:is_friend_rptags:c"
type="db"
widget="boolbut"
link="UI:SAVE:INSCENE:FRIEND:RPTAGS"
realtime="true" />
<param ui="in_scene_friend:is_friend_guild_name:c"
type="db"
widget="boolbut"
@ -3327,6 +3474,11 @@
widget="boolbut"
link="UI:SAVE:INSCENE:ENEMY:TITLE"
realtime="true" />
<param ui="in_scene_enemy:is_enemy_rptags:c"
type="db"
widget="boolbut"
link="UI:SAVE:INSCENE:ENEMY:RPTAGS"
realtime="true" />
<param ui="in_scene_enemy:is_enemy_guild_name:c"
type="db"
widget="boolbut"

53
code/ryzom/client/data/gamedev/interfaces_v3/guild.xml
View file

@ -463,27 +463,7 @@
<!-- ***************** -->
<!-- * GUILD FORUM * -->
<!-- ***************** -->
<proc id="guild_forum_proc_active">
<action handler="set"
params="dblink=UI:VARIABLES:ISACTIVE:GUILD_FORUM|value=1" />
<action handler="set"
cond="not(%is_guild_present)"
params="target='ui:interface:guild_forum:active'|value=0" />
<action handler="browse"
params="name=ui:interface:guild_forum:content:html|url=home|show=0" />
</proc>
<proc id="guild_forum_proc_deactive">
<action handler="set"
params="dblink=UI:VARIABLES:ISACTIVE:GUILD_FORUM|value=0" />
</proc>
<group type="menu"
id="guild_forum_menu"
extends="base_menu_with_color">
<action id="home"
name="uiHOME"
handler="browse"
params="name=ui:interface:guild_forum:content:html|url=home" />
</group>
<group type="container"
id="guild_forum"
w="480"
@ -531,7 +511,7 @@
w="0"
h="0"
posref="TL TL">
<group type="forum_html"
<group type="html"
id="html"
posref="TL TL"
url="home"
@ -828,24 +808,7 @@
<!-- ************** -->
<!-- * MAIL BOX * -->
<!-- ************** -->
<proc id="mailbox_proc_active">
<action handler="set"
params="dblink=UI:VARIABLES:ISACTIVE:MAILBOX|value=1" />
<action handler="browse"
params="name=ui:interface:mailbox:content:html|url=home|show=0" />
</proc>
<proc id="mailbox_proc_deactive">
<action handler="set"
params="dblink=UI:VARIABLES:ISACTIVE:MAILBOX|value=0" />
</proc>
<group type="menu"
id="mailbox_menu"
extends="base_menu_with_color">
<action id="home"
name="uiHOME"
handler="browse"
params="name=ui:interface:mailbox:content:html|url=home" />
</group>
<group type="container"
id="mailbox"
w="480"
@ -892,7 +855,7 @@
w="0"
h="0"
posref="TL TL">
<group type="mail_html"
<group type="html"
id="html"
posref="TL TL"
url="home"
@ -976,8 +939,6 @@
<proc id="webig_proc_active">
<action handler="set"
params="dblink=UI:VARIABLES:ISACTIVE:WEBIG|value=1" />
<action handler="browse"
params="name=ui:interface:webig:content:html|url=home" />
</proc>
<proc id="webig_proc_deactive">
<action handler="set"
@ -1088,7 +1049,7 @@
<group type="webig_html"
id="html"
posref="TL TL"
url="http://atys.ryzom.com/start/index.php"
url=""
home="http://atys.ryzom.com/start/index.php"
sizeref="wh"
x="0"
@ -1254,8 +1215,8 @@
<group type="webig_html"
id="html"
posref="TL TL"
url="http://atys.ryzom.com/start/app_ig_start.php"
home="http://atys.ryzom.com/start/app_ig_start.php"
url=""
home="http://atys.ryzom.com/start/init_ig.php"
sizeref="wh"
x="0"
y="0"

132
code/ryzom/client/data/gamedev/interfaces_v3/info_player.lua
View file

@ -283,17 +283,14 @@ function game:onDrawNpcWebPage()
local utf8Url = ucUrl:toUtf8()
local isRing = string.find(utf8Url, "ring_access_point=1") ~= nil
if isRing then
-- when in ring mode, add the parameters ourselves. 60 sec timeout because of zope...
-- browseNpcWebPage(uiStr, utf8Url .. game.RingAccessPointFilter:getURLParameters(), false, 60)
-- Use new window after revamp
--RingAccessPoint:getWindow().active = 1
--RingAccessPoint:getWindow():center()
--RingAccessPoint:getWindow():blink(1)
--RingAccessPoint:show()
getUI("ui:interface:npc_web_browser").active = false
runAH(nil, "context_ring_sessions", "")
return
else
local hideWindow = string.find(utf8Url, "_hideWindow=1") ~= nil
if hideWindow then
getUI("ui:interface:npc_web_browser").active = false
end
self.NpcWebPage.BrowseDone= true;
browseNpcWebPage(uiStr, utf8Url, true, 10); -- 'true' is for 'add parameters' here. 10 is standard timeout
end
@ -302,9 +299,9 @@ function game:onDrawNpcWebPage()
-- if this is a ring window, then only the refresh button to access to filter will be available
local isRing = string.find(utf8Url, "ring_access_point=1") ~= nil
local browser = getUI("ui:interface:npc_web_browser")
browser:find("browse_redo").active = not isRing
browser:find("browse_undo").active = not isRing
browser:find("browse_refresh").active = isRing
browser:find("browse_redo").active = true
browser:find("browse_undo").active = true
browser:find("browse_refresh").active = true
end
end
end
@ -978,6 +975,7 @@ function RingPlayerInfo:tooltipRRPs(dbBase, ttFormat)
setContextHelpText(fmt);
end
--------------------------------------------------------------------------------------------------------------
--
function RingPlayerInfo:tooltipRingRating(level, progress, ttFormat)
@ -1012,6 +1010,27 @@ function RingPlayerInfo:getLevelRatingAndImprovementRate(val)
return level, progress
end
--------------------------------------------------------------------------------------------------------------
--
function game:updateOrganization(path, uiOrgText, uiStatusText, uiPointsText)
local org = getDbProp(path.."1:VALUE")
getUICaller()[uiOrgText].uc_hardtext = i18n.get('uiOrganization_' .. org)
local status = getDbProp(path.."2:VALUE")
getUICaller()[uiStatusText].uc_hardtext= status
local points = getDbProp(path.."3:VALUE")
getUICaller()[uiPointsText].uc_hardtext= points
end
------------------------------------------------------------------------------------------------------------
function game:organizationTooltip()
-- set the tooltip in InterfaceManager
setContextHelpText( i18n.get('uittOrganization') );
end
--------------------------------------------------------------------------------------------------------------
function game:popMissionList()
@ -1393,6 +1412,8 @@ end
function game:onMainLoopBegin()
game.InGameDbInitialized = false
game.PrevSessionMission = getDbProp("UI:VARIABLES:MISSION_SELECTED_PREV_SESSION")
debugInfo("onMainLoopBegin()")
end
@ -1408,6 +1429,29 @@ function game:onInGameDbInitialized()
if game.PrevSessionMission ~= -1 then
self:setCurrentMission(game.PrevSessionMission)
end
game:setInfoPlayerCharacterRace()
end
function game:onWebIgReady()
-- Call init webig
getUI("ui:interface:web_transactions:content:html"):browse("home")
getUI("ui:interface:webig:content:html"):browse("home")
end
--------------------------------------------------------------------------------------------------------------
-- handler called by C++ at the start of a far TP (log to char selection or far tp)
function game:onFarTpStart()
debugInfo("game:onFarTpStart()")
--game:deinitWebIgApps()
end
--------------------------------------------------------------------------------------------------------------
-- handler called by C++ after characer reselection or the end of a far TP
function game:onFarTpEnd()
debugInfo("game:onFarTpEnd()")
--game:preInitWebIgApps()
end
--------------------------------------------------------------------------------------------------------------
@ -1415,8 +1459,8 @@ end
function game:onMainLoopEnd()
game.InGameDbInitialized = false
game:updateMissionJournalFixedEntry()
end
end
--------------------------------------------------------------------------------------------------------------
-- ring journal on / off
@ -1471,6 +1515,11 @@ function game:onNewMissionStepAdded(stepIndex)
local missionWnd = getMissionWindow()
local missionIndex = getDbProp("UI:SAVE:MISSION_SELECTED")
local dbPath
if missionIndex < 0 then
return
end
-- debugInfo("New Step")
if missionIndex < 15 then
dbPath = "SERVER:MISSIONS:" .. tostring(missionIndex) .. ":GOALS:" .. tostring(stepIndex) .. ":TEXT"
@ -1651,3 +1700,64 @@ function game:getRPJobs()
end
--------------------------------------------------------------------------------------------------------------
function game:setInfoPlayerCharacterRace()
getUI("ui:interface:info_player_skills:content:basics_skills:character_race_name").uc_hardtext = i18n.get("io"..getUserRace())
end
-- --------------------------------------------------------------------------------------------------------------
-- game.preInitTimer = 0
-- function game:preInitWebIgAppsLoop()
-- if game.preInitTimer == nil then game.preInitTimer = 0 end
-- game.preInitTimer = game.preInitTimer - 1
-- if (not game.preWebIgAppsInitialized) and game.preInitTimer < 0 then
-- debugInfo("initWebIgAppsLoop(): calling app_ig_preinit.php")
-- getUI("ui:interface:web_transactions:content:html"):browse("http://atys.ryzom.com/start/app_ig_preinit.php")
-- game.preInitTimer = getDbProp("UI:SAVE:WEBIG_RETRY_DELAY")
-- end
-- if game.preWebIgAppsInitialized then
-- debugInfo("preInitWebIgAppsLoop(): Calling removeOnDbChange()")
-- removeOnDbChange(getUI("ui:interface"), "@UI:VARIABLES:CURRENT_SERVER_TICK")
-- end
-- end
-- --------------------------------------------------------------------------------------------------------------
-- function game:preInitWebIgApps()
-- debugInfo("game:preInitWebIgApps()")
-- addOnDbChange(getUI("ui:interface"), "@UI:VARIABLES:CURRENT_SERVER_TICK", "game:preInitWebIgAppsLoop()")
-- end
-- --------------------------------------------------------------------------------------------------------------
-- game.postInitTimer = 0
-- function game:postInitWebIgAppsLoop()
-- if game.postInitTimer == nil then game.postInitTimer = 0 end
-- game.postInitTimer = game.postInitTimer - 1
-- if game.postInitTimer < 0 then
-- debugInfo("initWebIgAppsLoop(): calling app_ig_postinit.php")
-- getUI("ui:interface:web_transactions:content:html"):browse("http://atys.ryzom.com/start/app_ig_postinit.php")
-- game.postInitTimer = getDbProp("UI:SAVE:WEBIG_RETRY_DELAY")
-- end
-- if game.postWebIgAppsInitialized then
-- debugInfo("postInitWebIgAppsLoop(): Calling removeOnDbChange()")
-- removeOnDbChange(getUI("ui:interface:milko_pad"), "@UI:VARIABLES:CURRENT_SERVER_TICK")
-- end
-- end
-- --------------------------------------------------------------------------------------------------------------
-- function game:postInitWebIgApps()
-- debugInfo("game:postInitWebIgApps()")
-- addOnDbChange(getUI("ui:interface:milko_pad"), "@UI:VARIABLES:CURRENT_SERVER_TICK", "game:postInitWebIgAppsLoop()")
-- end
-- --------------------------------------------------------------------------------------------------------------
-- function game:deinitWebIgApps()
-- debugInfo("game:deinitWebIgApps()")
-- game.preWebIgAppsInitialized = nil
-- game.postWebIgAppsInitialized = nil
-- titleSetted = nil
-- end

260
code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
View file

@ -676,54 +676,32 @@
y="0"
h="0"
posref="TL TL">
<group id="title"
posref="TL TL"
sizeref="w"
w="-1"
h="24"
y="-22">
<view type="text"
id="player_title_txt"
id="character_race_title"
posparent="basics_skills"
posref="TL TL"
x="0"
y="-4"
hardtext="uiPlayerTitle"
y="-24"
hardtext="uiRaceBold"
shadow="true"
color="255 255 255 255"
global_color="false"
fontsize="12" />
<group type="combo_box"
id="player_title"
w="300"
h="20"
value="UI:TITLE"
posparent="player_title_txt"
<view type="text"
id="character_race_name"
posparent="character_race_title"
posref="TR TL"
x="4"
y="4"
on_select_start="title_combobox_button">
<instance template="combo_box_def1" />
</group>
<instance template="text_tt"
posparent="player_title"
tooltip="uittIdentityTitle" />
<link expr="@UI:TITLE"
action="title_combobox_changed" />
</group>
<ctrl style="text_button_16"
id="inf"
posref="TR TR"
y="-24"
wmargin="8"
hardtext="uiInfo"
tooltip="uittIdentityInfo"
onclick_l="open_title_help"
params_l="from=user" />
shadow="true"
color="255 200 55 255"
global_color="false"
x="2"
fontsize="12"
hardtext="" />
<group id="guild"
posref="TL TL"
sizeref="w"
h="14"
y="-52">
y="-48">
<view type="text"
id="guild_title"
posref="TL TL"
@ -1231,23 +1209,23 @@
posref="BL TL"
y="0"
val="%player_protect_cold" />
<instance template="tipc_magic_protect"
id="Fire"
posparent="Cold"
posref="BL TL"
y="0"
val="%player_protect_fire" />
<instance template="tipc_magic_protect"
id="Rot"
posparent="Fire"
posparent="Cold"
posref="BL TL"
y="0"
val="%player_protect_rot" />
<instance template="tipc_magic_protect"
id="Shockwave"
id="Fire"
posparent="Rot"
posref="BL TL"
y="0"
val="%player_protect_fire" />
<instance template="tipc_magic_protect"
id="Shockwave"
posparent="Fire"
posref="BL TL"
y="0"
val="%player_protect_shockwave" />
<instance template="tipc_magic_protect"
id="Poison"
@ -1420,9 +1398,60 @@
fontsize="12" />
<instance template="faction_points_widget"
id="fp"
posparent="ecosystem_points"
posref="BL TL"
x="0"
y="-10" />
<group id="pvp_points"
posparent="fp"
posref="BL TL"
sizeref="wh"
w="-1"
h="40"
y="-10">
<view type="text"
id="pvppoints_t"
posref="TL TL"
x="0"
y="-150" />
y="0"
hardtext="uiPvpPoints"
shadow="true"
color="255 255 255 255"
global_color="false"
fontsize="12" />
<group id="black"
posref="TL TL"
x="0"
sizeref="w"
y="-14"
w="0"
h="26"
inherit_gc_alpha="true">
<view type="text"
id="total"
posref="ML ML"
x="8"
y="0"
hardtext="uiPvpTotal"
shadow="true"
color="255 255 255 255"
global_color="true"
fontsize="12" />
<view type="text_number"
id="val"
posref="MR MR"
x="-8"
y="0"
color="255 255 255 255"
global_color="true"
fontsize="12"
value="SERVER:USER:RRPS_LEVELS0:VALUE"
shadow="true" />
</group>
<instance template="inner_thin_border"
posparent="black"
inherit_gc_alpha="true" />
</group>
</group>
<group h="0" id="rpjobs" posref="TL TL" sizeref="wh" w="0" y="0">
<ctrl style="text_button_header"
@ -1514,11 +1543,57 @@
</group>
</group>
<group h="0" id="webinfos" posref="TL TL" sizeref="wh" w="0" y="0">
<group id="title"
posref="TL TL"
sizeref="w"
active="true"
w="-1"
h="24"
y="-8">
<view type="text"
id="player_title_txt"
posref="TL TL"
x="8"
y="-4"
hardtext="uiPlayerTitle"
shadow="true"
color="255 255 255 255"
global_color="false"
fontsize="12" />
<group type="combo_box"
id="player_title"
w="300"
h="20"
value="UI:TITLE"
posparent="player_title_txt"
posref="TR TL"
x="4"
y="4"
on_select_start="title_combobox_button">
<instance template="combo_box_def1" />
</group>
<instance template="text_tt"
posparent="player_title"
tooltip="uittIdentityTitle" />
<link expr="@UI:TITLE"
action="title_combobox_changed" />
</group>
<ctrl style="text_button_16"
id="inf"
posref="TR TR"
active="true"
y="-9"
wmargin="8"
hardtext="uiInfo"
tooltip="uittIdentityInfo"
onclick_l="open_title_help"
params_l="from=user" />
<ctrl style="text_button_header"
button_type="push_button"
id="browse_home"
posref="TR TR"
x="-1"
posref="BR TR"
posparent="title"
x="0"
y="-2"
hardtext="uiBrowseRefresh"
tooltip="uittBrowseRefresh"
@ -1533,7 +1608,7 @@
title_prefix=""
sizeref="wh"
x="0"
y="-8"
y="-42"
w="0"
h="0"
background_color="0 0 0 255"
@ -1905,7 +1980,7 @@
<group id="content"
x="0"
y="0"
h="272"
h="300"
posref="TL TL">
<group id="you"
posref="TL TL"
@ -2004,7 +2079,7 @@
id="kami"
posref="TL TL"
x="4"
y="-180"
y="-160"
color="255 255 255 255"
fontsize="10"
shadow="true"
@ -2013,7 +2088,7 @@
id="karavan"
posref="TL TL"
x="4"
y="-210"
y="-190"
color="255 255 255 255"
fontsize="10"
shadow="true"
@ -2021,7 +2096,7 @@
<group id="cult_allegiance_group"
posref="TL TL"
x="4"
y="-240"
y="-220"
child_resize_h="true"
child_resize_w="true">
<view type="text"
@ -2090,6 +2165,87 @@
id="fb5"
x="100"
path="SERVER:FAME:PLAYER5" />
<view type="text"
id="organization_text"
posref="TL TL"
x="0"
y="-245"
color="255 255 255 255"
fontsize="10"
global_color="true"
shadow="true"
hardtext="uiOrganization" />
<group id="organization"
posref="TL TL"
x="2"
y="-260"
h="34"
w="-4"
sizeref="w" >
<view type="text"
id="name"
posref="TL TL"
x="2"
y="-5"
color="255 255 255 255"
fontsize="10"
global_color="false"
shadow="true"
hardtext="" />
<view type="text"
id="text_points"
posref="BL BL"
x="4"
y="2"
color="255 255 255 255"
fontsize="10"
global_color="true"
shadow="true"
hardtext="uiPoints" />
<view type="text"
id="points"
posparent="text_points"
posref="MR ML"
x="4"
y="0"
color="255 255 255 255"
fontsize="10"
global_color="false"
shadow="true"
hardtext="0" />
<view type="text"
id="status"
posref="BR BR"
x="-4"
y="2"
color="255 255 255 255"
fontsize="10"
global_color="false"
shadow="true"
hardtext="0" />
<view type="text"
id="text_status"
posparent="status"
posref="ML MR"
x="-4"
y="0"
color="255 255 255 255"
fontsize="10"
global_color="true"
shadow="true"
hardtext="uiSkillJobLVL" />
<link expr="@SERVER:USER:RRPS_LEVELS1"
action="lua:game:updateOrganization('SERVER:USER:RRPS_LEVELS', 'name', 'status', 'points')" />
<link expr="@SERVER:USER:RRPS_LEVELS2"
action="lua:game:updateOrganization('SERVER:USER:RRPS_LEVELS', 'name', 'status', 'points')" />
<link expr="@SERVER:USER:RRPS_LEVELS3"
action="lua:game:updateOrganization('SERVER:USER:RRPS_LEVELS', 'name', 'status', 'points')" />
<instance template="text_tt"
posparent="parent"
on_tooltip="lua:game:organizationTooltip()" />
<instance template="inner_thin_border"
inherit_gc_alpha="true" />
</group>
</group>
<group id="guild"
posref="TL TL"

28
code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
View file

@ -301,7 +301,6 @@
<view type="bitmap"
id="tag_1"
posref="TL TL"
posparent="pvp_tags"
x="2"
y="0"
texture="alpha_10.tga"
@ -2116,7 +2115,14 @@
name="uimDismiss"
handler="dismiss_member"
params="" />
<!-- <action id="successor" name="uimSetSuccesor" handler="set_successor" params=""/>-->
<action id="leader"
name="uimSetTeamLeader"
handler="set_team_leader"
params=""/>
<action id="successor"
name="uimSetSuccesor"
handler="set_successor"
params=""/>
<!-- <action id="emote" name="uimEmotes" hanlder="" params="">
<action id="emote1" name="uimEmote1" handler="emote" params="emote_id=0"/>
<action id="emote2" name="uimEmote2" handler="emote" params="emote_id=1"/>
@ -2147,6 +2153,10 @@
<!-- links to enable leader options -->
<link expr="eq(band(@SERVER:GROUP:LEADER_INDEX, 15), 15)"
target="ui:interface:team_member_menu:dismiss:active" />
<link expr="eq(band(@SERVER:GROUP:LEADER_INDEX, 15), 15)"
target="ui:interface:team_member_menu:leader:active" />
<link expr="eq(band(@SERVER:GROUP:LEADER_INDEX, 15), 15)"
target="ui:interface:team_member_menu:successor:active" />
<!-- menu on the chat of the team for the leader -->
<group type="menu"
id="team_chat_leader_menu"
@ -2481,21 +2491,13 @@
<view type="text"
id="text"
posref="TM TM"
color="233 197 42 255"
color="42 197 233 255"
x="10"
y="-10"
fontsize="14"
fontsize="12"
global_color="false"
shadow="true"
hardtext="uiJoinDuelProposal" />
<view type="bitmap"
id="warning"
posparent="text"
posref="ML MR"
y="4"
x="-4"
global_color="false"
texture="w_warning.tga" />
hardtext="uiJoinLeagueProposal" />
<group id="content"
child_resize_h="true"
child_resize_hmargin="10">

1
code/ryzom/client/data/gamedev/interfaces_v3/interface.txt
View file

@ -206,6 +206,7 @@ SYNTAXE:
positive="true"
suffix=""
prefix=""
format="false" // make the number thousands formatted
/>

16
code/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml
View file

@ -676,8 +676,7 @@
<!-- Simple Message Box with just a OK button -->
<group type="modal" id="message_box" exit_click_out="true" posparent="char3d" posref="MM MM" w="250" child_resize_h="true" child_resize_hmargin="100"
on_enter="leave_modal" mouse_pos="false" escapable="false"
display="false"
>
display="false">
<instance template="outgame_popup" id="back" posref="TL TL" />
<view type="text" id="text" posref="TL TL" line_maxw="234" x="8" y="-56" w="0" h="0" color="255 255 255 255" fontsize="12" shadow="true" multi_line="true" multi_line_space="0" case_mode="%case_first_sentence_letter_up"/>
@ -687,15 +686,9 @@
onclick_l="leave_modal" />
</group>
<!-- Web box
<group id="webstart" posref="BR BR" w="200" h="200" active="true" >
<group id="content" x="0" y="0" w="200" h="200" posref="TL TL" >
<group type="html" id="webstart_html" posref="TL TL"
<group id="webstart" posref="MM MM" w="800" h="600" active="true" >
<group id="content" x="0" y="0" w="800" h="600" posref="MM MM" >
<group id="webstart_html" type="html" posref="MM MM"
url=""
title_prefix="uiQuickhelpTitle"
sizeref="wh" x="0" y="0" w="-40" h="-40"
@ -739,7 +732,6 @@
</group>
</group>
</group>
-->
</group>

41
code/ryzom/client/data/gamedev/interfaces_v3/player.lua
View file

@ -1,5 +1,12 @@
-- In this file we define functions that serves for player windows
function getDbPropU(dbEntry)
value = getDbProp(dbEntry)
if (value < 0) then
value = 4294967296+value
end
return value
end
------------------------------------------------------------------------------------------------------------
-- create the game namespace without reseting if already created in an other file.
@ -109,9 +116,9 @@ end
------------------------------------------------------------------------------------------------------------
-- Update player pvp tag
function game:pvpTagUpdateDisplay()
local currentServerTick = getDbProp('UI:VARIABLES:CURRENT_SERVER_TICK');
local pvpServerTagTimer = getDbProp('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:ACTIVATION_TIME');
local pvpServerFlagTimer = getDbProp('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:FLAG_PVP_TIME_LEFT');
local currentServerTick = getDbPropU('UI:VARIABLES:CURRENT_SERVER_TICK');
local pvpServerTagTimer = getDbPropU('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:ACTIVATION_TIME');
local pvpServerFlagTimer = getDbPropU('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:FLAG_PVP_TIME_LEFT');
local uiPlayer= getUI('ui:interface:player:header_opened');
-- get the current state
@ -222,9 +229,9 @@ function game:updatePvpTag()
setDbProp('UI:TEMP:PVP_FACTION:TAG_PVP', booleanToNumber(pvpServerTag));
-- launch timer DB if necessary
local currentServerTick = getDbProp('UI:VARIABLES:CURRENT_SERVER_TICK');
local pvpServerTagTimer = getDbProp('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:ACTIVATION_TIME');
local pvpServerFlagTimer = getDbProp('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:FLAG_PVP_TIME_LEFT');
local currentServerTick = getDbPropU('UI:VARIABLES:CURRENT_SERVER_TICK');
local pvpServerTagTimer = getDbPropU('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:ACTIVATION_TIME');
local pvpServerFlagTimer = getDbPropU('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:FLAG_PVP_TIME_LEFT');
if(pvpServerTagTimer > currentServerTick) or (pvpServerFlagTimer > currentServerTick) then
local ui = getUI('ui:interface:player');
@ -252,9 +259,9 @@ function game:updatePvpTimer()
self:pvpTagUpdateDisplay();
-- try to stop
local currentServerTick = getDbProp('UI:VARIABLES:CURRENT_SERVER_TICK');
local pvpServerTagTimer = getDbProp('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:ACTIVATION_TIME');
local pvpServerFlagTimer = getDbProp('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:FLAG_PVP_TIME_LEFT');
local currentServerTick = getDbPropU('UI:VARIABLES:CURRENT_SERVER_TICK');
local pvpServerTagTimer = getDbPropU('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:ACTIVATION_TIME');
local pvpServerFlagTimer = getDbPropU('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:FLAG_PVP_TIME_LEFT');
-- Manage Tag Timer display
if(pvpServerTagTimer <= currentServerTick) then
@ -299,8 +306,8 @@ function game:playerTTPvp()
-- Flag mode?
if(buttonMode==2) then
local pvpServerFlagTimer = getDbProp('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:FLAG_PVP_TIME_LEFT');
local currentServerTick = getDbProp('UI:VARIABLES:CURRENT_SERVER_TICK');
local pvpServerFlagTimer = getDbPropU('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:FLAG_PVP_TIME_LEFT');
local currentServerTick = getDbPropU('UI:VARIABLES:CURRENT_SERVER_TICK');
local tempsString = game:formatTime( pvpServerFlagTimer - currentServerTick );
text = i18n.get('uittPvPModeFlag');
text = findReplaceAll(text, '%temps', tempsString);
@ -320,8 +327,8 @@ function game:playerTTPvp()
end
-- timer
if(buttonTimer) then
local pvpServerTagTimer = getDbProp('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:ACTIVATION_TIME');
local currentServerTick = getDbProp('UI:VARIABLES:CURRENT_SERVER_TICK');
local pvpServerTagTimer = getDbPropU('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:ACTIVATION_TIME');
local currentServerTick = getDbPropU('UI:VARIABLES:CURRENT_SERVER_TICK');
local tempsString = game:formatTime( pvpServerTagTimer - currentServerTick );
local timeFmt= i18n.get('uittPvPTagTimer');
timeFmt= findReplaceAll(timeFmt, '%temps', tempsString);
@ -402,7 +409,7 @@ function game:outpostUpdatePVPTimer(textSlot, ui)
-- Get the timer of interest (priority to player leaving the zone)
local endTimer= 0;
local endOfPvpTimer= getDbProp('SERVER:CHARACTER_INFO:PVP_OUTPOST:FLAG_PVP_TIME_END');
local endOfPvpTimer= getDbPropU('SERVER:CHARACTER_INFO:PVP_OUTPOST:FLAG_PVP_TIME_END');
if( endOfPvpTimer>0 ) then
endTimer= endOfPvpTimer;
else
@ -415,7 +422,7 @@ function game:outpostUpdatePVPTimer(textSlot, ui)
-- Use a text with a timer?
if( endTimer>0 ) then
-- compute the time that lefts in sec (suppose a smooth server tick is 1 ms)
local curTick= getDbProp('UI:VARIABLES:CURRENT_SERVER_TICK');
local curTick= getDbPropU('UI:VARIABLES:CURRENT_SERVER_TICK');
local timeSec= (endTimer- curTick)/10;
-- replace in str
local text= "@{FF6F}" .. runFct('secondsToTimeStringShort', timeSec);
@ -619,8 +626,8 @@ function game:updatePlayerBonusMalus()
local pvpOutpostEndOfRound= 0;
if(pvpOutpostPresent~=0) then
local pvpOutpostLevel= 0;
pvpOutpostEndOfPVPFlag= getDbProp('SERVER:CHARACTER_INFO:PVP_OUTPOST:FLAG_PVP_TIME_END');
pvpOutpostEndOfRound= getDbProp('SERVER:CHARACTER_INFO:PVP_OUTPOST:ROUND_END_DATE');
pvpOutpostEndOfPVPFlag= getDbPropU('SERVER:CHARACTER_INFO:PVP_OUTPOST:FLAG_PVP_TIME_END');
pvpOutpostEndOfRound= getDbPropU('SERVER:CHARACTER_INFO:PVP_OUTPOST:ROUND_END_DATE');
-- set a level only if we have some round, and if the out timer is not set
if(pvpOutpostEndOfRound~=0 and pvpOutpostEndOfPVPFlag==0) then
pvpOutpostLevel= 1 + getDbProp('SERVER:CHARACTER_INFO:PVP_OUTPOST:ROUND_LVL_CUR');

12
code/ryzom/client/data/gamedev/interfaces_v3/player.xml
View file

@ -417,7 +417,7 @@
tx_over="W_button_24_over.tga"
w="24"
h="24"
scale="true"
scale="false"
global_color_normal="false"
global_color_over="false"
global_color_pushed="false"
@ -488,15 +488,15 @@
<!-- PVP Tag Button -->
<instance template="t_pvp_tag_button"
id="pvp_tag_button_0"
tx="pvp_green.tga"
tx="no_pvp.tga"
mode="0" />
<instance template="t_pvp_tag_button"
id="pvp_tag_button_1"
tx="pvp_orange.tga"
tx="pvp_tag.tga"
mode="1" />
<instance template="t_pvp_tag_button"
id="pvp_tag_button_2"
tx="pvp_red.tga"
tx="pvp_flag.tga"
mode="2" />
<!-- PVP Tag special overed pushed icon. pushed == over rotated !!. (NB: Ugly to save icon space) -->
<view type="bitmap"
@ -1104,7 +1104,9 @@
global_color_over="true"
header_color="UI:SAVE:WIN:COLORS:ANI"
title_delta_max_w="-150"
title_over_extend_view_text="true">
title_over_extend_view_text="true"
on_tooltip="userpa_name_tooltip"
on_tooltip_params="#index">
<group id="header_closed"
h="12"
posref="TL TL"></group>

58
code/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml
View file

@ -318,21 +318,53 @@
<group type="container" id="accept_trade_invitation" w="260" h="512" resizer="false" pop_max_h="512"
active="false" savable="false" openable="false" opened="true" movable="true"
on_close_button="proc" on_close_button_params="player_decline_invitation" title_opened="uiTradeInvitation" >
<group id="content" child_resize_h="true" child_resize_hmargin="10" >
<group id="inside" sizeref="w" posref="TL TL" y="-4" child_resize_h="true" child_resize_hmargin="6">
<view type="text_id" id="invite_phrase" posref="MM MM" x="0" y="0" color="255 255 255 255" fontsize="12" shadow="true"
multi_line="true" multi_line_space="0" line_maxw="250" />
<group type="container"
id="accept_trade_invitation"
w="260"
h="512"
resizer="false"
pop_max_h="512"
active="false"
savable="false"
openable="false"
opened="true"
movable="true"
on_close_button="proc"
on_close_button_params="player_decline_invitation"
title_opened="uiTradeInvitation" >
<group id="content"
child_resize_h="true"
child_resize_hmargin="10" >
<group id="inside"
sizeref="w"
posref="TL TL"
y="-4"
child_resize_h="true"
child_resize_hmargin="6">
<view type="text_id"
id="invite_phrase"
posref="MM MM"
x="0"
y="0"
color="255 255 255 255"
fontsize="12"
shadow="true"
multi_line="true"
multi_line_space="0"
line_maxw="250" />
</group>
<instance template="button_ok_cancel" posparent="inside" posref="BR TR" x="-4" y="-4"
ok_text="uiAccept" cancel_text="uiDecline"
onclick_ok="proc" onclick_ok_param="player_accept_invitation"
onclick_cancel="proc" onclick_cancel_param="player_decline_invitation" />
<instance template="button_ok_cancel"
posparent="inside"
posref="BR TR"
x="-4"
y="-4"
ok_text="uiAccept"
cancel_text="uiDecline"
onclick_ok="proc"
onclick_ok_param="player_accept_invitation"
onclick_cancel="proc"
onclick_cancel_param="player_decline_invitation" />
</group>
</group>

6
code/ryzom/client/data/gamedev/interfaces_v3/reset.xml
View file

@ -261,6 +261,7 @@
<action handler="set" params="dblink=UI:SAVE:INV_BAG:FILTER_TOOL|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_BAG:FILTER_MP|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_BAG:FILTER_MISSMP|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_BAG:FILTER_TP|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_PA0:SORT_TYPE|value=0" />
<action handler="set" params="dblink=UI:SAVE:INV_PA0:ICON_LIST|value=0" />
<action handler="set" params="dblink=UI:SAVE:INV_PA0:FILTER_ARMOR|value=1" />
@ -275,6 +276,7 @@
<action handler="set" params="dblink=UI:SAVE:INV_PA1:FILTER_TOOL|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_PA1:FILTER_MP|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_PA1:FILTER_MISSMP|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_PA1:FILTER_TP|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_PA2:SORT_TYPE|value=0" />
<action handler="set" params="dblink=UI:SAVE:INV_PA2:ICON_LIST|value=0" />
<action handler="set" params="dblink=UI:SAVE:INV_PA2:FILTER_ARMOR|value=1" />
@ -282,6 +284,7 @@
<action handler="set" params="dblink=UI:SAVE:INV_PA2:FILTER_TOOL|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_PA2:FILTER_MP|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_PA2:FILTER_MISSMP|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_PA2:FILTER_TP|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_PA3:SORT_TYPE|value=0" />
<action handler="set" params="dblink=UI:SAVE:INV_PA3:ICON_LIST|value=0" />
<action handler="set" params="dblink=UI:SAVE:INV_PA3:FILTER_ARMOR|value=1" />
@ -289,6 +292,7 @@
<action handler="set" params="dblink=UI:SAVE:INV_PA3:FILTER_TOOL|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_PA3:FILTER_MP|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_PA3:FILTER_MISSMP|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_PA3:FILTER_TP|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_GUILD:SORT_TYPE|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_GUILD:ICON_LIST|value=0" />
<action handler="set" params="dblink=UI:SAVE:INV_GUILD:FILTER_ARMOR|value=1" />
@ -296,6 +300,7 @@
<action handler="set" params="dblink=UI:SAVE:INV_GUILD:FILTER_TOOL|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_GUILD:FILTER_MP|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_GUILD:FILTER_MISSMP|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_GUILD:FILTER_TP|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_ROOM:SORT_TYPE|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_ROOM:ICON_LIST|value=0" />
<action handler="set" params="dblink=UI:SAVE:INV_ROOM:FILTER_ARMOR|value=1" />
@ -303,6 +308,7 @@
<action handler="set" params="dblink=UI:SAVE:INV_ROOM:FILTER_TOOL|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_ROOM:FILTER_MP|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_ROOM:FILTER_MISSMP|value=1" />
<action handler="set" params="dblink=UI:SAVE:INV_ROOM:FILTER_TP|value=1" />
<action handler="set" params="dblink=UI:SAVE:ISDETACHED:MAIN_CHAT|value=0" />
<action handler="set" params="dblink=UI:SAVE:ISDETACHED:GUILD_CHAT|value=0" />

BIN
code/ryzom/client/data/gamedev/interfaces_v3/texture_interfaces_v3.tga
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 MiB

After

Width:  |  Height:  |  Size: 4 MiB

123
code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
View file

@ -243,7 +243,7 @@
<view type="bitmap"
id="win_top"
posref="TL TL"
y="-10"
y="-15"
texture="Infos_top.tga"
global_color="true" />
<view type="bitmap"
@ -265,7 +265,7 @@
id="win_jauge_mid"
posref="TL ML"
x="0"
y="1"
y="-2"
posparent="win_bot"
scale="true"
w="128"
@ -288,7 +288,7 @@
id="info0"
posref="TL TL"
x="0"
y="-3"
y="-10"
fontsize="14"
shadow="true"
hardtext=""
@ -298,7 +298,7 @@
id="info1"
posref="TL TL"
x="0"
y="-17"
y="-28"
fontsize="12"
shadow="true"
hardtext=""
@ -308,7 +308,7 @@
id="info2"
posref="TL TL"
x="0"
y="-32"
y="-40"
fontsize="10"
shadow="true"
hardtext=""
@ -350,6 +350,58 @@
y=""
texture="target_mission.tga"
global_color="false" />
<view type="bitmap"
id="rp_logo_1"
posref="BR BL"
x="4"
y="0"
slot="false"
posparent="info0"
color="255 255 255 255"
render_layer="1"
texture=""
w="24"
h="24"
global_color="false" />
<view type="bitmap"
id="rp_logo_2"
posref="BR BL"
x="32"
y="0"
slot="false"
posparent="info0"
color="255 255 255 255"
render_layer="1"
texture=""
w="24"
h="24"
global_color="false" />
<view type="bitmap"
id="rp_logo_3"
posref="TR TL"
x="60"
y="0"
slot="false"
posparent="info0"
color="255 255 255 255"
render_layer="1"
texture=""
w="24"
h="24"
global_color="false" />
<view type="bitmap"
id="rp_logo_4"
posref="TR TL"
x="88"
y="0"
slot="false"
posparent="info0"
color="255 255 255 255"
render_layer="1"
texture=""
w="24"
h="24"
global_color="false" />
<view type="bitmap"
id="bar0"
posref="TL TL"
@ -415,7 +467,7 @@
<ctrl type="sheet"
id="guild_logo"
posref="ML MR"
x="-8"
x="-4"
slot="false"
posparent="right"
nature="guild_flag"
@ -459,7 +511,7 @@
child_resize_h="true"
child_resize_wmargin="4" >
<view type="bitmap"
id="pvp_faction_civ_logo"
id="pvp_faction_logo"
posref="TL TL"
texture="mp_pearl.tga"
x="2"
@ -467,9 +519,10 @@
h="24"
global_color="false" />
<view type="bitmap"
id="pvp_faction_cult_logo"
id="pvp_safe_logo"
active="false"
posref="TR TL"
posparent="pvp_faction_civ_logo"
posparent="pvp_faction_logo"
texture="mp_pearl.tga"
x="2"
w="24"
@ -499,7 +552,7 @@
x="2"
w="24"
h="24"
texture="ICO_Multi_Fight.tga"
texture="pvp_duel.tga"
global_color="false" />
</group>
</group>
@ -1736,6 +1789,10 @@
<action id="xp_catalyser_use"
name="uimXpCatalyserUse"
handler="xp_catalyser_use" />
<action id="item_text_display"
name="uiOpen"
handler="item_text_display"
params="ui:interface:edit_custom" />
<separator />
<!-- Move to an Animal -->
<action id="move"
@ -1781,14 +1838,13 @@
<action id="infos"
name="uimBoldInfo"
handler="open_item_help" />
<action id="lockunlock"
name="uimLockItem"
handler="lock_inv_item" />
<action id="item_text_edition"
name="uimItemTextEdit"
handler="item_text_edition"
params="ui:interface:edit_custom" />
<action id="item_text_display"
name="uimItemTextDisplay"
handler="item_text_display"
params="ui:interface:edit_custom" />
</group>
<!-- MAX_INVENTORY_ANIMAL -->
<link expr="switch(@%pa_beast0:TYPE, 'uimMtPaMount0', 'uimMtPaMount0', 'uimMtPaPacker0', 'uimMtPaDemon0')"
@ -1802,7 +1858,8 @@
<!-- item menu when we are in self -->
<group type="menu"
id="item_menu_in_self"
extends="base_menu">
extends="base_menu"
on_active="item_menu_base_check" >
<!--<action id="drop" name="uimDrop" handler="proc" params="drop_item_proc"/>-->
<action id="destroy"
name="uimDestroy"
@ -1812,11 +1869,15 @@
name="uimBoldInfo"
handler="open_item_help"
params="" />
<action id="lockunlock"
name="uimLockItem"
handler="lock_inv_item" />
</group>
<!-- item menu default -->
<group type="menu"
id="item_menu"
extends="base_menu">
extends="base_menu"
on_active="item_menu_base_check" >
<!--<action id="drop" name="uimDrop" handler="proc" params="drop_item_proc"/>-->
<action id="destroy"
name="uimDestroy"
@ -1830,6 +1891,9 @@
name="uimBoldInfo"
handler="open_item_help"
params="" />
<action id="lockunlock"
name="uimLockItem"
handler="lock_inv_item" />
</group>
<define id="item_modal_menu"
value="ui:interface:item_menu" />
@ -1959,7 +2023,8 @@
fontsize="10"
value="#value"
global_color="false"
positive="true" />
positive="true"
format="true" />
<view type="text"
id="bad_price"
posparent="box1"
@ -2070,6 +2135,7 @@
global_color="false" />
</group>
</template>
<!-- ********************* -->
<!-- * FACTION POINTS * -->
<!-- ********************* -->
@ -6245,6 +6311,8 @@
<!-- onClickR on a filter -->
<proc id="pinv_item_filter">
<!-- Reset all filter first -->
<action handler="set"
params="dblink=UI:SAVE:@0:FILTER_TP|value=0" />
<action handler="set"
params="dblink=UI:SAVE:@0:FILTER_MISSMP|value=0" />
<action handler="set"
@ -6370,6 +6438,7 @@
filter_tool="UI:SAVE:#inv_type:FILTER_TOOL"
filter_mp="UI:SAVE:#inv_type:FILTER_MP"
filter_missmp="UI:SAVE:#inv_type:FILTER_MISSMP"
filter_tp="UI:SAVE:#inv_type:FILTER_TP"
wspace="2"
hspace="2"
startitem="0"
@ -6426,6 +6495,7 @@
filter_tool="UI:SAVE:#inv_type:FILTER_TOOL"
filter_mp="UI:SAVE:#inv_type:FILTER_MP"
filter_missmp="UI:SAVE:#inv_type:FILTER_MISSMP"
filter_tp="UI:SAVE:#inv_type:FILTER_TP"
hspace="2"
xitem="2"
yitem="-2"
@ -6480,17 +6550,26 @@
<link expr="eq(@UI:SAVE:#inv_type:ICON_LIST, 0)"
target="bag_list:active,sep2:active" />
<instance template="tinv_item_list_filter"
id="filter_missmp"
id="filter_tp"
x="-35"
y="1"
posref="BR BR"
inv_type="#inv_type"
dblink="UI:SAVE:#inv_type:FILTER_TP"
texture="filter_tp.tga"
tooltip="uittFilterTP" />
<instance template="tinv_item_list_filter"
id="filter_missmp"
x="-60"
y="1"
posref="BR BR"
inv_type="#inv_type"
dblink="UI:SAVE:#inv_type:FILTER_MISSMP"
texture="filter_mission.tga"
tooltip="uittFilterMissMP" />
<instance template="tinv_item_list_filter"
id="filter_mp"
x="-60"
x="-85"
y="1"
posref="BR BR"
inv_type="#inv_type"
@ -6499,7 +6578,7 @@
tooltip="uittFilterMP" />
<instance template="tinv_item_list_filter"
id="filter_tool"
x="-85"
x="-110"
y="1"
posref="BR BR"
inv_type="#inv_type"
@ -6508,7 +6587,7 @@
tooltip="uittFilterTool" />
<instance template="tinv_item_list_filter"
id="filter_weapon"
x="-110"
x="-135"
y="1"
posref="BR BR"
inv_type="#inv_type"
@ -6517,7 +6596,7 @@
tooltip="uittFilterWeapon" />
<instance template="tinv_item_list_filter"
id="filter_armor"
x="-135"
x="-160"
y="1"
posref="BR BR"
inv_type="#inv_type"