mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-27 03:10:54 +00:00
Merge with develop
--HG-- branch : compatibility-develop
This commit is contained in:
commit
13d7f5c1dd
4 changed files with 15 additions and 14 deletions
|
@ -356,9 +356,9 @@
|
|||
</proc>
|
||||
<group type="container"
|
||||
id="death_warning"
|
||||
w="400"
|
||||
pop_min_w="400"
|
||||
pop_max_w="400"
|
||||
w="500"
|
||||
pop_min_w="500"
|
||||
pop_max_w="500"
|
||||
h="250"
|
||||
pop_min_h="250"
|
||||
pop_max_h="250"
|
||||
|
@ -401,7 +401,7 @@
|
|||
id="death_warning_text"
|
||||
posref="TM TM"
|
||||
x="0"
|
||||
y="-20"
|
||||
y="-10"
|
||||
color="255 255 255 255"
|
||||
fontsize="12"
|
||||
shadow="true"
|
||||
|
@ -416,6 +416,7 @@
|
|||
y="30"
|
||||
w="0"
|
||||
h="16"
|
||||
y_text="-5"
|
||||
fontsize="10"
|
||||
hardtext="uiDeathWarningAvoid"
|
||||
dblink="UI:VARIABLES:TEMP_DEATH_WARNING_AVOID"
|
||||
|
@ -463,9 +464,9 @@
|
|||
</proc>
|
||||
<group type="container"
|
||||
id="night_warning"
|
||||
w="400"
|
||||
pop_min_w="400"
|
||||
pop_max_w="400"
|
||||
w="500"
|
||||
pop_min_w="500"
|
||||
pop_max_w="500"
|
||||
h="250"
|
||||
pop_min_h="250"
|
||||
pop_max_h="250"
|
||||
|
@ -508,7 +509,7 @@
|
|||
id="night_warning_text"
|
||||
posref="TM TM"
|
||||
x="0"
|
||||
y="-20"
|
||||
y="-10"
|
||||
color="255 255 255 255"
|
||||
fontsize="12"
|
||||
shadow="true"
|
||||
|
|
|
@ -342,7 +342,7 @@
|
|||
oncandrop="inv_can_drop" ondrop="inv_drop"
|
||||
item_slot="LEFT_HAND" value="%hand_l" other_hand_slot="handr" auto_grayed="false" />
|
||||
|
||||
<! - Must update some things when the item equiped change - >
|
||||
<! - Must update some things when the item equipped change - >
|
||||
<link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:SHEET)" action="phrase_update_from_hand" />
|
||||
<link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:QUALITY)" action="phrase_update_from_hand" />
|
||||
<link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:ENCHANT)" action="phrase_update_from_hand" />
|
||||
|
@ -1297,7 +1297,7 @@
|
|||
other_hand_slot="handr"
|
||||
auto_grayed="false"
|
||||
tooltip_parent="win" />
|
||||
<!-- Must update some things when the item equiped change -->
|
||||
<!-- Must update some things when the item equipped change -->
|
||||
<link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:SHEET)"
|
||||
action="phrase_update_from_hand" />
|
||||
<link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:QUALITY)"
|
||||
|
|
|
@ -192,8 +192,8 @@
|
|||
<ctrl type="button" id="center" button_type="push_button" posparent="zoom_out" posref="TR TL" y="0" x="4" tx_normal="w_center_map.tga" tx_pushed="W_button_16_over.tga" tx_over="W_button_16_over.tga"
|
||||
onclick_l="map_center" params_l="map=ui:interface:map:content:map_content:actual_map" tooltip="uittCenter" />
|
||||
|
||||
<view type="text" id="time" x="12" y="-1" posparent="center" posref="MR ML" color="255 255 255 255" fontsize="12" shadow="true" hardtext="" />
|
||||
<view type="text" id="weather" x="8" y="-18" posref="TL TL" color="255 255 255 255" fontsize="12" shadow="true" hardtext="" />
|
||||
<view type="text" id="time" x="12" y="0" posparent="center" posref="MR ML" color="255 255 255 255" fontsize="12" shadow="true" hardtext="" />
|
||||
<view type="text" id="weather" x="8" y="-16" posref="TL TL" color="255 255 255 255" fontsize="12" shadow="true" hardtext="" />
|
||||
|
||||
<instance template="box_widget" id="back" posref="TL TL" sizeref="wh" w="-2" h="-32" x="1" y="-32" render_layer="0" />
|
||||
|
||||
|
@ -383,7 +383,7 @@
|
|||
|
||||
<ctrl style="button_ok" id="respawn" posparent="center" x="16" posref="TR TL" onclick_l="respawn_map_valid" params_l="map=ui:interface:respawn_map:content:map_content:actual_map" hardtext="uiRespawn"/>
|
||||
|
||||
<group id="timer" posparent="respawn" posref="TR TL" x="8" y="-5" child_resize_h="true" child_resize_w="true">
|
||||
<group id="timer" posparent="respawn" posref="TR TL" x="8" y="-2" child_resize_h="true" child_resize_w="true">
|
||||
<view type="bar" id="b" ultra_mini="true" posref="TL TL" value="%player_hp_percent" range="%player_percent_max" color="255 255 255 255" color_negative="255 255 255 255" />
|
||||
<view type="text" id="t" posparent="b" posref="TR TL" x="4" color="255 255 255 255" fontsize="8" shadow="true" hardtext="" />
|
||||
</group>
|
||||
|
|
|
@ -6652,7 +6652,7 @@
|
|||
posparent="button"
|
||||
posref="MR ML"
|
||||
x="4"
|
||||
y="-3"
|
||||
y="0"
|
||||
color="255 255 255 255"
|
||||
fontsize="#fontsize"
|
||||
shadow="true"
|
||||
|
|
Loading…
Reference in a new issue