aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-09-20 03:30:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source
This commit is contained in:
kervala 2016-07-19 09:42:54 +02:00
parent 0d571e617e
commit ca0346645b
4 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
code/ryzom/client/data/gamedev/interfaces_v3/help.xml
View file

@ -356,9 +356,9 @@
</proc> </proc>
<group type="container" <group type="container"
id="death_warning" id="death_warning"
w="400" w="500"
pop_min_w="400" pop_min_w="500"
pop_max_w="400" pop_max_w="500"
h="250" h="250"
pop_min_h="250" pop_min_h="250"
pop_max_h="250" pop_max_h="250"
@ -401,7 +401,7 @@
id="death_warning_text" id="death_warning_text"
posref="TM TM" posref="TM TM"
x="0" x="0"
y="-20" y="-10"
color="255 255 255 255" color="255 255 255 255"
fontsize="12" fontsize="12"
shadow="true" shadow="true"
@ -416,6 +416,7 @@
y="30" y="30"
w="0" w="0"
h="16" h="16"
y_text="-5"
fontsize="10" fontsize="10"
hardtext="uiDeathWarningAvoid" hardtext="uiDeathWarningAvoid"
dblink="UI:VARIABLES:TEMP_DEATH_WARNING_AVOID" dblink="UI:VARIABLES:TEMP_DEATH_WARNING_AVOID"
@ -463,9 +464,9 @@
</proc> </proc>
<group type="container" <group type="container"
id="night_warning" id="night_warning"
w="400" w="500"
pop_min_w="400" pop_min_w="500"
pop_max_w="400" pop_max_w="500"
h="250" h="250"
pop_min_h="250" pop_min_h="250"
pop_max_h="250" pop_max_h="250"
@ -508,7 +509,7 @@
id="night_warning_text" id="night_warning_text"
posref="TM TM" posref="TM TM"
x="0" x="0"
y="-20" y="-10"
color="255 255 255 255" color="255 255 255 255"
fontsize="12" fontsize="12"
shadow="true" shadow="true"

4
code/ryzom/client/data/gamedev/interfaces_v3/inventory.xml
View file

@ -342,7 +342,7 @@
oncandrop="inv_can_drop" ondrop="inv_drop" oncandrop="inv_can_drop" ondrop="inv_drop"
item_slot="LEFT_HAND" value="%hand_l" other_hand_slot="handr" auto_grayed="false" /> 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]: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]:QUALITY)" action="phrase_update_from_hand" />
<link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:ENCHANT)" 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" other_hand_slot="handr"
auto_grayed="false" auto_grayed="false"
tooltip_parent="win" /> 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)" <link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:SHEET)"
action="phrase_update_from_hand" /> action="phrase_update_from_hand" />
<link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:QUALITY)" <link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:QUALITY)"

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

@ -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" <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" /> 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="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="-18" posref="TL TL" 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" /> <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"/> <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="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="" /> <view type="text" id="t" posparent="b" posref="TR TL" x="4" color="255 255 255 255" fontsize="8" shadow="true" hardtext="" />
</group> </group>

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

@ -6652,7 +6652,7 @@
posparent="button" posparent="button"
posref="MR ML" posref="MR ML"
x="4" x="4"
y="-3" y="0"
color="255 255 255 255" color="255 255 255 255"
fontsize="#fontsize" fontsize="#fontsize"
shadow="true" shadow="true"