Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-11 01:23:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Couple more changes

Browse source
This commit is contained in:
Zach Fox 2019-08-23 14:40:39 -07:00
parent dfcf70b9b5
commit 98626b564c
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/modules/emojiList.js
View file

@ -2987,8 +2987,7 @@ var emojiList = [
"shortName": "unamused face", "shortName": "unamused face",
"keywords": [ "keywords": [
"face", "face",
"unamused", "unamused"
"unhappy"
], ],
"mainCategory": "Smileys & Emotion", "mainCategory": "Smileys & Emotion",
"subCategory": "face-neutral-skeptical", "subCategory": "face-neutral-skeptical",

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

@ -314,7 +314,7 @@ function playPopAnimation() {
} else { } else {
// Start with the pop sound on the out // Start with the pop sound on the out
currentPopScale = finalInPopScale ? finalInPopScale : MAX_POP_SCALE; currentPopScale = finalInPopScale ? finalInPopScale : MAX_POP_SCALE;
playSound(emojiDestroySound); playSound(emojiDestroySound, DEFAULT_VOLUME, MyAvatar.position, true);
} }
} }