Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:44:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd

Browse source
This commit is contained in:
Zach Fox 2019-08-20 14:17:30 -07:00
commit 58d83b6455
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
View file

@ -238,12 +238,10 @@ function createEmoji(emojiFilename) {
// #region animation
// see what we need to do when an emoji gets clicked
/*
MILAD NOTE:
see what we need to do when an emoji gets clicked
First clear any current pop animations
Then we check what kind of pop animation might be requested, either an in or an out.
Then check what kind of pop animation might be requested, either an in or an out.
*/
function maybePlayPop(type) {
maybeClearPop();

3
scripts/simplifiedUI/ui/simplifiedUI.js
View file

@ -127,8 +127,7 @@ function onMessageFromSettingsApp(message) {
switch (message.method) {
/*
MILAD NOTE:
These two call an update methon on the module apis because I can't get a signal from Settings.QML to the emoji.js without it being a module like
This calls an update methon on the module apis because I can't get a signal from Settings.QML to the emoji.js without it being a module like
nametag.
*/
case "handleAvatarNametagMode":