Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 19:29:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16177 from MiladNazeri/DEV-565/Reconsider-the-emoji-pop-sound-on-the-out-animation

Browse source 
DEV-565/Reconsider-the-emoji-pop-sound-on-the-out-animation
This commit is contained in:
Zach Fox 2019-09-11 15:35:04 -07:00 committed by GitHub
commit 3cfb4db36e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/sounds/emojiPopSound2.wav
View file

Binary file not shown.

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

@ -48,7 +48,6 @@ var UTF_CODE = 0;
// Only plays a sound if it is downloaded. // Only plays a sound if it is downloaded.
// Only plays one sound at a time. // Only plays one sound at a time.
var emojiCreateSound = SoundCache.getSound(Script.resolvePath('resources/sounds/emojiPopSound1.wav')); var emojiCreateSound = SoundCache.getSound(Script.resolvePath('resources/sounds/emojiPopSound1.wav'));
var emojiDestroySound = SoundCache.getSound(Script.resolvePath('resources/sounds/emojiPopSound2.wav'));
var injector; var injector;
var DEFAULT_VOLUME = 0.01; var DEFAULT_VOLUME = 0.01;
var local = false; var local = false;
@ -326,9 +325,7 @@ function playPopAnimation() {
if (popType === "in") { if (popType === "in") {
currentPopScale = MIN_POP_SCALE; currentPopScale = MIN_POP_SCALE;
} else { } else {
// Start with the pop sound on the out
currentPopScale = finalInPopScale ? finalInPopScale : MAX_POP_SCALE; currentPopScale = finalInPopScale ? finalInPopScale : MAX_POP_SCALE;
playSound(emojiDestroySound, DEFAULT_VOLUME, MyAvatar.position, true);
} }
} }