From 98626b564c002cc9f9300cc907994dc61709f0da Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Fri, 23 Aug 2019 14:40:39 -0700 Subject: [PATCH] Couple more changes --- .../simplifiedEmote/emojiApp/resources/modules/emojiList.js | 3 +-- .../simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/modules/emojiList.js b/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/modules/emojiList.js index 163082ca5d..576920b519 100644 --- a/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/modules/emojiList.js +++ b/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/modules/emojiList.js @@ -2987,8 +2987,7 @@ var emojiList = [ "shortName": "unamused face", "keywords": [ "face", - "unamused", - "unhappy" + "unamused" ], "mainCategory": "Smileys & Emotion", "subCategory": "face-neutral-skeptical", diff --git a/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js b/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js index 5b17f311a3..d3ec9da32d 100644 --- a/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js +++ b/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js @@ -314,7 +314,7 @@ function playPopAnimation() { } else { // Start with the pop sound on the out currentPopScale = finalInPopScale ? finalInPopScale : MAX_POP_SCALE; - playSound(emojiDestroySound); + playSound(emojiDestroySound, DEFAULT_VOLUME, MyAvatar.position, true); } }