Commit 853a0aca authored by deed's avatar deed

Merge branch 'feature/character_screens' into 'develop'

Feature/character screens

Il faut aussi merger la même branche sur : 
- [ ] https://git.khaganat.net/khaganat/khanat-ressources/
- [ ] https://git.khaganat.net/khaganat/khanat-data-client

See merge request !24
parents 0ff7b7f0 e85b805c
This diff is collapsed.
......@@ -2,73 +2,39 @@
<root id="interface" x="0" y="0" w="800" h="600" active="true" />
<lua file="bg_downloader.lua" />
<proc id="bg_downloader_active">
<action handler="set" params="dblink=UI:VARIABLES:ISACTIVE:BG_DOWNLOADER|value=1" />
</proc>
<proc id="bg_downloader_deactive">
<action handler="set" params="dblink=UI:VARIABLES:ISACTIVE:BG_DOWNLOADER|value=0" />
</proc>
<!-- Window for the background downloader -->
<group type="container" id="bg_downloader" title="uiBGD_WindowTitle" global_color="false" line_at_bottom="false"
movable="true" opened="true" openable="false"
pop_min_w="410" pop_min_h="100" pop_max_w="410" pop_max_h="100"
h="100"
w="410"
active="false"
savable="true"
header_color="UI:SAVE:WIN:COLORS:OPT"
on_deactive="proc" on_deactive_params="bg_downloader_deactive"
on_active="proc" on_active_params="bg_downloader_active"
>
<group id="header_closed" x="0" y="0" child_resize_w="true" h="16" posref="TL TL"
group_onclick_r="active_menu"
group_params_r="menu=ui:interface:base_menu_with_color"
>
</group>
<group id="header_opened" x="0" y="0" w="800" h="16" posref="TL TL"
group_onclick_r="active_menu"
group_params_r="menu=ui:interface:base_menu_with_color"
>
<group type="container" id="bg_downloader" title="uiBGD_WindowTitle" global_color="false" line_at_bottom="false"movable="true" opened="true" openable="false" pop_min_w="410" pop_min_h="100" pop_max_w="410" pop_max_h="100" h="100" w="410" active="false" savable="true" header_color="UI:SAVE:WIN:COLORS:OPT" on_deactive="proc" on_deactive_params="bg_downloader_deactive" on_active="proc" on_active_params="bg_downloader_active">
<group id="header_closed" x="0" y="0" child_resize_w="true" h="16" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color">
</group>
<group id="content" x="0" y="0" sizeref="wh" w="0" h="0" posref="TL TL" >
<view type="text" id="text" active="true" y="-12" posref="TM TM" hardtext="" fontsize="10" color="255 255 255 255"
auto_clamp="true"
global_color="false"
/>
<view type="text" id="ellipsis" active="true" y="0" posref="BR BL" posparent="text" hardtext="" fontsize="13" color="255 255 255 255"
global_color="false"
/>
<view type="bitmap" id="bm" active="false" y="1" x="-1" texture="W_answer_16_valid.tga" posparent="text" posref="ML MR"
global_color="false"
/>
<view type="bar" id="progress" parent="" active="true" posparent="text" posref="BM TM" y="-2"
global_color="false"
/>
<group id="header_opened" x="0" y="0" w="800" h="16" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color">
</group>
<group type="combo_box" id="prio" sizeref="w" w="32" x="0" y="-8" child_resize_h="true" child_resize_hmargin="6" linked_to_db="false"
posref="BM TM"
posparent="progress"
on_change="lua:bgdownloader:onChangePriority()" on_change_params=""
tooltip="uiBGD_PriorityTooltip"
global_color="false"
>
<instance template="combo_box_def1" tooltip="uiBGD_PriorityTooltip"/>
<group id="content" x="0" y="0" sizeref="wh" w="0" h="0" posref="TL TL" >
<view type="text" id="text" active="true" y="-12" posref="TM TM" hardtext="" fontsize="10" color="255 255 255 255" auto_clamp="true" global_color="false" />
<view type="text" id="ellipsis" active="true" y="0" posref="BR BL" posparent="text" hardtext="" fontsize="13" color="255 255 255 255" global_color="false" />
<view type="bitmap" id="bm" active="false" y="1" x="-1" texture="W_answer_16_valid.tga" posparent="text" posref="ML MR" global_color="false" />
<view type="bar" id="progress" parent="" active="true" posparent="text" posref="BM TM" y="-2" global_color="false" />
<group type="combo_box" id="prio" sizeref="w" w="32" x="0" y="-8" child_resize_h="true" child_resize_hmargin="6" linked_to_db="false" posref="BM TM" posparent="progress" on_change="lua:bgdownloader:onChangePriority()" on_change_params="" tooltip="uiBGD_PriorityTooltip" global_color="false">
<instance template="combo_box_def1" tooltip="uiBGD_PriorityTooltip"/>
<combo_text name="uiBGD_Paused" />
<combo_text name="uiBGD_LowPriority" />
<combo_text name="uiBGD_NormalPriority" />
<combo_text name="uiBGD_NormalPriority" />
</group>
</group>
</group>
<tree node="bg_downloader"/>
</interface_config>
\ No newline at end of file
</interface_config>
......@@ -1617,7 +1617,7 @@
<view type="bitmap"
id="icone"
posref="TL TL"
texture="money_seve.tga"
texture="money.tga"
global_color="false" />
<instance template="box_widget"
id="box1"
......@@ -1673,7 +1673,7 @@
<view type="bitmap"
id="icone"
posref="TL TL"
texture="money_seve.tga"
texture="money.tga"
global_color="false" />
<instance template="box_widget"
id="box1"
......
......@@ -183,7 +183,7 @@
posref="BL BL"
scale="true"
y="4"
w="130"
w="110"
h="2"
texture="W_line_hor2.tga" />
<view type="text"
......@@ -202,7 +202,7 @@
posref="MM MM"
x="0"
y="-1"
w="130"
w="110"
h="8"
vertical="false"
align="L"
......@@ -246,7 +246,7 @@
posref="BL BL"
scale="true"
y="4"
w="130"
w="110"
h="2"
texture="W_line_hor2.tga" />
<view type="text"
......@@ -265,7 +265,7 @@
posref="MM MM"
x="0"
y="-1"
w="130"
w="110"
h="8"
vertical="false"
align="L"
......@@ -1005,11 +1005,11 @@
text_ref="BR BR"
w="100"
prompt=""
enter_loose_ChaScore4="true"
enter_loose_focus="true"
multi_line="false"
onenter="game_config_change_screen_ratio_custom"
enter_recover_ChaScore4="false"
reset_ChaScore4_on_hide="true"
enter_recover_focus="false"
reset_focus_on_hide="true"
max_historic="0"
entry_type="positive_float"
max_float_prec="5"
......@@ -1334,7 +1334,7 @@
y="0"
hardtext="uiHud" />
<!--<instance template="tgcw_checkbox" id="suc" text="uiShowUnderCursor" posref="TL TL" x="0" y="-20" />
<instance template="tgcw_checkbox" id="ChaScore2" text="uiShowTargeted" posref="BL TL" posparent="suc" x="0" y="-12" />-->
<instance template="tgcw_checkbox" id="sta" text="uiShowTargeted" posref="BL TL" posparent="suc" x="0" y="-12" />-->
<instance template="tgcw_checkbox"
id="swrc"
text="uiSelectWithRClick"
......@@ -2043,34 +2043,34 @@
y="-4" />
<instance template="tgcw_checkbox"
id="is_user_ChaScore1"
text="uiChaScore1"
tooltip="uittChaScore1"
text="uiHP"
tooltip="uittHP"
posref="BL TL"
posparent="is_user_guild_name"
x="0"
y="-4" />
<instance template="tgcw_checkbox"
id="is_user_ChaScore3"
text="uiChaScore3"
tooltip="uittChaScore3"
id="is_user_sap"
text="uiSAP"
tooltip="uittSAP"
posref="BL TL"
posparent="is_user_ChaScore1"
x="0"
y="-4" />
<instance template="tgcw_checkbox"
id="is_user_ChaScore2"
text="uiChaScore2"
tooltip="uittChaScore2"
id="is_user_sta"
text="uiSTA"
tooltip="uittSTA"
posref="BL TL"
posparent="is_user_ChaScore3"
posparent="is_user_sap"
x="0"
y="-4" />
<instance template="tgcw_checkbox"
id="is_user_ChaScore4"
text="uiChaScore4"
tooltip="uittChaScore4"
id="is_user_focus"
text="uiFOC"
tooltip="uittFocus"
posref="BL TL"
posparent="is_user_ChaScore2"
posparent="is_user_sta"
x="0"
y="-4" />
<instance template="tgcw_checkbox"
......@@ -2078,7 +2078,7 @@
text="uiActionBar"
tooltip="uittActionBar"
posref="BL TL"
posparent="is_user_ChaScore4"
posparent="is_user_focus"
x="0"
y="-4" />
<instance template="tgcw_checkbox"
......@@ -2160,34 +2160,34 @@
y="-4" />
<instance template="tgcw_checkbox"
id="is_friend_ChaScore1"
text="uiChaScore1"
tooltip="uittChaScore1"
text="uiHP"
tooltip="uittHP"
posref="BL TL"
posparent="is_friend_guild_name"
x="0"
y="-4" />
<instance template="tgcw_checkbox"
id="is_friend_ChaScore3"
text="uiChaScore3"
tooltip="uittChaScore3"
id="is_friend_sap"
text="uiSAP"
tooltip="uittSTA"
posref="BL TL"
posparent="is_friend_ChaScore1"
x="0"
y="-4" />
<instance template="tgcw_checkbox"
id="is_friend_ChaScore2"
text="uiChaScore2"
tooltip="uittChaScore2"
id="is_friend_sta"
text="uiSTA"
tooltip="uittSAP"
posref="BL TL"
posparent="is_friend_ChaScore3"
posparent="is_friend_sap"
x="0"
y="-4" />
<instance template="tgcw_checkbox"
id="is_friend_ChaScore4"
text="uiChaScore4"
tooltip="uittChaScore4"
id="is_friend_focus"
text="uiFOC"
tooltip="uittFocus"
posref="BL TL"
posparent="is_friend_ChaScore2"
posparent="is_friend_sta"
x="0"
y="-4" />
<instance template="tgcw_checkbox"
......@@ -2195,7 +2195,7 @@
text="uiPvpLogo"
tooltip="uittPvpLogo"
posref="BL TL"
posparent="is_friend_ChaScore4"
posparent="is_friend_focus"
x="0"
y="-4" />
<instance template="tgcw_checkbox"
......@@ -2301,8 +2301,8 @@
y="-4" />
<instance template="tgcw_checkbox"
id="is_enemy_ChaScore1"
text="uiChaScore1"
tooltip="uittChaScore1"
text="uiHP"
tooltip="uittHP"
posref="BL TL"
posparent="is_enemy_guild_name"
x="0"
......@@ -3222,7 +3222,7 @@
preset="UI:TEMP:PRESET_FX" />
<!--
<param ui="hud:suc:c" type="cfg" widget="boolbut" link="ShowNameUnderCursor" realtime="true"/>
<param ui="hud:ChaScore2:c" type="cfg" widget="boolbut" link="ShowNameSelected" realtime="true"/>
<param ui="hud:sta:c" type="cfg" widget="boolbut" link="ShowNameSelected" realtime="true"/>
-->
<param ui="hud:swrc:c"
type="cfg"
......@@ -3553,17 +3553,17 @@
widget="boolbut"
link="UI:SAVE:INSCENE:USER:ChaScore1"
realtime="true" />
<param ui="in_scene_user:is_user_ChaScore3:c"
<param ui="in_scene_user:is_user_sap:c"
type="db"
widget="boolbut"
link="UI:SAVE:INSCENE:USER:ChaScore3"
realtime="true" />
<param ui="in_scene_user:is_user_ChaScore2:c"
<param ui="in_scene_user:is_user_sta:c"
type="db"
widget="boolbut"
link="UI:SAVE:INSCENE:USER:ChaScore2"
realtime="true" />
<param ui="in_scene_user:is_user_ChaScore4:c"
<param ui="in_scene_user:is_user_focus:c"
type="db"
widget="boolbut"
link="UI:SAVE:INSCENE:USER:ChaScore4"
......@@ -3608,17 +3608,17 @@
widget="boolbut"
link="UI:SAVE:INSCENE:FRIEND:ChaScore1"
realtime="true" />
<param ui="in_scene_friend:is_friend_ChaScore3:c"
<param ui="in_scene_friend:is_friend_sap:c"
type="db"
widget="boolbut"
link="UI:SAVE:INSCENE:FRIEND:ChaScore3"
realtime="true" />
<param ui="in_scene_friend:is_friend_ChaScore2:c"
<param ui="in_scene_friend:is_friend_sta:c"
type="db"
widget="boolbut"
link="UI:SAVE:INSCENE:FRIEND:ChaScore2"
realtime="true" />
<param ui="in_scene_friend:is_friend_ChaScore4:c"
<param ui="in_scene_friend:is_friend_focus:c"
type="db"
widget="boolbut"
link="UI:SAVE:INSCENE:FRIEND:ChaScore4"
......
......@@ -87,7 +87,7 @@
y="0"
fontsize="12"
shadow="true"
case_mode="%case_normal" />
case_mode="%case_first_word_letter_up" />
<view type="text"
id="grade"
x="158"
......@@ -739,7 +739,7 @@
posparent="title"
x="20"
y="-4"
texture="money_seve.tga"
texture="money.tga"
global_color="false" />
<!-- edit box for the seeds -->
<instance template="edit_box_widget"
......@@ -1050,7 +1050,7 @@
id="html"
posref="TL TL"
url=""
home="http://app.ryzom.com/index.php"
home="http://app.khaganat.net/"
sizeref="wh"
x="0"
y="0"
......@@ -1216,7 +1216,7 @@
id="html"
posref="TL TL"
url=""
home="http://app.ryzom.com/init_ig.php"
home="http://app.khaganat.net/"
sizeref="wh"
x="0"
y="0"
......
......@@ -26,7 +26,7 @@
h="290"
pop_min_h="290"
pop_max_h="290"
title="TheSagaOfRyzom"
title="Khanat"
resizer="true"
global_color="false"
header_color="UI:SAVE:WIN:COLORS:HELP"
......@@ -138,7 +138,7 @@
x="0"
y="6"
posref="BM BM"
text_y="0"
text_y="-2"
onclick_l="proc"
params_l="welcome_close"
hardtext="uittOK" />
......@@ -199,7 +199,7 @@
x="-15"
y="10"
posref="BM BM"
text_y="0"
text_y="-2"
onclick_l="proc"
params_l="active_hardware_cursor"
hardtext="uiYes" />
......@@ -208,7 +208,7 @@
y="0"
posparent="active_ok"
posref="BR BL"
text_y="0"
text_y="-2"
onclick_l="proc"
params_l="close_hardware_cursor"
hardtext="uiNo" />
......@@ -316,7 +316,7 @@
x="0"
y="6"
posref="BM BM"
text_y="0"
text_y="-2"
onclick_l="proc"
params_l="universe_chanel_warning_close"
hardtext="uittOK" />
......@@ -356,9 +356,9 @@
</proc>
<group type="container"
id="death_warning"
w="500"
pop_min_w="500"
pop_max_w="500"
w="400"
pop_min_w="400"
pop_max_w="400"
h="250"
pop_min_h="250"
pop_max_h="250"
......@@ -401,7 +401,7 @@
id="death_warning_text"
posref="TM TM"
x="0"
y="-10"
y="-20"
color="255 255 255 255"
fontsize="12"
shadow="true"
......@@ -416,7 +416,6 @@
y="30"
w="0"
h="16"
y_text="-5"
fontsize="10"
hardtext="uiDeathWarningAvoid"
dblink="UI:VARIABLES:TEMP_DEATH_WARNING_AVOID"
......@@ -425,7 +424,7 @@
x="0"
y="6"
posref="BM BM"
text_y="0"
text_y="-2"
onclick_l="proc"
params_l="death_warning_close"
hardtext="uittOK" />
......@@ -464,9 +463,9 @@
</proc>
<group type="container"
id="night_warning"
w="500"
pop_min_w="500"
pop_max_w="500"
w="400"
pop_min_w="400"
pop_max_w="400"
h="250"
pop_min_h="250"
pop_max_h="250"
......@@ -509,7 +508,7 @@
id="night_warning_text"
posref="TM TM"
x="0"
y="-10"
y="-20"
color="255 255 255 255"
fontsize="12"
shadow="true"
......@@ -532,7 +531,7 @@
x="0"
y="6"
posref="BM BM"
text_y="0"
text_y="-2"
onclick_l="proc"
params_l="night_warning_close"
hardtext="uittOK" />
......@@ -864,8 +863,10 @@
</group>
</group>
</group>
<!--<define id="cs_url"
value="http://app.ryzom.com/ticket_system/index.php?mode=load" />-->
<define id="cs_url"
value="http://app.ryzom.com/ticket_system/index.php?mode=load" />
value="http://lirria.khaganat.net/ams/" />
<group type="container"
id="cs_browser"
w="410"
......@@ -906,6 +907,22 @@
group_params_r="menu=ui:interface:base_menu_with_color"
on_active="lua"
on_active_params="help:openCSBrowserHeader('cs_browser')">
<!--Quitta start-->
<ctrl style="text_button_header"
button_type="push_button"
id="browse_home"
posref="MR MR"
x="-16"
y="0"
hardtext="AMS-HOME"
tooltip="uittBrowseHome"
onclick_l="browse_home"
params_l="name=ui:interface:cs_browser:content:html"
frozen="false" />
<!--Quitta end-->
</group>
<group id="content"
x="0"
......@@ -920,9 +937,9 @@
url="home"
title_prefix="uiHelpTitle"
sizeref="wh"
x="184"
x="2"
y="0"
w="-190"
w="-4"
h="0"
background_color="0 0 0 255"
error_color="255 240 48 255"
......@@ -943,7 +960,7 @@
h6_font_size="12"
paragraph_begin_space="12"
multi_line_space_factor="0.25"
td_begin_space="0"
td_begin_space="10"
li_begin_space="4"
ul_begin_space="12"
li_indent="-10"
......@@ -990,43 +1007,6 @@
<ctrl style="skin_scroll"
id="scroll_bar" />
</group>
<group id="sbtree"
posref="TL TL"
x="0"
y="-12"
sizeref="h"
w="180"
h="-12">
<group id="black"
posref="BR BR"
sizeref="hw"
w="-12"
h="0"
inherit_gc_alpha="true" />
<instance template="inner_thin_border"
posparent="black"
inherit_gc_alpha="true" />
<group id="tree_list"
type="tree"
posref="TL TL"
x="16"
y="-4"
col_over="255 255 255 48"
col_select="255 255 255 80"
fontsize="10"
max_sizeparent="parent"
max_sizeref="wh"
max_w="-20"
max_h="-10">
<node name="uiCSBase"
handler="launch_help"
params="help_container=ui:interface:cs_browser|url=%cs_url" />
</group>
<ctrl style="skin_scroll"
id="scroll_bar"
align="T"
target="tree_list" />
</group>
</group>
</group>
<!--******************-->
......@@ -2829,7 +2809,7 @@
global_color_normal="true"
global_color_over="true"
global_color_pushed="true"
text_y="0"
text_y="-2"
fontsize="10"
shadow="true"
case_mode="%case_upper"
......@@ -2888,21 +2868,21 @@
x="4"
y="0"
posref="TL TL"
text_y="0"
text_y="-2"
onclick_l="proc"
params_l="proc_stat_report_yes"
hardtext="uiYes" />
<ctrl style="button_cancel"
x="4"
posparent="ok"
text_y="0"
text_y="-2"
posref="TR TL"
onclick_l="leave_modal"
hardtext="uiNo" />
<ctrl style="button_always"
x="4"
posparent="cancel"
text_y="0"
text_y="-2"
posref="TR TL"
onclick_l="proc"
params_l="proc_stat_report_always"
......
......@@ -118,7 +118,7 @@
<tree node="keys_edit"/>
<tree node="keys_windows"/>
<tree node="keys_miscellaneous"/>
<tree node="keys_debug"
<tree node="keys_debug"/>
</tree>
<!-- done with template teditcmd now <tree node="editkey" />-->
......
......@@ -1467,7 +1467,7 @@
<group type="webig_html"
id="html"
posref="TL TL"
url="http://app.ryzom.com/app_rpjobs/index.php"
url="http://app.khaganat.net"
title_prefix=""