mirror of
https://port.numenaute.org/aleajactaest/khanat-code-old.git
synced 2024-11-10 09:19:01 +00:00
Merge with develop
This commit is contained in:
commit
6ee3c2d8c1
5 changed files with 5 additions and 7 deletions
|
@ -20,7 +20,7 @@
|
||||||
shadow_color_grayed="0 0 0 255"
|
shadow_color_grayed="0 0 0 255"
|
||||||
highlight_over="255 255 255 128"
|
highlight_over="255 255 255 128"
|
||||||
formatted="true"
|
formatted="true"
|
||||||
case_mode="%case_first_word_letter_up"
|
case_mode="%case_normal"
|
||||||
>
|
>
|
||||||
|
|
||||||
<!-- Put First NPC interaction, sorted by usage frequency-->
|
<!-- Put First NPC interaction, sorted by usage frequency-->
|
||||||
|
|
|
@ -87,7 +87,7 @@
|
||||||
y="0"
|
y="0"
|
||||||
fontsize="12"
|
fontsize="12"
|
||||||
shadow="true"
|
shadow="true"
|
||||||
case_mode="%case_first_word_letter_up" />
|
case_mode="%case_normal" />
|
||||||
<view type="text"
|
<view type="text"
|
||||||
id="grade"
|
id="grade"
|
||||||
x="158"
|
x="158"
|
||||||
|
|
|
@ -521,7 +521,6 @@
|
||||||
|
|
||||||
<view type="text"
|
<view type="text"
|
||||||
id="text"
|
id="text"
|
||||||
case_mode="%case_first_word_letter_up"
|
|
||||||
posref="TL TL"
|
posref="TL TL"
|
||||||
x="8"
|
x="8"
|
||||||
y="-8"
|
y="-8"
|
||||||
|
@ -859,7 +858,7 @@
|
||||||
<group type="menu"
|
<group type="menu"
|
||||||
id="user_chat_emote_menu"
|
id="user_chat_emote_menu"
|
||||||
extends="base_menu"
|
extends="base_menu"
|
||||||
case_mode="%case_first_word_letter_up"
|
case_mode="%case_normal"
|
||||||
on_active="lua:game:updateEmoteMenu()">
|
on_active="lua:game:updateEmoteMenu()">
|
||||||
<action id="uiEM_Wave"
|
<action id="uiEM_Wave"
|
||||||
name="uiQuickEmote" />
|
name="uiQuickEmote" />
|
||||||
|
@ -1263,7 +1262,7 @@
|
||||||
tooltip_parent="win"
|
tooltip_parent="win"
|
||||||
onclick_l="select_chat_target"
|
onclick_l="select_chat_target"
|
||||||
params_l="menu=ui:interface:user_chat_target_menu|party_chats=false"
|
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"
|
<ctrl style="text_button_16"
|
||||||
id="but_emote"
|
id="but_emote"
|
||||||
posref="BR TR"
|
posref="BR TR"
|
||||||
|
|
|
@ -1702,7 +1702,7 @@
|
||||||
color_grayed="255 255 255 64"
|
color_grayed="255 255 255 64"
|
||||||
shadow_color_grayed="0 0 0 255"
|
shadow_color_grayed="0 0 0 255"
|
||||||
highlight_over="255 255 255 150"
|
highlight_over="255 255 255 150"
|
||||||
case_mode="%case_first_word_letter_up"></group>
|
case_mode="%case_normal"></group>
|
||||||
<group type="menu"
|
<group type="menu"
|
||||||
id="base_menu_with_color"
|
id="base_menu_with_color"
|
||||||
extends="base_menu">
|
extends="base_menu">
|
||||||
|
|
|
@ -3005,7 +3005,6 @@ void CInterfaceManager::initEmotes()
|
||||||
nbToken++;
|
nbToken++;
|
||||||
|
|
||||||
CGroupMenu *pRootMenu = dynamic_cast<CGroupMenu*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:user_chat_emote_menu"));
|
CGroupMenu *pRootMenu = dynamic_cast<CGroupMenu*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:user_chat_emote_menu"));
|
||||||
pRootMenu->setProperty("case_mode", "0");
|
|
||||||
nlassert(pRootMenu);
|
nlassert(pRootMenu);
|
||||||
|
|
||||||
CGroupSubMenu *pMenu = pRootMenu->getRootMenu();
|
CGroupSubMenu *pMenu = pRootMenu->getRootMenu();
|
||||||
|
|
Loading…
Reference in a new issue