merging to lirria

This commit is contained in:
Yann 2016-03-10 22:04:45 +01:00
commit a7970110b6
5 changed files with 12612 additions and 12591 deletions

View file

@ -3173,6 +3173,14 @@
<ATOM Name="Animation" Value="FBT"/>
</STRUCT>
<STRUCT>
<ATOM Name="Phrase With Target To The Crowd" Value="EMOTE_DRINK_TARGET"/>
<ATOM Name="Phrase With Target To The Actor" Value="EMOTE_DRINK_TARGET"/>
<ATOM Name="Phrase With Target To The Target" Value="EMOTE_DRINK_TARGET"/>
<ATOM Name="Phrase Without Target To The Crowd" Value="EMOTE_DRINK_NOBODY"/>
<ATOM Name="Phrase Without Target To The Actor" Value="EMOTE_DRINK_NOBODY"/>
<ATOM Name="Phrase Self Target To The Actor" Value="EMOTE_DRINK_SELF"/>
<ATOM Name="Phrase Self Target To The Crowd" Value="EMOTE_DRINK_SELF"/>
<ATOM Name="Access Path" Value="uiEM_Emotes|uiEM_NegGes|uiEM_Drink"/>
<ATOM Name="EmoteId" Value="drink"/>
<ATOM Name="Animation" Value="drink"/>
</STRUCT>

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -701,6 +701,7 @@ uiEM_Worried [WORRIED]
uiEM_Wounded [WOUNDED]
uiEM_Yawn [YAWN]
uiEM_Youandme [YOU AND ME]
uiEM_Drink [BOIRE]
uimInfos [Info]
uiCombatTitle [COMBAT]
uiDesertRawMats [Desert Exotic Raw Materials]