copie des fichiers du code mise a jour par un merge
This commit is contained in:
parent
218b7c9299
commit
c386bea059
10 changed files with 1708 additions and 1714 deletions
|
|
@ -2672,9 +2672,9 @@
|
|||
<instance template="tgcw_checkbox"
|
||||
id="hard"
|
||||
text="uiMouseHardware"
|
||||
posref="TR TR"
|
||||
x="-55"
|
||||
y="-20" />
|
||||
posref="TM TL"
|
||||
x="0"
|
||||
y="-35" />
|
||||
<instance template="tgcw_checkbox"
|
||||
id="inverted"
|
||||
text="uiMouseInverted"
|
||||
|
|
@ -2689,6 +2689,13 @@
|
|||
posref="BL TL"
|
||||
x="0"
|
||||
y="-2" />
|
||||
<instance template="tgcw_checkbox"
|
||||
id="tablet"
|
||||
text="uiMouseTablet"
|
||||
posparent="dbl"
|
||||
posref="BL TL"
|
||||
x="0"
|
||||
y="-2" />
|
||||
<view style="sgc_title2"
|
||||
type="text"
|
||||
id="inter"
|
||||
|
|
@ -3833,6 +3840,11 @@
|
|||
widget="boolbut"
|
||||
link="DblClickMode"
|
||||
realtime="true" />
|
||||
<param ui="mouse:tablet:c"
|
||||
type="cfg"
|
||||
widget="boolbut"
|
||||
link="FreeLookTablet"
|
||||
realtime="true" />
|
||||
<param ui="mouse:dcspeed:c"
|
||||
type="db"
|
||||
widget="sbint"
|
||||
|
|
|
|||
|
|
@ -1050,7 +1050,7 @@
|
|||
id="html"
|
||||
posref="TL TL"
|
||||
url=""
|
||||
home="https://app.lirria.khaganat.net/"
|
||||
home="http://app.khaganat.net/"
|
||||
sizeref="wh"
|
||||
x="0"
|
||||
y="0"
|
||||
|
|
@ -1216,7 +1216,7 @@
|
|||
id="html"
|
||||
posref="TL TL"
|
||||
url=""
|
||||
home="https://app.lirria.khaganat.net/"
|
||||
home="http://app.khaganat.net/"
|
||||
sizeref="wh"
|
||||
x="0"
|
||||
y="0"
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@
|
|||
x="0"
|
||||
y="6"
|
||||
posref="BM BM"
|
||||
text_y="-0"
|
||||
text_y="0"
|
||||
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="0"
|
||||
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="0"
|
||||
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="0"
|
||||
onclick_l="proc"
|
||||
params_l="universe_chanel_warning_close"
|
||||
hardtext="uittOK" />
|
||||
|
|
@ -425,7 +425,7 @@
|
|||
x="0"
|
||||
y="6"
|
||||
posref="BM BM"
|
||||
text_y="-0"
|
||||
text_y="0"
|
||||
onclick_l="proc"
|
||||
params_l="death_warning_close"
|
||||
hardtext="uittOK" />
|
||||
|
|
@ -532,7 +532,7 @@
|
|||
x="0"
|
||||
y="6"
|
||||
posref="BM BM"
|
||||
text_y="-0"
|
||||
text_y="0"
|
||||
onclick_l="proc"
|
||||
params_l="night_warning_close"
|
||||
hardtext="uittOK" />
|
||||
|
|
@ -865,7 +865,7 @@
|
|||
</group>
|
||||
</group>
|
||||
<define id="cs_url"
|
||||
value="https://www.khaganat.net/" />
|
||||
value="https://app.khaganat.net/ams/" />
|
||||
<group type="container"
|
||||
id="cs_browser"
|
||||
w="410"
|
||||
|
|
@ -2889,21 +2889,21 @@
|
|||
x="4"
|
||||
y="0"
|
||||
posref="TL TL"
|
||||
text_y="-0"
|
||||
text_y="0"
|
||||
onclick_l="proc"
|
||||
params_l="proc_stat_report_yes"
|
||||
hardtext="uiYes" />
|
||||
<ctrl style="button_cancel"
|
||||
x="4"
|
||||
posparent="ok"
|
||||
text_y="-0"
|
||||
text_y="0"
|
||||
posref="TR TL"
|
||||
onclick_l="leave_modal"
|
||||
hardtext="uiNo" />
|
||||
<ctrl style="button_always"
|
||||
x="4"
|
||||
posparent="cancel"
|
||||
text_y="-0"
|
||||
text_y="0"
|
||||
posref="TR TL"
|
||||
onclick_l="proc"
|
||||
params_l="proc_stat_report_always"
|
||||
|
|
|
|||
|
|
@ -1467,7 +1467,7 @@
|
|||
<group type="webig_html"
|
||||
id="html"
|
||||
posref="TL TL"
|
||||
url="https://app.lirria.khaganat.net/"
|
||||
url="https://app.khaganat.net/"
|
||||
title_prefix=""
|
||||
sizeref="wh"
|
||||
x="0"
|
||||
|
|
@ -1502,7 +1502,7 @@
|
|||
checkbox_bitmap_pushed="w_opacity_on.tga"
|
||||
checkbox_bitmap_over=""
|
||||
background_bitmap_view="black2"
|
||||
home="https://app.lirria.khaganat.net/"
|
||||
home="https://app.khaganat.net"
|
||||
browse_next_time="true"
|
||||
form_text_area_group="edit_box_widget_multiline">
|
||||
<group id="black"
|
||||
|
|
@ -1602,7 +1602,7 @@
|
|||
id="html"
|
||||
posref="TL TL"
|
||||
posparent="parent"
|
||||
url="https://app.lirria.khaganat.net/"
|
||||
url="https://app.khaganat.net"
|
||||
title_prefix=""
|
||||
sizeref="wh"
|
||||
x="0"
|
||||
|
|
@ -1637,7 +1637,7 @@
|
|||
checkbox_bitmap_pushed="w_opacity_on.tga"
|
||||
checkbox_bitmap_over=""
|
||||
background_bitmap_view="black2"
|
||||
home="https://app.lirria.khaganat.net/"
|
||||
home="https://app.khaganat.net"
|
||||
browse_next_time="true"
|
||||
form_text_area_group="edit_box_widget_multiline">
|
||||
<group id="black"
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@
|
|||
posparent="jauges"
|
||||
posref="TL TL"
|
||||
x="0"
|
||||
y="-1"
|
||||
y="0"
|
||||
sizeref="wh3"
|
||||
w="0"
|
||||
h="0" />
|
||||
|
|
@ -246,7 +246,7 @@
|
|||
posref="MM MM"
|
||||
posparent="slot_force"
|
||||
x="0"
|
||||
y="-2"
|
||||
y="0"
|
||||
color="255 255 255 255"
|
||||
fontsize="10"
|
||||
shadow="true"
|
||||
|
|
@ -364,7 +364,7 @@
|
|||
id="b_life"
|
||||
posref="TL TL"
|
||||
x="0"
|
||||
y="-2"
|
||||
y="0"
|
||||
texture="slot_jauge.tga"
|
||||
inherit_gc_alpha="false" />
|
||||
<instance template="jauge_score_target"
|
||||
|
|
@ -521,7 +521,6 @@
|
|||
|
||||
<view type="text"
|
||||
id="text"
|
||||
case_mode="%case_first_word_letter_up"
|
||||
posref="TL TL"
|
||||
x="8"
|
||||
y="-8"
|
||||
|
|
@ -544,7 +543,7 @@
|
|||
posparent="add_contact_eb"
|
||||
posref="BR TR"
|
||||
x="0"
|
||||
y="-2"
|
||||
y="0"
|
||||
onclick_ok="add_contact"
|
||||
onclick_ok_param=""
|
||||
onclick_cancel="leave_modal"
|
||||
|
|
@ -604,7 +603,7 @@
|
|||
<instance template="edit_box_widget"
|
||||
id="ebw"
|
||||
posref="BR TR"
|
||||
y="-2"
|
||||
y="0"
|
||||
posparent="cb"
|
||||
child_resize_h="true"
|
||||
sizeref="w"
|
||||
|
|
@ -666,7 +665,7 @@
|
|||
<instance template="edit_box_widget"
|
||||
id="ebw"
|
||||
posref="BR TR"
|
||||
y="-2"
|
||||
y="0"
|
||||
posparent="cb"
|
||||
child_resize_h="true"
|
||||
sizeref="w"
|
||||
|
|
@ -807,7 +806,7 @@
|
|||
<instance template="edit_box_widget"
|
||||
id="ebw"
|
||||
posref="BR TR"
|
||||
y="-2"
|
||||
y="0"
|
||||
posparent="cb"
|
||||
child_resize_h="true"
|
||||
sizeref="w"
|
||||
|
|
@ -859,7 +858,7 @@
|
|||
<group type="menu"
|
||||
id="user_chat_emote_menu"
|
||||
extends="base_menu"
|
||||
case_mode="%case_first_word_letter_up"
|
||||
case_mode="%case_normal"
|
||||
on_active="lua:game:updateEmoteMenu()">
|
||||
<action id="uiEM_Wave"
|
||||
name="uiQuickEmote" />
|
||||
|
|
@ -1078,7 +1077,7 @@
|
|||
tooltip_parent="win" />
|
||||
<!-- Yes order is strange, but don't want to modify all the ugly hardcoded code -->
|
||||
<ctrl style="tab_button_new"
|
||||
id="tab7"
|
||||
id="tab6"
|
||||
posparent="tab3"
|
||||
group="content:cb:universe"
|
||||
hardtext="uitabChatUniverse"
|
||||
|
|
@ -1090,7 +1089,7 @@
|
|||
tooltip_parent="win" />
|
||||
<ctrl style="tab_button_new"
|
||||
id="tab4"
|
||||
posparent="tab7"
|
||||
posparent="tab6"
|
||||
group="content:cb:sysinfo"
|
||||
hardtext="uitabChatSysInfo"
|
||||
onclick_r="set"
|
||||
|
|
@ -1108,23 +1107,12 @@
|
|||
params_l="user"
|
||||
tooltip="uittChatUser"
|
||||
tooltip_parent="win" />
|
||||
<ctrl style="tab_button_new"
|
||||
id="tab6"
|
||||
posparent="tab5"
|
||||
group="content:cb:yubo_chat"
|
||||
hardtext="uitabChatYuboChat"
|
||||
onclick_r="set"
|
||||
params_r="dblink=UI:SAVE:ISDETACHED:YUBO_CHAT|value=1"
|
||||
onclick_l="chat_group_filter"
|
||||
params_l="yubo_chat"
|
||||
tooltip="uittChatYubo"
|
||||
tooltip_parent="win" />
|
||||
<!-- Fixed number of dynamic chat allowed. force _firstpos and _nextpos to have correctly aligned tab-->
|
||||
<vector template="temp_tab_dyn_chat"
|
||||
_size="%max_dyn_chan_per_player"
|
||||
id="tab_array0_$i"
|
||||
nb="$i"
|
||||
posparent="tab6"
|
||||
posparent="tab5"
|
||||
_firstpos="TR TL"
|
||||
_nextpos="TR TL" />
|
||||
<!-- Show or hide tabs : a tab is visible if it is not filtered into the user chat AND not detached -->
|
||||
|
|
@ -1136,7 +1124,7 @@
|
|||
target="tab1:active" />
|
||||
<link expr="and(@UI:SAVE:ISENABLED:UNIVERSE_CHAT,
|
||||
not(@UI:SAVE:ISDETACHED:UNIVERSE_CHAT))"
|
||||
target="tab7:active" />
|
||||
target="tab6:active" />
|
||||
<link expr="and (and(%is_team_present, @UI:SAVE:ISENABLED:TEAM_CHAT),
|
||||
not(@UI:SAVE:ISDETACHED:TEAM_CHAT))"
|
||||
target="tab2:active" />
|
||||
|
|
@ -1148,9 +1136,6 @@
|
|||
target="tab4:active" />
|
||||
<link expr="not(@UI:SAVE:ISDETACHED:USER_CHAT)"
|
||||
target="tab5:active" />
|
||||
<link expr="and(and(%is_yubo_chat_present, @UI:SAVE:ISENABLED:YUBO_CHAT),
|
||||
not(@UI:SAVE:ISDETACHED:YUBO_CHAT))"
|
||||
target="tab6:active" />
|
||||
<!-- Show individual chat windows if needed -->
|
||||
<link expr="and (@UI:SAVE:ISENABLED:AROUND_ME,
|
||||
@UI:SAVE:ISDETACHED:AROUND_ME)"
|
||||
|
|
@ -1172,9 +1157,6 @@
|
|||
target="ui:interface:system_info:active" />
|
||||
<link expr="@UI:SAVE:ISDETACHED:USER_CHAT"
|
||||
target="ui:interface:user_chat:active" />
|
||||
<link expr="and(and(%is_yubo_chat_present, @UI:SAVE:ISENABLED:YUBO_CHAT),
|
||||
@UI:SAVE:ISDETACHED:YUBO_CHAT)"
|
||||
target="ui:interface:yubo_chat:active" />
|
||||
</group>
|
||||
<view type="bitmap"
|
||||
id="sep"
|
||||
|
|
@ -1248,13 +1230,6 @@
|
|||
y="0"
|
||||
w="0"
|
||||
h="0" />
|
||||
<instance template="chat_box_mainchat"
|
||||
id="yubo_chat"
|
||||
posref="TL TL"
|
||||
sizeref="wh"
|
||||
y="0"
|
||||
w="0"
|
||||
h="0" />
|
||||
<!-- Fixed number of dynamic chat allowed -->
|
||||
<vector template="chat_box_mainchat"
|
||||
id="dyn_chat$i"
|
||||
|
|
@ -1287,7 +1262,7 @@
|
|||
tooltip_parent="win"
|
||||
onclick_l="select_chat_target"
|
||||
params_l="menu=ui:interface:user_chat_target_menu|party_chats=false"
|
||||
case_mode="%case_first_word_letter_up" />
|
||||
case_mode="%case_normal" />
|
||||
<ctrl style="text_button_16"
|
||||
id="but_emote"
|
||||
posref="BR TR"
|
||||
|
|
@ -1602,7 +1577,7 @@
|
|||
</group>
|
||||
<!--
|
||||
<group id="header_opened" x="0" y="0" w="160" child_resize_h="true" child_resize_hmargin="4" posref="TL TL" >
|
||||
<view type="bar3" id="jauges" posref="TR TR" y="-2" mini="true" x="-16"
|
||||
<view type="bar3" id="jauges" posref="TR TR" y="0" mini="true" x="-16"
|
||||
color1="%sta_color" value1="UI:VARIABLES:BARS:TEAM:#team_mate_index:STA" range1="UI:CONST:127"
|
||||
color2="%sap_color" value2="UI:VARIABLES:BARS:TEAM:#team_mate_index:SAP" range2="UI:CONST:127"
|
||||
color3="%hp_color" color3_negative="%hp_color_neg" value3="UI:VARIABLES:BARS:TEAM:#team_mate_index:HP" range3="UI:CONST:127" />
|
||||
|
|
@ -1614,7 +1589,7 @@
|
|||
|
||||
<! - chat box - >
|
||||
<instance template="chat_box" id="cb" posref="TR TR" sizeref="w" y="-8" w="0" h="64" min_height="64" max_height="1600"/>
|
||||
<instance template="edit_box_widget" id="ebw" posref="BR TR" y="-2" posparent="cb" child_resize_h="true" sizeref="w" w="-10" onenter="contact_entry" backup_father_container_pos="true"/>
|
||||
<instance template="edit_box_widget" id="ebw" posref="BR TR" y="0" posparent="cb" child_resize_h="true" sizeref="w" w="-10" onenter="contact_entry" backup_father_container_pos="true"/>
|
||||
|
||||
<! - links to display lead or successor - >
|
||||
<link expr="eq(@SERVER:GROUP:LEADER_INDEX, #team_mate_index)" target="lead:active"/>
|
||||
|
|
@ -1673,7 +1648,7 @@
|
|||
id="blocked"
|
||||
posref="MR MR"
|
||||
x="-20"
|
||||
y="-2"
|
||||
y="0"
|
||||
texture="w_answer_16_cancel.tga"
|
||||
global_color="false"
|
||||
active="false" />
|
||||
|
|
@ -1760,7 +1735,7 @@
|
|||
id="blocked"
|
||||
posref="MR MR"
|
||||
x="-50"
|
||||
y="-2"
|
||||
y="0"
|
||||
texture="w_answer_16_cancel.tga"
|
||||
global_color="false"
|
||||
active="false" />
|
||||
|
|
@ -1817,7 +1792,7 @@
|
|||
y="0"
|
||||
posref="MR MR"
|
||||
posparent="parent"
|
||||
text_y="-2"
|
||||
text_y="0"
|
||||
onclick_l="lua"
|
||||
params_l="validMessageBox(i18n.get('uiAddTellerToIgnoreListWarning'), 'add_teller_to_ignore_list', 'id=ui:interface:#id', '', '' ,'ui:interface')"
|
||||
hardtext="uiAddTellerToIgnoreList"
|
||||
|
|
@ -1831,7 +1806,7 @@
|
|||
y="0"
|
||||
posref="ML MR"
|
||||
posparent="ignore"
|
||||
text_y="-2"
|
||||
text_y="0"
|
||||
onclick_l="add_teller_to_friend_list"
|
||||
params_l=""
|
||||
hardtext="uiAddTellerToFriends"
|
||||
|
|
@ -1845,7 +1820,7 @@
|
|||
y="0"
|
||||
posref="ML MR"
|
||||
posparent="new_friend"
|
||||
text_y="-2"
|
||||
text_y="0"
|
||||
onclick_l="invite_to_ring_session"
|
||||
params_l=""
|
||||
hardtext="uiInviteToRingSession"
|
||||
|
|
@ -1869,7 +1844,7 @@
|
|||
<instance template="edit_box_widget"
|
||||
id="ebw"
|
||||
posref="BR TR"
|
||||
y="-2"
|
||||
y="0"
|
||||
posparent="cb"
|
||||
child_resize_h="true"
|
||||
sizeref="w"
|
||||
|
|
@ -1957,10 +1932,6 @@
|
|||
name="uiSystemInfo"
|
||||
usergroup_l="chat_menu_button"
|
||||
usergroup_params_l="chat_db=SYSTEM_INFO" />
|
||||
<action id="yubo_chat"
|
||||
name="uitabChatYuboChat"
|
||||
usergroup_l="chat_menu_button"
|
||||
usergroup_params_l="chat_db=YUBO_CHAT" />
|
||||
<!-- Bit of a hack as vector is not supported inside a submenu -->
|
||||
<action id="dyn0"
|
||||
name="0"
|
||||
|
|
@ -2094,7 +2065,7 @@
|
|||
<instance template="edit_box_widget"
|
||||
id="ebw"
|
||||
posref="BR TR"
|
||||
y="-2"
|
||||
y="0"
|
||||
posparent="cb"
|
||||
child_resize_h="true"
|
||||
sizeref="w"
|
||||
|
|
@ -3050,7 +3021,7 @@
|
|||
|
||||
<group id="header_opened" x="0" y="0" w="160" h="13" posref="TL TL" child_resize_h="true" child_resize_hmargin="8" >
|
||||
<instance template="chat_box" id="cb" posref="TR TR" sizeref="w" y="-8" w="0" h="64" min_height="64" max_height="1600"/>
|
||||
<instance template="edit_box_widget" id="ebw" posref="BR TR" y="-2" posparent="cb" child_resize_h="true" sizeref="w" w="-10" onenter="debug_console_entry" backup_father_container_pos="true"/>
|
||||
<instance template="edit_box_widget" id="ebw" posref="BR TR" y="0" posparent="cb" child_resize_h="true" sizeref="w" w="-10" onenter="debug_console_entry" backup_father_container_pos="true"/>
|
||||
</group>
|
||||
|
||||
<group id="content" x="0" y="0" h="0" posref="TL TL" >
|
||||
|
|
@ -3060,13 +3031,6 @@
|
|||
<tree node="debug_console">
|
||||
</tree>
|
||||
-->
|
||||
<!-- ************* -->
|
||||
<!-- * YUBO CHAT * -->
|
||||
<!-- ************* -->
|
||||
<proc id="yubo_chat_proc_close">
|
||||
<action handler="set"
|
||||
params="dblink=UI:SAVE:ISDETACHED:YUBO_CHAT|value=0" />
|
||||
</proc>
|
||||
<!-- **************** -->
|
||||
<!-- * DYNAMIC CHAT * -->
|
||||
<!-- **************** -->
|
||||
|
|
@ -3127,7 +3091,7 @@
|
|||
<instance template="edit_box_widget"
|
||||
id="ebw"
|
||||
posref="BR TR"
|
||||
y="-2"
|
||||
y="0"
|
||||
posparent="cb"
|
||||
child_resize_h="true"
|
||||
sizeref="w"
|
||||
|
|
@ -3163,4 +3127,19 @@
|
|||
<action handler="set"
|
||||
params="dblink=UI:SAVE:ISDETACHED:DYNAMIC_CHAT@0|value=0" />
|
||||
</proc>
|
||||
|
||||
<!-- there seems to be no way to pass url to menu, use lua script for middleman -->
|
||||
<group type="menu"
|
||||
id="chat_uri_action_menu"
|
||||
extends="base_menu">
|
||||
<action id="copy"
|
||||
name="uiCopy"
|
||||
handler="lua"
|
||||
params="game:chatUrlCopy()" />
|
||||
<action id="openig"
|
||||
name="uiBrowse"
|
||||
handler="lua"
|
||||
params="game:chatUrlBrowse()" />
|
||||
</group>
|
||||
|
||||
</interface_config>
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@
|
|||
|
||||
<!-- NAME OF SPELL -->
|
||||
<instance template="edit_box_widget" id="eb_spell_name" posref="TR BR" x="0" w="216" y="-54" h="20" child_resize="false"
|
||||
text_x="0" text_y="-2" text_ref="ML ML"
|
||||
text_x="0" text_y="0" text_ref="ML ML"
|
||||
fontsize="12" multi_line="false" max_num_chars="20"
|
||||
enter_loose_focus="true" enter_recover_focus="false" prompt="" reset_focus_on_hide="true" onchange="phrase_change_name" />
|
||||
<view type="text" id="text_spell_name" posparent="eb_spell_name" posref="TL BL" x="0" y="-2" color="255 255 255 255" fontsize="10" shadow="true" hardtext="uiPhraseEditName" />
|
||||
|
|
|
|||
|
|
@ -865,8 +865,8 @@ function game:updatePhraseTooltip(phrase)
|
|||
end
|
||||
-- IMPORTANT : the following getters on 'phrase' take in account the 'total action malus' for the timebeing
|
||||
self:setPhraseTooltipCarac(ttWin, "ChaScore1_cost", phrase:getChaScore1Cost())
|
||||
self:setPhraseTooltipCarac(ttWin, "ChaScore3_cost", phrase:getChaScore3Cost())
|
||||
self:setPhraseTooltipCarac(ttWin, "ChaScore2_cost", phrase:getChaScore2Cost())
|
||||
self:setPhraseTooltipCarac(ttWin, "ChaScore3_cost", phrase:getChaScore3Cost())
|
||||
self:setPhraseTooltipCarac(ttWin, "ChaScore4_cost", phrase:getChaScore4Cost())
|
||||
self:setPhraseTooltipCarac(ttWin, "cast_time", phrase:getCastTime(), concatUCString(string.format("%.1f", phrase:getCastTime()), i18n.get("uittSeconds")))
|
||||
local castRange = phrase:getCastRange()
|
||||
|
|
@ -907,6 +907,7 @@ function game:updatePhraseTooltip(phrase)
|
|||
return text
|
||||
end
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------
|
||||
-- called at each frame when a power/aura tooltip is displayed,in order to update the regen countdown
|
||||
function game:updatePowerPhraseTooltip()
|
||||
|
|
|
|||
|
|
@ -1029,7 +1029,7 @@
|
|||
<template name="3dbulle_R" id="" >
|
||||
<group id="#id" type="container" header_active="false" options="no_bordure" openable="false" savable="false" resizer="true" movable="false" right_button="false" opened="true" child_resize_w="true" w="0" max_w="256" min_w="48" h="48" >
|
||||
|
||||
<group id="header_opened" x="0" y="0" child_resize_w="true" w="0" child_resize_h="true" h="0" max_w="256" min_w="48" max_h="256" min_h="48" posref="TL TL" >
|
||||
<group id="header_opened" x="0" y="0" child_resize_w="true" w="0" child_resize_h="true" h="0" max_w="256" min_w="48" max_h="512" min_h="48" posref="TL TL" >
|
||||
|
||||
<group id="window" x="0" y="0" child_resize_w="true" w="0" child_resize_h="true" h="0" posref="TL TL" >
|
||||
<view type="bitmap" id="win_M" posref="MM MM" scale="true" sizeref="wh" w="-10" h="-10" texture="Bulle_M.tga" global_color="false"/>
|
||||
|
|
@ -1090,7 +1090,7 @@
|
|||
h="0"
|
||||
max_w="512"
|
||||
min_w="48"
|
||||
max_h="256"
|
||||
max_h="512"
|
||||
min_h="48"
|
||||
posref="TL TL">
|
||||
<group id="window"
|
||||
|
|
@ -1314,7 +1314,7 @@
|
|||
h="0"
|
||||
max_w="512"
|
||||
min_w="48"
|
||||
max_h="256"
|
||||
max_h="512"
|
||||
min_h="48"
|
||||
posref="TL TL">
|
||||
<group id="window"
|
||||
|
|
@ -2793,6 +2793,7 @@
|
|||
text_ref="BL BL"
|
||||
child_resize_h="true"
|
||||
multi_line="true"
|
||||
multi_min_line="0"
|
||||
x="0"
|
||||
y="0"
|
||||
w="0"
|
||||
|
|
@ -4519,7 +4520,7 @@
|
|||
entry_type="positive_integer"
|
||||
id="edit"
|
||||
text_ref="TR TR"
|
||||
text_y="-1"
|
||||
text_y="0"
|
||||
fontsize="12"
|
||||
posparent="sheet"
|
||||
posref="MR ML"
|
||||
|
|
@ -5055,7 +5056,7 @@
|
|||
color="255 255 255 128"
|
||||
col_over="255 255 255 0"
|
||||
col_pushed="255 190 0 192"
|
||||
text_y="-3"
|
||||
text_y="0"
|
||||
fontsize="12"
|
||||
shadow="true"
|
||||
text_color_normal="255 255 255 160"
|
||||
|
|
@ -5092,7 +5093,7 @@
|
|||
color="255 255 255 255"
|
||||
col_over="255 255 255 255"
|
||||
col_pushed="255 255 255 255"
|
||||
text_y="-3"
|
||||
text_y="0"
|
||||
fontsize="14"
|
||||
shadow="true"
|
||||
text_color_pushed="255 255 255 255"
|
||||
|
|
@ -7146,6 +7147,7 @@
|
|||
global_color="false" />
|
||||
</group>
|
||||
</template>
|
||||
|
||||
<template name="html_form_select_box_menu_widget"
|
||||
keep="true"
|
||||
id="sb">
|
||||
|
|
|
|||
Loading…
Reference in a new issue