From 7bbeae5dca21896c2dbfa1bdccd6d6d249b3f01e Mon Sep 17 00:00:00 2001 From: yannk Date: Thu, 6 Oct 2016 17:34:56 +0200 Subject: [PATCH] Integrating Khanat former changes --- .../gamedev/interfaces_v3/bot_chat_v4.xml | 4 +- .../gamedev/interfaces_v3/game_config.xml | 90 +- .../data/gamedev/interfaces_v3/guild.xml | 8 +- .../data/gamedev/interfaces_v3/help.xml | 102 +- .../data/gamedev/interfaces_v3/hierarchy.xml | 2 +- .../gamedev/interfaces_v3/info_player.xml | 8 +- .../data/gamedev/interfaces_v3/login_main.xml | 1750 +++++++++-------- .../gamedev/interfaces_v3/login_widgets.xml | 97 +- .../data/gamedev/interfaces_v3/macros.xml | 12 +- .../gamedev/interfaces_v3/out_v2_appear.lua | 369 +--- .../gamedev/interfaces_v3/out_v2_appear.xml | 1138 +++++------ .../gamedev/interfaces_v3/out_v2_connect.xml | 168 +- .../gamedev/interfaces_v3/out_v2_crash.xml | 64 +- .../interfaces_v3/out_v2_hierarchy.xml | 3 +- .../gamedev/interfaces_v3/out_v2_names.lua | 3 + .../gamedev/interfaces_v3/out_v2_select.xml | 57 +- .../gamedev/interfaces_v3/outgame_connect.xml | 326 +-- .../gamedev/interfaces_v3/outgame_crash.xml | 236 +-- .../gamedev/interfaces_v3/player_trade.xml | 4 +- .../data/gamedev/interfaces_v3/widgets.xml | 319 +-- 20 files changed, 2139 insertions(+), 2621 deletions(-) create mode 100644 code/ryzom/client/data/gamedev/interfaces_v3/out_v2_names.lua diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml b/code/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml index 2d3271082..b9c358f96 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml @@ -1617,7 +1617,7 @@ + --> - - - - - - + case_mode="%case_first_word_letter_up" /> @@ -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 @@ @@ -464,9 +463,9 @@ @@ -864,8 +863,10 @@ + + value="http://lirria.khaganat.net/ams/" /> + + + + + + - - - - - - - - @@ -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" /> - diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml b/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml index 38dbf0ed2..7a0919bf1 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml @@ -1467,7 +1467,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -