From 25fe8583c8c5ef6a6d26a9b0f27590537be9cf70 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Mon, 1 Feb 2016 16:48:15 -0800 Subject: [PATCH 1/3] decrease all volume --- .../DomainContent/CellScience/Scripts/playBackgroundAudio.js | 2 +- .../DomainContent/CellScience/Scripts/showButtonToPlaySound.js | 2 +- .../DomainContent/CellScience/Scripts/showIdentification.js | 2 +- unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js b/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js index 0cb348c3f4..4bde42fb38 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js @@ -20,7 +20,7 @@ stereo: true, loop: true, localOnly: true, - volume: 0.5 + volume: 0.2 }; this.sound = SoundCache.getSound(self.soundURL); diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js b/unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js index e505a532e3..7e51dcd9d1 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js @@ -24,7 +24,7 @@ stereo: true, loop: false, localOnly: true, - volume: 0.5 + volume: 0.2 }; this.sound = SoundCache.getSound(this.soundURL); } diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js b/unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js index c0b0cb54d4..bfc6c70292 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js @@ -22,7 +22,7 @@ stereo: true, loop: false, localOnly: true, - volume: 0.5, + volume: 0.2, position: this.position }; this.sound = SoundCache.getSound(this.soundURL); diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js b/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js index d69f33e7c9..c644cbe4f9 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js @@ -25,7 +25,7 @@ loop: false, localOnly: false, position: this.position, - volume: 0.5 + volume: 0.2 }; this.teleportSound = SoundCache.getSound("https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/Audio/whoosh.wav"); //print('Script.clearTimeout PRELOADING A ZOOM ENTITY') From 822a64a08b7366923e01705369274f139c4b91f0 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Mon, 1 Feb 2016 17:16:27 -0800 Subject: [PATCH 2/3] decrease volume --- .../DomainContent/CellScience/Scripts/playBackgroundAudio.js | 2 +- .../DomainContent/CellScience/importCellScience.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js b/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js index 4bde42fb38..e709f6e06e 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js @@ -8,7 +8,7 @@ (function() { var self = this; var baseURL = "https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/"; - var version = 8; + var version = 9; this.preload = function(entityId) { self.soundPlaying = false; self.entityId = entityId; diff --git a/unpublishedScripts/DomainContent/CellScience/importCellScience.js b/unpublishedScripts/DomainContent/CellScience/importCellScience.js index b456c4a1ce..58888584a9 100644 --- a/unpublishedScripts/DomainContent/CellScience/importCellScience.js +++ b/unpublishedScripts/DomainContent/CellScience/importCellScience.js @@ -5,7 +5,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -var version = 1003; +var version = 1004; var cellLayout; var baseLocation = "https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/"; From 51b335c9020d20686c25d8658068367e39f39edb Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Wed, 3 Feb 2016 09:53:14 -0800 Subject: [PATCH 3/3] reduce cellscience volume --- .../DomainContent/CellScience/Scripts/playBackgroundAudio.js | 4 +--- .../CellScience/Scripts/showButtonToPlaySound.js | 2 +- .../DomainContent/CellScience/Scripts/showIdentification.js | 2 +- unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js | 3 ++- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js b/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js index e709f6e06e..856b9f8f67 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js @@ -20,7 +20,7 @@ stereo: true, loop: true, localOnly: true, - volume: 0.2 + volume: 0.035 }; this.sound = SoundCache.getSound(self.soundURL); @@ -36,7 +36,6 @@ } } - this.enterEntity = function(entityID) { print("entering audio zone"); if (self.sound.downloaded) { @@ -49,7 +48,6 @@ } - this.leaveEntity = function(entityID) { print("leaving audio area " + self.userData.name); if (self.soundPlaying !== false) { diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js b/unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js index 7e51dcd9d1..65fddd7ad3 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js @@ -24,7 +24,7 @@ stereo: true, loop: false, localOnly: true, - volume: 0.2 + volume: 0.035 }; this.sound = SoundCache.getSound(this.soundURL); } diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js b/unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js index bfc6c70292..2e37f3a51f 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js @@ -22,7 +22,7 @@ stereo: true, loop: false, localOnly: true, - volume: 0.2, + volume: 0.035, position: this.position }; this.sound = SoundCache.getSound(this.soundURL); diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js b/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js index c644cbe4f9..101ce54a5e 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js @@ -25,8 +25,9 @@ loop: false, localOnly: false, position: this.position, - volume: 0.2 + volume: 0.035 }; + this.teleportSound = SoundCache.getSound("https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/Audio/whoosh.wav"); //print('Script.clearTimeout PRELOADING A ZOOM ENTITY') print(" portal destination is " + portalDestination);