Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
Nimetu 2016-07-23 11:28:22 +03:00
parent f77aa34ee6
commit 0be0a1e9e7
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/nel/src/gui/group_html.cpp
View file

@ -4387,7 +4387,6 @@ namespace NLGUI
ctrlButton->setToolTipParent(TTMouse); ctrlButton->setToolTipParent(TTMouse);
ctrlButton->setToolTipParentPosRef(Hotspot_TTAuto); ctrlButton->setToolTipParentPosRef(Hotspot_TTAuto);
ctrlButton->setToolTipPosRef(Hotspot_TTAuto); ctrlButton->setToolTipPosRef(Hotspot_TTAuto);
ctrlButton->setActionOnLeftClickParams(tooltip);
} }
getParagraph()->addChild (ctrlButton); getParagraph()->addChild (ctrlButton);

10
code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
View file

@ -1740,7 +1740,7 @@
</proc> </proc>
<group type="modal" id="appear_infos1" x="0" y="0" w="824" h="768" posref="TR TR" render_layer="1" <group type="modal" id="appear_infos1" x="74" y="0" w="824" h="768" posref="MM MM" render_layer="1"
mouse_pos="false" escapable="false" exit_click_out="true" savable="false" mouse_pos="false" escapable="false" exit_click_out="true" savable="false"
display="false" display="false"
> >
@ -1765,7 +1765,7 @@
onclick_l="proc" params_l="proc_charsel_infos"/> onclick_l="proc" params_l="proc_charsel_infos"/>
</group> </group>
<group type="modal" id="appear_infos2" x="-74" y="-68" w="698" h="652" posref="TR TR" render_layer="1" <group type="modal" id="appear_infos2" x="-74" y="-68" w="698" h="652" posref="MM MM" render_layer="1"
mouse_pos="false" escapable="false" exit_click_out="true" mouse_pos="false" escapable="false" exit_click_out="true"
display="false" display="false"
> >
@ -1778,7 +1778,7 @@
onclick_l="proc" params_l="proc_charsel_infos"/> onclick_l="proc" params_l="proc_charsel_infos"/>
</group> </group>
<group type="modal" id="appear_infos3" x="-74" y="-68" w="698" h="652" posref="TR TR" render_layer="1" <group type="modal" id="appear_infos3" x="-74" y="-68" w="698" h="652" posref="MM MM" render_layer="1"
mouse_pos="false" escapable="false" exit_click_out="true" mouse_pos="false" escapable="false" exit_click_out="true"
display="false" display="false"
> >
@ -1791,7 +1791,7 @@
onclick_l="proc" params_l="proc_charsel_infos"/> onclick_l="proc" params_l="proc_charsel_infos"/>
</group> </group>
<group type="modal" id="appear_infos4" x="-74" y="-68" w="698" h="652" posref="TR TR" render_layer="1" <group type="modal" id="appear_infos4" x="-74" y="-68" w="698" h="652" posref="MM MM" render_layer="1"
mouse_pos="false" escapable="false" exit_click_out="true" mouse_pos="false" escapable="false" exit_click_out="true"
display="false" display="false"
> >
@ -1804,7 +1804,7 @@
onclick_l="proc" params_l="proc_charsel_infos"/> onclick_l="proc" params_l="proc_charsel_infos"/>
</group> </group>
<group type="modal" id="appear_infos5" x="-74" y="-68" w="698" h="652" posref="TR TR" render_layer="1" <group type="modal" id="appear_infos5" x="-74" y="-68" w="698" h="652" posref="MM MM" render_layer="1"
mouse_pos="false" escapable="false" exit_click_out="true" mouse_pos="false" escapable="false" exit_click_out="true"
display="false" display="false"
> >