master #3

Open
cacahuetes wants to merge 929 commits from liza/Questionable:master into cacahuetes-ShB-Healer
3 changed files with 4 additions and 1 deletions
Showing only changes of commit 755c7b6549 - Show all commits

View File

@ -779,7 +779,8 @@
"uchiwasshoi", "uchiwasshoi",
"clap", "clap",
"victorypose", "victorypose",
"comfort" "comfort",
"battlestance"
] ]
} }
} }

View File

@ -33,5 +33,6 @@ public sealed class EmoteConverter() : EnumConverter<EEmote>(Values)
{ EEmote.Clap, "clap" }, { EEmote.Clap, "clap" },
{ EEmote.VictoryPose, "victorypose" }, { EEmote.VictoryPose, "victorypose" },
{ EEmote.Comfort, "comfort" }, { EEmote.Comfort, "comfort" },
{ EEmote.BattleStance, "battlestance" },
}; };
} }

View File

@ -34,4 +34,5 @@ public enum EEmote
Clap = 7, Clap = 7,
VictoryPose = 122, VictoryPose = 122,
Comfort = 9, Comfort = 9,
BattleStance = 121,
} }