diff --git a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/01.wav b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/01.wav index b4baa2888a..d1d587c6c9 100644 Binary files a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/01.wav and b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/01.wav differ diff --git a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/02.wav b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/02.wav index 21cbf3fa4a..b649b32949 100644 Binary files a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/02.wav and b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/02.wav differ diff --git a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/03.wav b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/03.wav index bc5d35760d..86b9ca6934 100644 Binary files a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/03.wav and b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/03.wav differ diff --git a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/04.wav b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/04.wav index cacaf44b6e..771a2aea94 100644 Binary files a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/04.wav and b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/04.wav differ diff --git a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/05.wav b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/05.wav index ffb688b5b2..9e3af9e7a0 100644 Binary files a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/05.wav and b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/05.wav differ diff --git a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/06.wav b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/06.wav index 81716f26be..4be2c1bd3c 100644 Binary files a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/06.wav and b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/06.wav differ diff --git a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/07.wav b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/07.wav index 4c20ceba2c..cc10e2277e 100644 Binary files a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/07.wav and b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/07.wav differ diff --git a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/08.wav b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/08.wav index c39e4b1dfc..33dae0ece1 100644 Binary files a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/08.wav and b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/08.wav differ diff --git a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/09.wav b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/09.wav index 791433c024..15e1876839 100644 Binary files a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/09.wav and b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/09.wav differ diff --git a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/10.wav b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/10.wav index b359475b51..c22e1035f7 100644 Binary files a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/10.wav and b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/10.wav differ diff --git a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/11.wav b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/11.wav index 40b8415725..5a975c23eb 100644 Binary files a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/11.wav and b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/11.wav differ diff --git a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/12.wav b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/12.wav index 68656f7c21..eff5edbf81 100644 Binary files a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/12.wav and b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/12.wav differ diff --git a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/13.wav b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/13.wav index e6a716ccdd..091090ff68 100644 Binary files a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/13.wav and b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/13.wav differ diff --git a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/14.wav b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/14.wav index a5e8b5ad49..8b1f842c75 100644 Binary files a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/14.wav and b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/14.wav differ diff --git a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/15.wav b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/15.wav index 7f3072e3e0..45e4410e2d 100644 Binary files a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/15.wav and b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/15.wav differ diff --git a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/16.wav b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/16.wav index f76bee0429..2e5bf8a6ba 100644 Binary files a/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/16.wav and b/scripts/simplifiedUI/simplifiedEmote/resources/sounds/claps/16.wav differ diff --git a/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js b/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js index 7a9b94b700..dde22fc662 100644 --- a/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js +++ b/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js @@ -100,8 +100,8 @@ function calculateInjectorVolume(clapIntensity) { var soundInjector = false; var MINIMUM_PITCH = 0.85; var MAXIMUM_PITCH = 1.15; -function playSound(sound, position) { - if (soundInjector && soundInjector.isPlaying()) { +function playSound(sound, position, stopPrevious) { + if (soundInjector && soundInjector.isPlaying() && !stopPrevious) { return; } @@ -134,7 +134,7 @@ function startClappingSounds() { maybeClearClapSoundInterval(); clapSoundInterval = Script.setInterval(function() { - playSound(clapSounds[Math.floor(Math.random() * clapSounds.length)]); + playSound(clapSounds[Math.floor(Math.random() * clapSounds.length)], MyAvatar.position, true); }, CLAP_SOUND_INTERVAL_MS); }