From dc554bb8c684c8b7a3907fd5053f3a13fc7b2769 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Wed, 7 Oct 2020 19:37:10 -0400 Subject: [PATCH 1/4] Update some descriptions. --- domain-server/src/DomainServer.cpp | 2 +- interface/src/main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index c3f827234a..187cd340ba 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -340,7 +340,7 @@ DomainServer::DomainServer(int argc, char* argv[]) : void DomainServer::parseCommandLine(int argc, char* argv[]) { QCommandLineParser parser; - parser.setApplicationDescription("High Fidelity Domain Server"); + parser.setApplicationDescription("Vircadia Domain Server"); const QCommandLineOption versionOption = parser.addVersionOption(); const QCommandLineOption helpOption = parser.addHelpOption(); diff --git a/interface/src/main.cpp b/interface/src/main.cpp index bdbafbaeb8..c14d22bdbb 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -81,7 +81,7 @@ int main(int argc, const char* argv[]) { QCommandLineOption noUpdaterOption("no-updater", "Do not show auto-updater"); QCommandLineOption checkMinSpecOption("checkMinSpec", "Check if machine meets minimum specifications"); QCommandLineOption runServerOption("runServer", "Whether to run the server"); - QCommandLineOption serverContentPathOption("serverContentPath", "Where to find server content", "serverContentPath"); + QCommandLineOption serverContentPathOption("serverContentPath", "Where to find server content ", "serverContentPath"); QCommandLineOption allowMultipleInstancesOption("allowMultipleInstances", "Allow multiple instances to run"); QCommandLineOption overrideAppLocalDataPathOption("cache", "set test cache ", "dir"); QCommandLineOption overrideScriptsPathOption(SCRIPTS_SWITCH, "set scripts ", "path"); From 46ddde0bd6384cf5eaa3982b64be39b190f69739 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Wed, 7 Oct 2020 19:42:51 -0400 Subject: [PATCH 2/4] hifi-production tutorials -> vircadia-content --- scripts/developer/tests/scriptableResource/lib.js | 2 +- scripts/tutorials/butterflies.js | 4 ++-- scripts/tutorials/createCow.js | 6 +++--- scripts/tutorials/createDice.js | 12 ++++++------ scripts/tutorials/createFlashlight.js | 4 ++-- scripts/tutorials/createGolfClub.js | 6 +++--- scripts/tutorials/createPictureFrame.js | 4 ++-- scripts/tutorials/createPingPongGun.js | 6 +++--- scripts/tutorials/createPistol.js | 6 +++--- scripts/tutorials/createSoundMaker.js | 4 ++-- scripts/tutorials/entity_scripts/cow.js | 2 +- scripts/tutorials/entity_scripts/golfClub.js | 2 +- scripts/tutorials/entity_scripts/pingPongGun.js | 2 +- scripts/tutorials/entity_scripts/pistol.js | 10 +++++----- scripts/tutorials/entity_scripts/soundMaker.js | 2 +- scripts/tutorials/giveAvatarMagicFingers.js | 2 +- scripts/tutorials/makeAvatarClap.js | 2 +- 17 files changed, 38 insertions(+), 38 deletions(-) diff --git a/scripts/developer/tests/scriptableResource/lib.js b/scripts/developer/tests/scriptableResource/lib.js index a8773bbabb..b874ce4e07 100644 --- a/scripts/developer/tests/scriptableResource/lib.js +++ b/scripts/developer/tests/scriptableResource/lib.js @@ -16,7 +16,7 @@ var FRAME_RATE = 30; // 30 default function getFrame(callback) { // A model exported from blender with a texture named 'Picture' on one face. - var FRAME_URL = "http://hifi-production.s3.amazonaws.com/tutorials/pictureFrame/finalFrame.fbx"; + var FRAME_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pictureFrame/finalFrame.fbx"; var model = ModelCache.prefetch(FRAME_URL); if (model.state === Resource.State.FINISHED) { diff --git a/scripts/tutorials/butterflies.js b/scripts/tutorials/butterflies.js index 9d8d1de52c..5876b04240 100644 --- a/scripts/tutorials/butterflies.js +++ b/scripts/tutorials/butterflies.js @@ -86,13 +86,13 @@ function addButterfly() { dimensions: dimensions, color: color, animation: { - url: "http://hifi-production.s3.amazonaws.com/tutorials/butterflies/butterfly.fbx", + url: "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/butterflies/butterfly.fbx", fps: newFrameRate, loop: true, running: true, startAutomatically:false }, - modelURL: "http://hifi-production.s3.amazonaws.com/tutorials/butterflies/butterfly.fbx" + modelURL: "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/butterflies/butterfly.fbx" }; butterflies.push(Entities.addEntity(properties)); } diff --git a/scripts/tutorials/createCow.js b/scripts/tutorials/createCow.js index 0f034ecefa..c23e2eab1f 100644 --- a/scripts/tutorials/createCow.js +++ b/scripts/tutorials/createCow.js @@ -9,9 +9,9 @@ // // references to our assets. entity scripts need to be served from somewhere that is publically accessible -- so http(s) or atp -var SCRIPT_URL ="http://hifi-production.s3.amazonaws.com/tutorials/entity_scripts/cow.js"; -var MODEL_URL = "http://hifi-production.s3.amazonaws.com/tutorials/cow/cow.fbx"; -var ANIMATION_URL = 'http://hifi-production.s3.amazonaws.com/tutorials/cow/cow.fbx'; +var SCRIPT_URL ="https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/entity_scripts/cow.js"; +var MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/cow/cow.fbx"; +var ANIMATION_URL = 'https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/cow/cow.fbx'; // this part of the code describes how to center the entity in front of your avatar when it is created. var orientation = MyAvatar.orientation; diff --git a/scripts/tutorials/createDice.js b/scripts/tutorials/createDice.js index 46ad0172aa..7b88686c91 100644 --- a/scripts/tutorials/createDice.js +++ b/scripts/tutorials/createDice.js @@ -23,7 +23,7 @@ var DIE_SIZE = 0.20; var madeSound = true; // Set false at start of throw to look for collision -SoundCache.getSound("http://hifi-production.s3.amazonaws.com/tutorials/dice/diceCollide.wav"); +SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/dice/diceCollide.wav"); var INSUFFICIENT_PERMISSIONS_ERROR_MSG = "You do not have the necessary permissions to create new objects." @@ -45,7 +45,7 @@ var toolBar = new ToolBar(0, 0, ToolBar.HORIZONTAL, "highfidelity.toolbars-dice" var offButton = toolBar.addOverlay("image", { width: BUTTON_SIZE, height: BUTTON_SIZE, - imageURL: "http://hifi-production.s3.amazonaws.com/tutorials/dice/close.png", + imageURL: "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/dice/close.png", alpha: 1 }); @@ -54,11 +54,11 @@ var deleteButton = toolBar.addOverlay("image", { y: screenSize.y - (BUTTON_SIZE + PADDING)+BOTTOM_PADDING, width: BUTTON_SIZE, height: BUTTON_SIZE, - imageURL: "http://hifi-production.s3.amazonaws.com/tutorials/dice/delete.png", + imageURL: "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/dice/delete.png", alpha: 1 }); -var diceIconURL = "http://hifi-production.s3.amazonaws.com/tutorials/dice/dice.png" +var diceIconURL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/dice/dice.png" var diceButton = toolBar.addOverlay("image", { x: screenSize.x / 2 + PADDING, y: screenSize.y - (BUTTON_SIZE + PADDING)+BOTTOM_PADDING, @@ -82,7 +82,7 @@ function shootDice(position, velocity) { for (var i = 0; i < NUMBER_OF_DICE; i++) { dice.push(Entities.addEntity({ type: "Model", - modelURL: "http://hifi-production.s3.amazonaws.com/tutorials/dice/goldDie.fbx", + modelURL: "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/dice/goldDie.fbx", position: position, velocity: velocity, rotation: Quat.fromPitchYawRollDegrees(Math.random() * 360, Math.random() * 360, Math.random() * 360), @@ -99,7 +99,7 @@ function shootDice(position, velocity) { lifetime: LIFETIME, shapeType: "box", dynamic: true, - collisionSoundURL: "http://hifi-production.s3.amazonaws.com/tutorials/dice/diceCollide.wav" + collisionSoundURL: "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/dice/diceCollide.wav" })); position = Vec3.sum(position, Vec3.multiply(DIE_SIZE, Vec3.normalize(Quat.getRight(Camera.getOrientation())))); } diff --git a/scripts/tutorials/createFlashlight.js b/scripts/tutorials/createFlashlight.js index 329be56af7..5bbbc52f24 100644 --- a/scripts/tutorials/createFlashlight.js +++ b/scripts/tutorials/createFlashlight.js @@ -9,8 +9,8 @@ // -var SCRIPT_URL = "http://hifi-production.s3.amazonaws.com/tutorials/entity_scripts/flashlight.js"; -var MODEL_URL = "http://hifi-production.s3.amazonaws.com/tutorials/flashlight/flashlight2.fbx"; +var SCRIPT_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/entity_scripts/flashlight.js"; +var MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/flashlight/flashlight2.fbx"; var center = Vec3.sum(Vec3.sum(MyAvatar.position, { x: 0, diff --git a/scripts/tutorials/createGolfClub.js b/scripts/tutorials/createGolfClub.js index 4135b6680d..fb2466e0f4 100644 --- a/scripts/tutorials/createGolfClub.js +++ b/scripts/tutorials/createGolfClub.js @@ -17,8 +17,8 @@ orientation.x = 0; orientation = Quat.fromVec3Degrees(orientation); var center = Vec3.sum(MyAvatar.getHeadPosition(), Vec3.multiply(2, Quat.getForward(orientation))); -var CLUB_MODEL = "http://hifi-production.s3.amazonaws.com/tutorials/golfClub/putter_VR.fbx"; -var CLUB_COLLISION_HULL = "http://hifi-production.s3.amazonaws.com/tutorials/golfClub/club_collision_hull.obj"; +var CLUB_MODEL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/golfClub/putter_VR.fbx"; +var CLUB_COLLISION_HULL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/golfClub/club_collision_hull.obj"; var CLUB_DIMENSIONS = { "x": 0.043093059211969376, @@ -34,7 +34,7 @@ var CLUB_ROTATION = { }; -var SCRIPT_URL = "http://hifi-production.s3.amazonaws.com/tutorials/entity_scripts/golfClub.js"; +var SCRIPT_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/entity_scripts/golfClub.js"; var golfClubProperties = { position: center, lifetime: 3600, diff --git a/scripts/tutorials/createPictureFrame.js b/scripts/tutorials/createPictureFrame.js index 873b604bfa..ea1e5ae7de 100644 --- a/scripts/tutorials/createPictureFrame.js +++ b/scripts/tutorials/createPictureFrame.js @@ -17,7 +17,7 @@ var center = Vec3.sum(Vec3.sum(MyAvatar.position, { }), Vec3.multiply(1, Quat.getForward(Camera.getOrientation()))); // this is just a model exported from blender with a texture named 'Picture' on one face. also made it emissive so it doesn't require lighting. -var MODEL_URL = "http://hifi-production.s3.amazonaws.com/tutorials/pictureFrame/finalFrame.fbx"; +var MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pictureFrame/finalFrame.fbx"; //this is where we are going to get our image from. the stuff at the end is our API key. var NASA_API_ENDPOINT = "https://api.nasa.gov/planetary/apod?api_key=XNmgPJvVK8hGroZHB19PaQtlqKZk4q8GorWViuND"; @@ -59,7 +59,7 @@ function makePictureFrame() { } var pictureFrame = Entities.addEntity(pictureFrameProperties); - var OUTER_FRAME_MODEL_URL = "http://hifi-production.s3.amazonaws.com/tutorials/pictureFrame/outer_frame.fbx"; + var OUTER_FRAME_MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pictureFrame/outer_frame.fbx"; var outerFrameProps = { name: "Tutorial Outer Frame", type: "Model", diff --git a/scripts/tutorials/createPingPongGun.js b/scripts/tutorials/createPingPongGun.js index 927738f29e..b5e397d5ed 100644 --- a/scripts/tutorials/createPingPongGun.js +++ b/scripts/tutorials/createPingPongGun.js @@ -7,9 +7,9 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -var SCRIPT_URL = "http://hifi-production.s3.amazonaws.com/tutorials/entity_scripts/pingPongGun.js"; -var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/tutorials/pingPongGun/Pingpong-Gun-New.fbx'; -var COLLISION_HULL_URL = 'http://hifi-production.s3.amazonaws.com/tutorials/pingPongGun/Pingpong-Gun-New.obj'; +var SCRIPT_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/entity_scripts/pingPongGun.js"; +var MODEL_URL = 'https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pingPongGun/Pingpong-Gun-New.fbx'; +var COLLISION_HULL_URL = 'https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pingPongGun/Pingpong-Gun-New.obj'; var center = Vec3.sum(Vec3.sum(MyAvatar.position, { x: 0, y: 0.5, diff --git a/scripts/tutorials/createPistol.js b/scripts/tutorials/createPistol.js index 0912645c35..d54621a633 100644 --- a/scripts/tutorials/createPistol.js +++ b/scripts/tutorials/createPistol.js @@ -7,9 +7,9 @@ // var center = Vec3.sum(MyAvatar.position, Vec3.multiply(1.5, Quat.getForward(Camera.getOrientation()))); -var SCRIPT_URL = "http://hifi-production.s3.amazonaws.com/tutorials/entity_scripts/pistol.js"; -var MODEL_URL = "http://hifi-production.s3.amazonaws.com/tutorials/pistol/gun.fbx"; -var COLLISION_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/tutorials/pistol/drop.wav' +var SCRIPT_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/entity_scripts/pistol.js"; +var MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/gun.fbx"; +var COLLISION_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/drop.wav' var pistolProperties = { type: 'Model', diff --git a/scripts/tutorials/createSoundMaker.js b/scripts/tutorials/createSoundMaker.js index 2d86864982..365dd266fd 100644 --- a/scripts/tutorials/createSoundMaker.js +++ b/scripts/tutorials/createSoundMaker.js @@ -6,8 +6,8 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -var SCRIPT_URL = "http://hifi-production.s3.amazonaws.com/tutorials/entity_scripts/soundMaker.js"; -var MODEL_URL = "http://hifi-production.s3.amazonaws.com/tutorials/soundMaker/Front-Desk-Bell.fbx"; +var SCRIPT_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/entity_scripts/soundMaker.js"; +var MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/soundMaker/Front-Desk-Bell.fbx"; var center = Vec3.sum(Vec3.sum(MyAvatar.position, { x: 0, diff --git a/scripts/tutorials/entity_scripts/cow.js b/scripts/tutorials/entity_scripts/cow.js index 117864beb6..992ad3c9d1 100644 --- a/scripts/tutorials/entity_scripts/cow.js +++ b/scripts/tutorials/entity_scripts/cow.js @@ -19,7 +19,7 @@ //set our id so other methods can get it. _this.entityID = entityID; //load the mooing sound - _this.mooSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/tutorials/cow/moo.wav") + _this.mooSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/cow/moo.wav") _this.mooSoundOptions = { volume: 0.7, loop: false diff --git a/scripts/tutorials/entity_scripts/golfClub.js b/scripts/tutorials/entity_scripts/golfClub.js index 6342838aa4..0d0426c87b 100644 --- a/scripts/tutorials/entity_scripts/golfClub.js +++ b/scripts/tutorials/entity_scripts/golfClub.js @@ -13,7 +13,7 @@ (function() { var ball = null; - var collisionSoundURL = "http://hifi-production.s3.amazonaws.com/tutorials/golfClub/collision1.wav"; + var collisionSoundURL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/golfClub/collision1.wav"; var triggerState = false; var BALL_GRAVITY = -9.8; var BALL_START_VELOCITY = 0.1; diff --git a/scripts/tutorials/entity_scripts/pingPongGun.js b/scripts/tutorials/entity_scripts/pingPongGun.js index 5ba4b15ea7..084e3287ed 100644 --- a/scripts/tutorials/entity_scripts/pingPongGun.js +++ b/scripts/tutorials/entity_scripts/pingPongGun.js @@ -12,7 +12,7 @@ (function() { var _this = this; - var SHOOTING_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/tutorials/pingPongGun/pong_sound.wav'; + var SHOOTING_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pingPongGun/pong_sound.wav'; function PingPongGun() { return; diff --git a/scripts/tutorials/entity_scripts/pistol.js b/scripts/tutorials/entity_scripts/pistol.js index 62517f486d..52985bb116 100644 --- a/scripts/tutorials/entity_scripts/pistol.js +++ b/scripts/tutorials/entity_scripts/pistol.js @@ -30,8 +30,8 @@ this.forceMultiplier = 1; this.laserLength = 100; - this.fireSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/tutorials/pistol/GUN-SHOT2.raw"); - this.ricochetSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/tutorials/pistol/Ricochet.L.wav"); + this.fireSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/GUN-SHOT2.raw"); + this.ricochetSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/Ricochet.L.wav"); this.playRichochetSoundChance = 0.1; this.fireVolume = 0.2; this.bulletForce = 10; @@ -220,7 +220,7 @@ "alphaStart": 0, "alphaFinish": 0, "additiveBlending": true, - "textures": "http://hifi-production.s3.amazonaws.com/tutorials/pistol/star.png" + "textures": "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/star.png" }); Script.setTimeout(function() { @@ -270,7 +270,7 @@ "alphaStart": 0, "alphaFinish": 0, "additiveBlending": 0, - "textures": "http://hifi-production.s3.amazonaws.com/tutorials/pistol/smoke.png" + "textures": "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/smoke.png" }); Script.setTimeout(function() { Entities.editEntity(smoke, { @@ -333,7 +333,7 @@ "alphaStart": 0, "alphaFinish": 0, "additiveBlending": true, - "textures": "http://hifi-production.s3.amazonaws.com/tutorials/pistol/star.png" + "textures": "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/star.png" }); Script.setTimeout(function() { Entities.editEntity(flash, { diff --git a/scripts/tutorials/entity_scripts/soundMaker.js b/scripts/tutorials/entity_scripts/soundMaker.js index 950334aee6..f4fb745b7a 100644 --- a/scripts/tutorials/entity_scripts/soundMaker.js +++ b/scripts/tutorials/entity_scripts/soundMaker.js @@ -8,7 +8,7 @@ (function(){ - var soundURL ='http://hifi-production.s3.amazonaws.com/tutorials/soundMaker/bell.wav'; + var soundURL ='https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/soundMaker/bell.wav'; var ringSound; this.preload = function(entityID) { diff --git a/scripts/tutorials/giveAvatarMagicFingers.js b/scripts/tutorials/giveAvatarMagicFingers.js index 23902bdd94..e6fc8ebb0a 100644 --- a/scripts/tutorials/giveAvatarMagicFingers.js +++ b/scripts/tutorials/giveAvatarMagicFingers.js @@ -76,7 +76,7 @@ var particleProperties = { alphaStart: 1, alphaFinish: 0, emitterShouldTrail: true, - textures: 'http://hifi-production.s3.amazonaws.com/tutorials/particleFingers/smoke.png', + textures: 'https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/particleFingers/smoke.png', lifetime: 3600 }; diff --git a/scripts/tutorials/makeAvatarClap.js b/scripts/tutorials/makeAvatarClap.js index c51e7a8d3a..2a593ed3c2 100644 --- a/scripts/tutorials/makeAvatarClap.js +++ b/scripts/tutorials/makeAvatarClap.js @@ -8,7 +8,7 @@ // // An animation of the avatar clapping its hands while standing -var ANIM_URL = "http://hifi-production.s3.amazonaws.com/tutorials/avatarAnimation/clap.fbx"; +var ANIM_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/avatarAnimation/clap.fbx"; // overrideRoleAnimation only replaces a single animation at a time. the rest of the motion is driven normally // @animationRole - name of animation From 60b31000d75dd824329342001c137d8d80a000b5 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Wed, 7 Oct 2020 19:44:14 -0400 Subject: [PATCH 3/4] hifi-production DomainContent -> vircadia-content --- .../entities/src/EntityItemProperties.cpp | 2 +- .../CellScience/backgroundMusicAC.js | 8 +- .../Toybox/AC_scripts/toybox_sounds.js | 14 ++-- .../Toybox/basketball/createHoop.js | 4 +- .../Toybox/basketball/createRack.js | 8 +- .../basketball/createSingleBasketball.js | 4 +- .../Toybox/basketballsResetter.js | 4 +- .../DomainContent/Toybox/bow/bow.js | 10 +-- .../DomainContent/Toybox/bow/createBow.js | 4 +- .../Toybox/bubblewand/createWand.js | 4 +- .../DomainContent/Toybox/bubblewand/wand.js | 2 +- .../DomainContent/Toybox/cat/cat.js | 2 +- .../DomainContent/Toybox/doll/createDoll.js | 2 +- .../DomainContent/Toybox/doll/doll.js | 4 +- .../Toybox/flappyAvatars/flappyAvatars.js | 24 +++--- .../Toybox/flappyAvatars/flappyAvatars.json | 4 +- .../Toybox/flashlight/createFlashlight.js | 2 +- .../Toybox/flashlight/flashlight.js | 4 +- .../Toybox/flowArts/raveStickEntityScript.js | 2 +- .../DomainContent/Toybox/hiddenEntityReset.js | 74 +++++++++---------- .../Toybox/lights/lightSwitch.js | 2 +- .../DomainContent/Toybox/masterReset.js | 74 +++++++++---------- .../Toybox/musicPlayer/musicPlayer.js | 2 +- .../Toybox/ping_pong_gun/createPingPongGun.js | 6 +- .../Toybox/ping_pong_gun/createTargets.js | 4 +- .../Toybox/ping_pong_gun/pingPongGun.js | 4 +- .../Toybox/ping_pong_gun/wallTarget.js | 2 +- .../Toybox/pistol/createPistol.js | 4 +- .../DomainContent/Toybox/pistol/pistol.js | 6 +- .../Toybox/spray_paint/sprayPaintCan.js | 4 +- .../DomainContent/Toybox/targetsResetter.js | 4 +- 31 files changed, 147 insertions(+), 147 deletions(-) diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index ac4886db8f..ff55137a03 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -1214,7 +1214,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const { * ], * strokeWidths: [ 0.1, 0.1, 0.1 ], * color: { red: 255, green: 0, blue: 0 }, // Use just the red channel from the image. - * textures: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flowArts/trails.png", + * textures: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flowArts/trails.png", * isUVModeStretch: true, * lifetime: 300 // Delete after 5 minutes. * }); diff --git a/unpublishedScripts/DomainContent/CellScience/backgroundMusicAC.js b/unpublishedScripts/DomainContent/CellScience/backgroundMusicAC.js index 829dfbeae9..5922f382b9 100644 --- a/unpublishedScripts/DomainContent/CellScience/backgroundMusicAC.js +++ b/unpublishedScripts/DomainContent/CellScience/backgroundMusicAC.js @@ -1,6 +1,6 @@ var soundMap = [{ name: 'Cells', - url: "http://hifi-production.s3.amazonaws.com/DomainContent/CellScience/Audio/Cells.wav", + url: "https://cdn-1.vircadia.com/us-e-1/DomainContent/CellScience/Audio/Cells.wav", audioOptions: { position: { x: 15850, @@ -12,7 +12,7 @@ var soundMap = [{ } }, { name: 'Cell Layout', - url: "http://hifi-production.s3.amazonaws.com/DomainContent/CellScience/Audio/CellLayout.wav", + url: "https://cdn-1.vircadia.com/us-e-1/DomainContent/CellScience/Audio/CellLayout.wav", audioOptions: { position: { x: 15950, @@ -24,7 +24,7 @@ var soundMap = [{ } }, { name: 'Ribsome', - url: "http://hifi-production.s3.amazonaws.com/DomainContent/CellScience/Audio/Ribosome.wav", + url: "https://cdn-1.vircadia.com/us-e-1/DomainContent/CellScience/Audio/Ribosome.wav", audioOptions: { position: { x: 15650, @@ -36,7 +36,7 @@ var soundMap = [{ } }, { name: 'Hexokinase', - url: "http://hifi-production.s3.amazonaws.com/DomainContent/CellScience/Audio/Hexokinase.wav", + url: "https://cdn-1.vircadia.com/us-e-1/DomainContent/CellScience/Audio/Hexokinase.wav", audioOptions: { position: { x: 15750, diff --git a/unpublishedScripts/DomainContent/Toybox/AC_scripts/toybox_sounds.js b/unpublishedScripts/DomainContent/Toybox/AC_scripts/toybox_sounds.js index e73630e380..84242d69ab 100644 --- a/unpublishedScripts/DomainContent/Toybox/AC_scripts/toybox_sounds.js +++ b/unpublishedScripts/DomainContent/Toybox/AC_scripts/toybox_sounds.js @@ -10,7 +10,7 @@ var soundMap = [{ name: 'river water', - url: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/sounds/Water_Lap_River_Edge_Gentle.L.wav", + url: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/sounds/Water_Lap_River_Edge_Gentle.L.wav", audioOptions: { position: { x: 580, @@ -22,7 +22,7 @@ var soundMap = [{ } }, { name: 'windmill', - url: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/sounds/WINDMILL_Mono.wav", + url: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/sounds/WINDMILL_Mono.wav", audioOptions: { position: { x: 530, @@ -34,7 +34,7 @@ var soundMap = [{ } }, { name: 'insects', - url: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/sounds/insects3.wav", + url: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/sounds/insects3.wav", audioOptions: { position: { x: 560, @@ -46,7 +46,7 @@ var soundMap = [{ } }, { name: 'fireplace', - url: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/sounds/0619_Fireplace__Tree_B.L.wav", + url: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/sounds/0619_Fireplace__Tree_B.L.wav", audioOptions: { position: { x: 551.61, @@ -58,7 +58,7 @@ var soundMap = [{ } }, { name: 'cat purring', - url: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/sounds/Cat_Purring_Deep_Low_Snor.wav", + url: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/sounds/Cat_Purring_Deep_Low_Snor.wav", audioOptions: { position: { x: 551.48, @@ -70,7 +70,7 @@ var soundMap = [{ } }, { name: 'dogs barking', - url: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/sounds/dogs_barking_1.L.wav", + url: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/sounds/dogs_barking_1.L.wav", audioOptions: { position: { x: 523, @@ -83,7 +83,7 @@ var soundMap = [{ playAtInterval: 60 * 1000 }, { name: 'arcade game', - url: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/sounds/ARCADE_GAMES_VID.L.L.wav", + url: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/sounds/ARCADE_GAMES_VID.L.L.wav", audioOptions: { position: { x: 543.77, diff --git a/unpublishedScripts/DomainContent/Toybox/basketball/createHoop.js b/unpublishedScripts/DomainContent/Toybox/basketball/createHoop.js index 8a3f9bb6d7..cb253ddf0b 100644 --- a/unpublishedScripts/DomainContent/Toybox/basketball/createHoop.js +++ b/unpublishedScripts/DomainContent/Toybox/basketball/createHoop.js @@ -8,8 +8,8 @@ // -var hoopURL ="http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball_hoop.fbx"; -var hoopCollisionHullURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball_hoop_collision_hull.obj"; +var hoopURL ="https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball_hoop.fbx"; +var hoopCollisionHullURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball_hoop_collision_hull.obj"; var hoopStartPosition = Vec3.sum(MyAvatar.position, diff --git a/unpublishedScripts/DomainContent/Toybox/basketball/createRack.js b/unpublishedScripts/DomainContent/Toybox/basketball/createRack.js index 8209a88f33..85bd5b43d1 100644 --- a/unpublishedScripts/DomainContent/Toybox/basketball/createRack.js +++ b/unpublishedScripts/DomainContent/Toybox/basketball/createRack.js @@ -11,10 +11,10 @@ Script.include("../libraries/utils.js"); -var basketballURL ="http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball2.fbx"; -var collisionSoundURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball.wav"; -var rackURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball_rack.fbx"; -var rackCollisionHullURL ="http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/rack_collision_hull.obj"; +var basketballURL ="https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball2.fbx"; +var collisionSoundURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball.wav"; +var rackURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball_rack.fbx"; +var rackCollisionHullURL ="https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/rack_collision_hull.obj"; var NUMBER_OF_BALLS = 4; var DIAMETER = 0.30; var RESET_DISTANCE = 1; diff --git a/unpublishedScripts/DomainContent/Toybox/basketball/createSingleBasketball.js b/unpublishedScripts/DomainContent/Toybox/basketball/createSingleBasketball.js index d70b9a1bd8..1300a26e68 100644 --- a/unpublishedScripts/DomainContent/Toybox/basketball/createSingleBasketball.js +++ b/unpublishedScripts/DomainContent/Toybox/basketball/createSingleBasketball.js @@ -10,8 +10,8 @@ // -var basketballURL ="http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball2.fbx"; -var collisionSoundURL ="http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball.wav"; +var basketballURL ="https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball2.fbx"; +var collisionSoundURL ="https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball.wav"; var basketball = null; diff --git a/unpublishedScripts/DomainContent/Toybox/basketballsResetter.js b/unpublishedScripts/DomainContent/Toybox/basketballsResetter.js index 580453bf24..5dadee868b 100644 --- a/unpublishedScripts/DomainContent/Toybox/basketballsResetter.js +++ b/unpublishedScripts/DomainContent/Toybox/basketballsResetter.js @@ -41,8 +41,8 @@ createBasketballs: function() { var NUMBER_OF_BALLS = 4; var DIAMETER = 0.30; - var basketballURL ="http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball2.fbx"; - var basketballCollisionSoundURL ="http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball.wav"; + var basketballURL ="https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball2.fbx"; + var basketballCollisionSoundURL ="https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball.wav"; var position = { x: 542.86, diff --git a/unpublishedScripts/DomainContent/Toybox/bow/bow.js b/unpublishedScripts/DomainContent/Toybox/bow/bow.js index 47335bcb6d..2bae1dc16e 100644 --- a/unpublishedScripts/DomainContent/Toybox/bow/bow.js +++ b/unpublishedScripts/DomainContent/Toybox/bow/bow.js @@ -13,9 +13,9 @@ Script.include("../libraries/utils.js"); - var NOTCH_ARROW_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/notch.wav'; - var SHOOT_ARROW_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/String_release2.L.wav'; - var STRING_PULL_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/Bow_draw.1.L.wav'; + var NOTCH_ARROW_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/notch.wav'; + var SHOOT_ARROW_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/String_release2.L.wav'; + var STRING_PULL_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/Bow_draw.1.L.wav'; var ARROW_HIT_SOUND_URL = 'https://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/Arrow_impact1.L.wav' var ARROW_DIMENSIONS = { @@ -32,9 +32,9 @@ z: 0 }; - var ARROW_MODEL_URL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/newarrow_textured.fbx"; + var ARROW_MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/newarrow_textured.fbx"; var ARROW_COLLISION_HULL_URL = - "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/newarrow_collision_hull.obj"; + "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/newarrow_collision_hull.obj"; var ARROW_DIMENSIONS = { x: 0.02, diff --git a/unpublishedScripts/DomainContent/Toybox/bow/createBow.js b/unpublishedScripts/DomainContent/Toybox/bow/createBow.js index 5a4275d96a..8de8379c18 100644 --- a/unpublishedScripts/DomainContent/Toybox/bow/createBow.js +++ b/unpublishedScripts/DomainContent/Toybox/bow/createBow.js @@ -15,8 +15,8 @@ Script.include(utilsPath); var SCRIPT_URL = Script.resolvePath('bow.js'); -var MODEL_URL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/bow-deadly.fbx"; -var COLLISION_HULL_URL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/bow_collision_hull.obj"; +var MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/bow-deadly.fbx"; +var COLLISION_HULL_URL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/bow_collision_hull.obj"; var BOW_DIMENSIONS = { x: 0.04, y: 1.3, diff --git a/unpublishedScripts/DomainContent/Toybox/bubblewand/createWand.js b/unpublishedScripts/DomainContent/Toybox/bubblewand/createWand.js index 0a7d8b7055..5f1e8b072e 100644 --- a/unpublishedScripts/DomainContent/Toybox/bubblewand/createWand.js +++ b/unpublishedScripts/DomainContent/Toybox/bubblewand/createWand.js @@ -12,8 +12,8 @@ Script.include("../libraries/utils.js"); -var WAND_MODEL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bubblewand/wand.fbx'; -var WAND_COLLISION_SHAPE = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bubblewand/wand_collision_hull.obj'; +var WAND_MODEL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bubblewand/wand.fbx'; +var WAND_COLLISION_SHAPE = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bubblewand/wand_collision_hull.obj'; var WAND_SCRIPT_URL = Script.resolvePath("wand.js"); diff --git a/unpublishedScripts/DomainContent/Toybox/bubblewand/wand.js b/unpublishedScripts/DomainContent/Toybox/bubblewand/wand.js index 6f63fe3ec9..0142b610e9 100644 --- a/unpublishedScripts/DomainContent/Toybox/bubblewand/wand.js +++ b/unpublishedScripts/DomainContent/Toybox/bubblewand/wand.js @@ -16,7 +16,7 @@ Script.include("../libraries/utils.js"); - var BUBBLE_MODEL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bubblewand/bubble.fbx"; + var BUBBLE_MODEL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bubblewand/bubble.fbx"; var BUBBLE_INITIAL_DIMENSIONS = { x: 0.01, diff --git a/unpublishedScripts/DomainContent/Toybox/cat/cat.js b/unpublishedScripts/DomainContent/Toybox/cat/cat.js index 78b3a92bc3..90ff34e2e4 100644 --- a/unpublishedScripts/DomainContent/Toybox/cat/cat.js +++ b/unpublishedScripts/DomainContent/Toybox/cat/cat.js @@ -16,7 +16,7 @@ var _this; Cat = function() { _this = this; - this.meowSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/cat/cat_meow.wav"); + this.meowSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/cat/cat_meow.wav"); }; Cat.prototype = { diff --git a/unpublishedScripts/DomainContent/Toybox/doll/createDoll.js b/unpublishedScripts/DomainContent/Toybox/doll/createDoll.js index 37771fee4a..2e0c2a297d 100644 --- a/unpublishedScripts/DomainContent/Toybox/doll/createDoll.js +++ b/unpublishedScripts/DomainContent/Toybox/doll/createDoll.js @@ -11,7 +11,7 @@ /*global MyAvatar, Entities, AnimationCache, SoundCache, Scene, Camera, Overlays, Audio, HMD, AvatarList, AvatarManager, Controller, UndoStack, Window, Account, GlobalServices, Script, ScriptDiscoveryService, LODManager, Menu, Vec3, Quat, AudioDevice, Paths, Clipboard, Settings, XMLHttpRequest, randFloat, randInt */ function createDoll() { - var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/doll/bboy2.fbx"; + var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/doll/bboy2.fbx"; var scriptURL = Script.resolvePath("doll.js"); diff --git a/unpublishedScripts/DomainContent/Toybox/doll/doll.js b/unpublishedScripts/DomainContent/Toybox/doll/doll.js index 654151a0a7..e1c815add9 100644 --- a/unpublishedScripts/DomainContent/Toybox/doll/doll.js +++ b/unpublishedScripts/DomainContent/Toybox/doll/doll.js @@ -18,7 +18,7 @@ // this is the "constructor" for the entity as a JS object we don't do much here var Doll = function() { _this = this; - this.screamSounds = [SoundCache.getSound("http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/doll/KenDoll_1%2303.wav")]; + this.screamSounds = [SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/doll/KenDoll_1%2303.wav")]; }; Doll.prototype = { @@ -31,7 +31,7 @@ Entities.editEntity(this.entityID, { animation: { - url: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/doll/zombie_scream.fbx", + url: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/doll/zombie_scream.fbx", running: true } }); diff --git a/unpublishedScripts/DomainContent/Toybox/flappyAvatars/flappyAvatars.js b/unpublishedScripts/DomainContent/Toybox/flappyAvatars/flappyAvatars.js index deefad3507..f45e6e2131 100644 --- a/unpublishedScripts/DomainContent/Toybox/flappyAvatars/flappyAvatars.js +++ b/unpublishedScripts/DomainContent/Toybox/flappyAvatars/flappyAvatars.js @@ -37,7 +37,7 @@ var yVelocity = 0.0; var yAcceleration = -G; - var airSwipeSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flappyAvatars/Air%20Swipe%2005.wav"); + var airSwipeSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flappyAvatars/Air%20Swipe%2005.wav"); var injector = null; this.position = function() { @@ -51,7 +51,7 @@ type: "Model", modelURL: MyAvatar.skeletonModelURL, animation: { - url: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flappyAvatars/fly.fbx", + url: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flappyAvatars/fly.fbx", running: true, fps: 30, firstFrame: 1.0, @@ -76,7 +76,7 @@ animation: {running: false} }); - airSwipeSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flappyAvatars/8bit%20Jump%2003.wav"); + airSwipeSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flappyAvatars/8bit%20Jump%2003.wav"); injector = null; } @@ -132,7 +132,7 @@ var id = entityManager.add({ type: "Model", - modelURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flappyAvatars/coin.fbx", + modelURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flappyAvatars/coin.fbx", angularVelocity: { x: 0, y: 20, z: 0 }, position: to3DPosition(this.position()), dimensions:dimensions @@ -172,14 +172,14 @@ var idUp = entityManager.add({ type: "Model", - modelURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flappyAvatars/greenPipe.fbx", + modelURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flappyAvatars/greenPipe.fbx", rotation: Quat.fromPitchYawRollDegrees(180, 0, 0), position: to3DPosition({ x: xPosition, y: upYPosition }), dimensions: { x: width, y: upHeight, z: width } }); var idDown = entityManager.add({ type: "Model", - modelURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flappyAvatars/greenPipe.fbx", + modelURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flappyAvatars/greenPipe.fbx", position: to3DPosition({ x: xPosition, y: height / 2.0 }), dimensions: { x: width, y: height, z: width } }); @@ -217,7 +217,7 @@ var pipes = new Array(); var coins = new Array(); - var coinsSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flappyAvatars/Coin.wav"); + var coinsSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flappyAvatars/Coin.wav"); var injector = null; this.update = function(deltaTime, gameTime, startedPlaying) { @@ -325,7 +325,7 @@ var numberDimensions = { x: 0.0660, y: 0.1050, z: 0.0048 }; function numberUrl(number) { - return "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flappyAvatars/" + number + ".fbx" + return "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flappyAvatars/" + number + ".fbx" } function digitPosition(digit) { return Vec3.multiplyQbyV(space.orientation, { x: 0.3778 + digit * (numberDimensions.x + 0.01), y: 0.0, z: 0.0 }); @@ -341,7 +341,7 @@ var bestId = entityManager.add({ type: "Model", - modelURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flappyAvatars/best.fbx", + modelURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flappyAvatars/best.fbx", position: topLeft, rotation: Quat.multiply(space.orientation, Quat.fromPitchYawRollDegrees(90, 0, 0)), dimensions: { x: 0.2781, y: 0.0063, z: 0.1037 } @@ -359,7 +359,7 @@ var scoreId = entityManager.add({ type: "Model", - modelURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flappyAvatars/score.fbx", + modelURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flappyAvatars/score.fbx", position: bottomLeft, rotation: Quat.multiply(space.orientation, Quat.fromPitchYawRollDegrees(90, 0, 0)), dimensions: { x: 0.3678, y: 0.0063, z: 0.1037 } @@ -453,7 +453,7 @@ var pipes = null; var score = null; - var gameOverSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flappyAvatars/Game%20Over.wav"); + var gameOverSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flappyAvatars/Game%20Over.wav"); var injector = null; var directions = ["UP", "DOWN", "LEFT", "RIGHT"]; @@ -466,7 +466,7 @@ current = 0; } if (current === sequence.length) { - avatar.changeModel("http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flappyAvatars/mario.fbx"); + avatar.changeModel("https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flappyAvatars/mario.fbx"); current = 0; } } diff --git a/unpublishedScripts/DomainContent/Toybox/flappyAvatars/flappyAvatars.json b/unpublishedScripts/DomainContent/Toybox/flappyAvatars/flappyAvatars.json index 90c6e5b13d..26dbecc47f 100644 --- a/unpublishedScripts/DomainContent/Toybox/flappyAvatars/flappyAvatars.json +++ b/unpublishedScripts/DomainContent/Toybox/flappyAvatars/flappyAvatars.json @@ -10,7 +10,7 @@ }, "dynamic": 1, "id": "{ee5b25e6-aca2-4dc7-9462-51537d89c126}", - "modelURL": "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flappyAvatars/cube.fbx", + "modelURL": "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flappyAvatars/cube.fbx", "queryAACube": { "scale": 0.5974045991897583, "x": -5.1575918197631836, @@ -23,7 +23,7 @@ "y": -0.13279926776885986, "z": 0.34688329696655273 }, - "script": "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flappyAvatars/flappyAvatars.js", + "script": "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flappyAvatars/flappyAvatars.js", "scriptTimestamp": 1457031937425, "shapeType": "box", "type": "Model", diff --git a/unpublishedScripts/DomainContent/Toybox/flashlight/createFlashlight.js b/unpublishedScripts/DomainContent/Toybox/flashlight/createFlashlight.js index 9bcc6dae58..c57c3a0cd3 100644 --- a/unpublishedScripts/DomainContent/Toybox/flashlight/createFlashlight.js +++ b/unpublishedScripts/DomainContent/Toybox/flashlight/createFlashlight.js @@ -16,7 +16,7 @@ Script.include("../libraries/utils.js"); var scriptURL = Script.resolvePath('flashlight.js'); -var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flashlight/flashlight.fbx"; +var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flashlight/flashlight.fbx"; var center = Vec3.sum(Vec3.sum(MyAvatar.position, { x: 0, diff --git a/unpublishedScripts/DomainContent/Toybox/flashlight/flashlight.js b/unpublishedScripts/DomainContent/Toybox/flashlight/flashlight.js index 82a354c767..08d98a80fe 100644 --- a/unpublishedScripts/DomainContent/Toybox/flashlight/flashlight.js +++ b/unpublishedScripts/DomainContent/Toybox/flashlight/flashlight.js @@ -19,8 +19,8 @@ Script.include("../libraries/utils.js"); - var ON_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flashlight/flashlight_on.wav'; - var OFF_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flashlight/flashlight_off.wav'; + var ON_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flashlight/flashlight_on.wav'; + var OFF_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flashlight/flashlight_off.wav'; //we are creating lights that we don't want to get stranded so lets make sure that we can get rid of them var startTime = Date.now(); diff --git a/unpublishedScripts/DomainContent/Toybox/flowArts/raveStickEntityScript.js b/unpublishedScripts/DomainContent/Toybox/flowArts/raveStickEntityScript.js index 03e15d66db..2cbe9c00b9 100644 --- a/unpublishedScripts/DomainContent/Toybox/flowArts/raveStickEntityScript.js +++ b/unpublishedScripts/DomainContent/Toybox/flowArts/raveStickEntityScript.js @@ -30,7 +30,7 @@ green: 10, blue: 40 }]; - var texture = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flowArts/trails.png"; + var texture = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flowArts/trails.png"; this.trail = Entities.addEntity({ type: "PolyLine", dimensions: { diff --git a/unpublishedScripts/DomainContent/Toybox/hiddenEntityReset.js b/unpublishedScripts/DomainContent/Toybox/hiddenEntityReset.js index fe514f6dfc..c4607c1a01 100644 --- a/unpublishedScripts/DomainContent/Toybox/hiddenEntityReset.js +++ b/unpublishedScripts/DomainContent/Toybox/hiddenEntityReset.js @@ -170,7 +170,7 @@ } function createRaveStick(position) { - var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flowArts/raveStick.fbx"; + var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flowArts/raveStick.fbx"; var rotation = Quat.fromPitchYawRollDegrees(0, 0, 0); var stick = Entities.addEntity({ type: "Model", @@ -260,7 +260,7 @@ alphaSpread: 0.1, alphaStart: 0.1, alphaFinish: 0.1, - textures: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flowArts/beamParticle.png", + textures: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flowArts/beamParticle.png", emitterShouldTrail: false, userData: JSON.stringify({ resetMe: { @@ -272,7 +272,7 @@ } function createGun(position) { - var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/pistol/gun.fbx"; + var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/pistol/gun.fbx"; var pistol = Entities.addEntity({ type: 'Model', @@ -281,7 +281,7 @@ position: position, restitution: 0, damping: 0.5, - collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/pistol/drop.wav", + collisionSoundURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/pistol/drop.wav", dimensions: { x: 0.05, y: 0.23, @@ -345,8 +345,8 @@ var SCRIPT_URL = Script.resolvePath('bow.js'); var BOW_ROTATION = Quat.fromPitchYawRollDegrees(-103.05, -178.60, -87.27); - var MODEL_URL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/bow-deadly.fbx"; - var COLLISION_HULL_URL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/bow_collision_hull.obj"; + var MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/bow-deadly.fbx"; + var COLLISION_HULL_URL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/bow_collision_hull.obj"; var BOW_DIMENSIONS = { x: 0.04, @@ -497,7 +497,7 @@ type: "ParticleEffect", name: "fire", animationSettings: animationSettings, - textures: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/fire/Particle-Sprite-Smoke-1.png", + textures: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/fire/Particle-Sprite-Smoke-1.png", position: { x: 551.45, y: 494.82, @@ -560,10 +560,10 @@ var DIAMETER = 0.30; var RESET_DISTANCE = 1; var MINIMUM_MOVE_LENGTH = 0.05; - var basketballURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball2.fbx"; - var basketballCollisionSoundURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball.wav"; - var rackURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball_rack.fbx"; - var rackCollisionHullURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/rack_collision_hull.obj"; + var basketballURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball2.fbx"; + var basketballCollisionSoundURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball.wav"; + var rackURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball_rack.fbx"; + var rackCollisionHullURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/rack_collision_hull.obj"; var rackRotation = Quat.fromPitchYawRollDegrees(0, -90, 0); @@ -639,7 +639,7 @@ z: 0 }, dynamic: true, - collisionSoundURL: 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball.wav', + collisionSoundURL: 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball.wav', collisionless: false, modelURL: basketballURL, userData: JSON.stringify({ @@ -734,8 +734,8 @@ function createTargets() { - var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/target.fbx'; - var COLLISION_HULL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/target_collision_hull.obj'; + var MODEL_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/target.fbx'; + var COLLISION_HULL_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/target_collision_hull.obj'; var MINIMUM_MOVE_LENGTH = 0.05; var RESET_DISTANCE = 0.5; @@ -814,8 +814,8 @@ function createCat(position) { - var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/cat/Dark_Cat.fbx"; - var animationURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/cat/sleeping.fbx"; + var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/cat/Dark_Cat.fbx"; + var animationURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/cat/sleeping.fbx"; var animationSettings = JSON.stringify({ running: true }); @@ -851,7 +851,7 @@ } function createFlashlight(position) { - var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flashlight/flashlight.fbx"; + var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flashlight/flashlight.fbx"; var flashlight = Entities.addEntity({ type: "Model", @@ -865,7 +865,7 @@ z: 0.08 }, dynamic: true, - collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flashlight/flashlight_drop.L.wav", + collisionSoundURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flashlight/flashlight_drop.L.wav", gravity: { x: 0, y: -3.5, @@ -916,7 +916,7 @@ } function createLights() { - var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/lights/lightswitch.fbx"; + var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/lights/lightswitch.fbx"; var rotation = { @@ -1164,8 +1164,8 @@ function createDice() { var diceProps = { type: "Model", - modelURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/dice/goldDie.fbx", - collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/dice/diceCollide.wav", + modelURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/dice/goldDie.fbx", + collisionSoundURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/dice/diceCollide.wav", name: "dice", position: { x: 541.61, @@ -1212,7 +1212,7 @@ } function createGates() { - var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/gates/fence.fbx'; + var MODEL_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/gates/fence.fbx'; var rotation = Quat.fromPitchYawRollDegrees(0, -16, 0); var gate = Entities.addEntity({ @@ -1253,9 +1253,9 @@ function createPingPongBallGun() { - var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/Pingpong-Gun-New.fbx'; - var COLLISION_HULL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/Pingpong-Gun-New.obj'; - var COLLISION_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/plastic_impact.L.wav'; + var MODEL_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/Pingpong-Gun-New.fbx'; + var COLLISION_HULL_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/Pingpong-Gun-New.obj'; + var COLLISION_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/plastic_impact.L.wav'; var position = { x: 548.6, y: 495.4, @@ -1321,8 +1321,8 @@ } function createWand(position) { - var WAND_MODEL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bubblewand/wand.fbx'; - var WAND_COLLISION_SHAPE = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bubblewand/wand_collision_hull.obj'; + var WAND_MODEL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bubblewand/wand.fbx'; + var WAND_COLLISION_SHAPE = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bubblewand/wand_collision_hull.obj'; var wand = Entities.addEntity({ name: 'Bubble Wand', @@ -1382,7 +1382,7 @@ function createBasketBall(position) { - var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball2.fbx"; + var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball2.fbx"; var entity = Entities.addEntity({ type: "Model", @@ -1408,7 +1408,7 @@ y: -0.01, z: 0 }, - collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball.wav", + collisionSoundURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball.wav", userData: JSON.stringify({ resetMe: { resetMe: true @@ -1422,7 +1422,7 @@ } function createDoll(position) { - var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/doll/bboy2.fbx"; + var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/doll/bboy2.fbx"; var naturalDimensions = { x: 1.63, @@ -1463,7 +1463,7 @@ function createSprayCan(position) { - var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/spray_paint/paintcan.fbx"; + var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/spray_paint/paintcan.fbx"; var entity = Entities.addEntity({ type: "Model", @@ -1477,7 +1477,7 @@ z: 0.07 }, dynamic: true, - collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/spray_paint/SpryPntCnDrp1.L.wav", + collisionSoundURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/spray_paint/SpryPntCnDrp1.L.wav", shapeType: 'box', restitution: 0, gravity: { @@ -1503,7 +1503,7 @@ } function createPottedPlant(position) { - var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/potted_plant/potted_plant.fbx"; + var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/potted_plant/potted_plant.fbx"; var entity = Entities.addEntity({ type: "Model", @@ -1541,8 +1541,8 @@ function createCombinedArmChair(position) { - var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/armchair/combined_chair.fbx"; - var RED_ARM_CHAIR_COLLISION_HULL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/armchair/red_arm_chair_collision_hull.obj"; + var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/armchair/combined_chair.fbx"; + var RED_ARM_CHAIR_COLLISION_HULL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/armchair/red_arm_chair_collision_hull.obj"; var rotation = Quat.fromPitchYawRollDegrees(0, -143, 0); @@ -1584,8 +1584,8 @@ } function createBlocks(position) { - var baseURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/planky/"; - var collisionSoundURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/planky/ToyWoodBlock.L.wav"; + var baseURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/planky/"; + var collisionSoundURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/planky/ToyWoodBlock.L.wav"; var NUM_BLOCKS_PER_COLOR = 4; var i, j; diff --git a/unpublishedScripts/DomainContent/Toybox/lights/lightSwitch.js b/unpublishedScripts/DomainContent/Toybox/lights/lightSwitch.js index 2a1ef04ed3..34228184bd 100644 --- a/unpublishedScripts/DomainContent/Toybox/lights/lightSwitch.js +++ b/unpublishedScripts/DomainContent/Toybox/lights/lightSwitch.js @@ -21,7 +21,7 @@ Script.include(utilitiesScript); LightSwitch = function() { _this = this; - this.switchSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/lights/lamp_switch_2.wav"); + this.switchSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/lights/lamp_switch_2.wav"); }; LightSwitch.prototype = { diff --git a/unpublishedScripts/DomainContent/Toybox/masterReset.js b/unpublishedScripts/DomainContent/Toybox/masterReset.js index b621544621..7bbbdf616d 100644 --- a/unpublishedScripts/DomainContent/Toybox/masterReset.js +++ b/unpublishedScripts/DomainContent/Toybox/masterReset.js @@ -143,7 +143,7 @@ MasterReset = function() { } function createRaveStick(position) { - var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flowArts/raveStick.fbx"; + var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flowArts/raveStick.fbx"; var rotation = Quat.fromPitchYawRollDegrees(0, 0, 0); var stick = Entities.addEntity({ type: "Model", @@ -238,7 +238,7 @@ MasterReset = function() { alphaSpread: 0.1, alphaStart: 0.1, alphaFinish: 0.1, - textures: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flowArts/beamParticle.png", + textures: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flowArts/beamParticle.png", emitterShouldTrail: false, userData: JSON.stringify({ resetMe: { @@ -249,7 +249,7 @@ MasterReset = function() { } function createGun(position) { - var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/pistol/gun.fbx"; + var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/pistol/gun.fbx"; var pistol = Entities.addEntity({ @@ -277,7 +277,7 @@ MasterReset = function() { restitution: 0, dynamic: true, damping: 0.5, - collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/pistol/drop.wav", + collisionSoundURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/pistol/drop.wav", userData: JSON.stringify({ "wearable": { "joints": { @@ -323,8 +323,8 @@ MasterReset = function() { var SCRIPT_URL = Script.resolvePath('bow.js'); var BOW_ROTATION = Quat.fromPitchYawRollDegrees(-103.05, -178.60, -87.27); - var MODEL_URL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/bow-deadly.fbx"; - var COLLISION_HULL_URL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/bow_collision_hull.obj"; + var MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/bow-deadly.fbx"; + var COLLISION_HULL_URL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/bow_collision_hull.obj"; var BOW_DIMENSIONS = { x: 0.04, y: 1.3, @@ -474,7 +474,7 @@ MasterReset = function() { type: "ParticleEffect", name: "fire", animationSettings: animationSettings, - textures: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/fire/Particle-Sprite-Smoke-1.png", + textures: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/fire/Particle-Sprite-Smoke-1.png", position: { x: 551.45, y: 494.82, @@ -538,10 +538,10 @@ MasterReset = function() { var DIAMETER = 0.30; var RESET_DISTANCE = 1; var MINIMUM_MOVE_LENGTH = 0.05; - var basketballURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball2.fbx"; - var basketballCollisionSoundURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball.wav"; - var rackURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball_rack.fbx"; - var rackCollisionHullURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/rack_collision_hull.obj"; + var basketballURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball2.fbx"; + var basketballCollisionSoundURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball.wav"; + var rackURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball_rack.fbx"; + var rackCollisionHullURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/rack_collision_hull.obj"; var rackRotation = Quat.fromPitchYawRollDegrees(0, -90, 0); @@ -618,7 +618,7 @@ MasterReset = function() { z: 0 }, dynamic: true, - collisionSoundURL: 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball.wav', + collisionSoundURL: 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball.wav', collisionless: false, modelURL: basketballURL, userData: JSON.stringify({ @@ -715,8 +715,8 @@ MasterReset = function() { function createTargets() { - var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/target.fbx'; - var COLLISION_HULL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/target_collision_hull.obj'; + var MODEL_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/target.fbx'; + var COLLISION_HULL_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/target_collision_hull.obj'; var MINIMUM_MOVE_LENGTH = 0.05; var RESET_DISTANCE = 0.5; @@ -795,8 +795,8 @@ MasterReset = function() { function createCat(position) { - var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/cat/Dark_Cat.fbx"; - var animationURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/cat/sleeping.fbx"; + var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/cat/Dark_Cat.fbx"; + var animationURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/cat/sleeping.fbx"; var animationSettings = JSON.stringify({ running: true }); @@ -832,7 +832,7 @@ MasterReset = function() { } function createFlashlight(position) { - var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flashlight/flashlight.fbx"; + var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flashlight/flashlight.fbx"; var flashlight = Entities.addEntity({ type: "Model", @@ -846,7 +846,7 @@ MasterReset = function() { z: 0.08 }, dynamic: true, - collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flashlight/flashlight_drop.L.wav", + collisionSoundURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flashlight/flashlight_drop.L.wav", gravity: { x: 0, y: -3.5, @@ -897,7 +897,7 @@ MasterReset = function() { } function createLights() { - var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/lights/lightswitch.fbx"; + var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/lights/lightswitch.fbx"; var rotation = { w: 0.63280689716339111, @@ -1144,8 +1144,8 @@ MasterReset = function() { function createDice() { var diceProps = { type: "Model", - modelURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/dice/goldDie.fbx", - collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/dice/diceCollide.wav", + modelURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/dice/goldDie.fbx", + collisionSoundURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/dice/diceCollide.wav", name: "dice", position: { x: 541.61, @@ -1192,7 +1192,7 @@ MasterReset = function() { } function createGates() { - var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/gates/fence.fbx'; + var MODEL_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/gates/fence.fbx'; var rotation = Quat.fromPitchYawRollDegrees(0, -16, 0); var gate = Entities.addEntity({ name: 'Front Door Fence', @@ -1231,9 +1231,9 @@ MasterReset = function() { } function createPingPongBallGun() { - var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/Pingpong-Gun-New.fbx'; - var COLLISION_HULL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/Pingpong-Gun-New.obj'; - var COLLISION_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/plastic_impact.L.wav'; + var MODEL_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/Pingpong-Gun-New.fbx'; + var COLLISION_HULL_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/Pingpong-Gun-New.obj'; + var COLLISION_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/plastic_impact.L.wav'; var position = { x: 548.6, y: 495.4, @@ -1299,8 +1299,8 @@ MasterReset = function() { } function createWand(position) { - var WAND_MODEL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bubblewand/wand.fbx'; - var WAND_COLLISION_SHAPE = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bubblewand/wand_collision_hull.obj'; + var WAND_MODEL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bubblewand/wand.fbx'; + var WAND_COLLISION_SHAPE = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bubblewand/wand_collision_hull.obj'; var wand = Entities.addEntity({ name: 'Bubble Wand', @@ -1360,7 +1360,7 @@ MasterReset = function() { function createBasketBall(position) { - var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball2.fbx"; + var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball2.fbx"; var entity = Entities.addEntity({ type: "Model", @@ -1386,7 +1386,7 @@ MasterReset = function() { y: -0.01, z: 0 }, - collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball.wav", + collisionSoundURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball.wav", userData: JSON.stringify({ resetMe: { resetMe: true @@ -1400,7 +1400,7 @@ MasterReset = function() { } function createDoll(position) { - var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/doll/bboy2.fbx"; + var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/doll/bboy2.fbx"; var naturalDimensions = { x: 1.63, @@ -1442,7 +1442,7 @@ MasterReset = function() { function createSprayCan(position) { - var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/spray_paint/paintcan.fbx"; + var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/spray_paint/paintcan.fbx"; var entity = Entities.addEntity({ type: "Model", @@ -1456,7 +1456,7 @@ MasterReset = function() { z: 0.07 }, dynamic: true, - collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/spray_paint/SpryPntCnDrp1.L.wav", + collisionSoundURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/spray_paint/SpryPntCnDrp1.L.wav", shapeType: 'box', gravity: { x: 0, @@ -1482,7 +1482,7 @@ MasterReset = function() { } function createPottedPlant(position) { - var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/potted_plant/potted_plant.fbx"; + var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/potted_plant/potted_plant.fbx"; var entity = Entities.addEntity({ type: "Model", @@ -1520,8 +1520,8 @@ MasterReset = function() { function createCombinedArmChair(position) { - var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/armchair/combined_chair.fbx"; - var RED_ARM_CHAIR_COLLISION_HULL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/armchair/red_arm_chair_collision_hull.obj"; + var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/armchair/combined_chair.fbx"; + var RED_ARM_CHAIR_COLLISION_HULL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/armchair/red_arm_chair_collision_hull.obj"; var rotation = Quat.fromPitchYawRollDegrees(0, -143, 0); @@ -1563,8 +1563,8 @@ MasterReset = function() { } function createBlocks(position) { - var baseURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/planky/"; - var collisionSoundURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/planky/ToyWoodBlock.L.wav"; + var baseURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/planky/"; + var collisionSoundURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/planky/ToyWoodBlock.L.wav"; var NUM_BLOCKS_PER_COLOR = 4; var i, j; diff --git a/unpublishedScripts/DomainContent/Toybox/musicPlayer/musicPlayer.js b/unpublishedScripts/DomainContent/Toybox/musicPlayer/musicPlayer.js index e3280e8f9c..2bc8584c89 100644 --- a/unpublishedScripts/DomainContent/Toybox/musicPlayer/musicPlayer.js +++ b/unpublishedScripts/DomainContent/Toybox/musicPlayer/musicPlayer.js @@ -19,7 +19,7 @@ var PLAYLIST_URL = "https://spreadsheets.google.com/feeds/cells/1x-ceGPGHldkHadARABFWfujLPTOWzXJPhrf2bTwg2cQ/od6/public/basic?alt=json"; var SONG_VOLUME = 0.1; var HEADPHONES_ATTACHMENT = { - modelURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/musicPlayer/headphones2-v2.fbx", + modelURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/musicPlayer/headphones2-v2.fbx", jointName: "Head", translation: {"x": 0, "y": 0.19, "z": 0.06}, rotation: {"x":0,"y":0.7071067690849304,"z":0.7071067690849304,"w":0}, diff --git a/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/createPingPongGun.js b/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/createPingPongGun.js index 22812c1206..2785dae573 100644 --- a/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/createPingPongGun.js +++ b/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/createPingPongGun.js @@ -13,9 +13,9 @@ Script.include("../libraries/utils.js"); var scriptURL = Script.resolvePath('pingPongGun.js'); -var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/Pingpong-Gun-New.fbx' -var COLLISION_HULL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/Pingpong-Gun-New.obj'; -var COLLISION_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/plastic_impact.L.wav'; +var MODEL_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/Pingpong-Gun-New.fbx' +var COLLISION_HULL_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/Pingpong-Gun-New.obj'; +var COLLISION_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/plastic_impact.L.wav'; var center = Vec3.sum(Vec3.sum(MyAvatar.position, { x: 0, y: 0.5, diff --git a/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/createTargets.js b/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/createTargets.js index c52d2bff32..1e47a921fe 100644 --- a/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/createTargets.js +++ b/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/createTargets.js @@ -14,8 +14,8 @@ Script.include("../libraries/utils.js"); var scriptURL = Script.resolvePath('wallTarget.js'); -var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/target.fbx'; -var COLLISION_HULL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/target_collision_hull.obj'; +var MODEL_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/target.fbx'; +var COLLISION_HULL_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/target_collision_hull.obj'; var MINIMUM_MOVE_LENGTH = 0.05; var RESET_DISTANCE = 0.5; diff --git a/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/pingPongGun.js b/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/pingPongGun.js index 81a293a830..b1a91084d4 100644 --- a/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/pingPongGun.js +++ b/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/pingPongGun.js @@ -13,8 +13,8 @@ Script.include("../libraries/utils.js"); - var SHOOTING_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/pong_sound.wav'; - var PING_PONG_BALL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/ping_pong_ball.fbx'; + var SHOOTING_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/pong_sound.wav'; + var PING_PONG_BALL_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/ping_pong_ball.fbx'; function PingPongGun() { return; diff --git a/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/wallTarget.js b/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/wallTarget.js index 267faff4ed..1e3b21a06d 100644 --- a/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/wallTarget.js +++ b/unpublishedScripts/DomainContent/Toybox/ping_pong_gun/wallTarget.js @@ -20,7 +20,7 @@ hasBecomeActive: false, preload: function(entityID) { this.entityID = entityID; - var SOUND_URL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/Clay_Pigeon_02.L.wav"; + var SOUND_URL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/Clay_Pigeon_02.L.wav"; this.hitSound = SoundCache.getSound(SOUND_URL); }, collisionWithEntity: function(me, otherEntity) { diff --git a/unpublishedScripts/DomainContent/Toybox/pistol/createPistol.js b/unpublishedScripts/DomainContent/Toybox/pistol/createPistol.js index c3069547cb..358aa19221 100644 --- a/unpublishedScripts/DomainContent/Toybox/pistol/createPistol.js +++ b/unpublishedScripts/DomainContent/Toybox/pistol/createPistol.js @@ -1,6 +1,6 @@ var center = Vec3.sum(MyAvatar.position, Vec3.multiply(1.5, Quat.getFront(Camera.getOrientation()))); var scriptURL = Script.resolvePath('pistol.js'); -var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/pistol/gun.fbx"; +var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/pistol/gun.fbx"; var pistol = Entities.addEntity({ @@ -27,7 +27,7 @@ var pistol = Entities.addEntity({ }, restitution: 0, damping:0.5, - collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/pistol/drop.wav", + collisionSoundURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/pistol/drop.wav", userData: JSON.stringify({ grabbableKey: { invertSolidWhileHeld: true diff --git a/unpublishedScripts/DomainContent/Toybox/pistol/pistol.js b/unpublishedScripts/DomainContent/Toybox/pistol/pistol.js index d86ffd753a..22d709b9bd 100644 --- a/unpublishedScripts/DomainContent/Toybox/pistol/pistol.js +++ b/unpublishedScripts/DomainContent/Toybox/pistol/pistol.js @@ -27,8 +27,8 @@ this.forceMultiplier = 1; this.laserLength = 100; - this.fireSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/pistol/GUN-SHOT2.raw"); - this.ricochetSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/pistol/Ricochet.L.wav"); + this.fireSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/pistol/GUN-SHOT2.raw"); + this.ricochetSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/pistol/Ricochet.L.wav"); this.playRichochetSoundChance = 0.1; this.fireVolume = 0.2; this.bulletForce = 10; @@ -216,7 +216,7 @@ "alphaStart": 0, "alphaFinish": 0, "additiveBlending": true, - "textures": "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/pistol/star.png" + "textures": "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/pistol/star.png" }); Script.setTimeout(function() { diff --git a/unpublishedScripts/DomainContent/Toybox/spray_paint/sprayPaintCan.js b/unpublishedScripts/DomainContent/Toybox/spray_paint/sprayPaintCan.js index 54534ef656..09b8080bd4 100644 --- a/unpublishedScripts/DomainContent/Toybox/spray_paint/sprayPaintCan.js +++ b/unpublishedScripts/DomainContent/Toybox/spray_paint/sprayPaintCan.js @@ -12,7 +12,7 @@ (function () { Script.include("../libraries/utils.js"); - this.spraySound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/spray_paint/spray_paint.wav"); + this.spraySound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/spray_paint/spray_paint.wav"); var TIP_OFFSET_Z = 0.02; var TIP_OFFSET_Y = 0.08; @@ -60,7 +60,7 @@ name: "streamEffect", isEmitting: true, position: position, - textures: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/spray_paint/smokeparticle.png", + textures: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/spray_paint/smokeparticle.png", emitSpeed: 3, speedSpread: 0.02, emitAcceleration: ZERO_VEC, diff --git a/unpublishedScripts/DomainContent/Toybox/targetsResetter.js b/unpublishedScripts/DomainContent/Toybox/targetsResetter.js index d8253fc48a..347fe89ac6 100644 --- a/unpublishedScripts/DomainContent/Toybox/targetsResetter.js +++ b/unpublishedScripts/DomainContent/Toybox/targetsResetter.js @@ -44,8 +44,8 @@ createTargets: function() { - var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/target.fbx'; - var COLLISION_HULL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/target_collision_hull.obj'; + var MODEL_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/target.fbx'; + var COLLISION_HULL_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/target_collision_hull.obj'; var MINIMUM_MOVE_LENGTH = 0.05; var RESET_DISTANCE = 0.5; From 97d578a36fe8abf34501c65f8f59808671d545f7 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Wed, 7 Oct 2020 19:45:10 -0400 Subject: [PATCH 4/4] https hifi-production DomainContent -> vircadia-content --- .../DomainContent/CellScience/Scripts/billboard.js | 2 +- .../DomainContent/CellScience/Scripts/clickToRideAndLook.js | 2 +- .../DomainContent/CellScience/Scripts/nav_button_cells.js | 2 +- .../DomainContent/CellScience/Scripts/nav_button_hexokinase.js | 2 +- .../CellScience/Scripts/nav_button_inside_the_cell.js | 2 +- .../DomainContent/CellScience/Scripts/nav_button_ribosome.js | 2 +- .../DomainContent/CellScience/Scripts/navigationButton.js | 2 +- .../DomainContent/CellScience/Scripts/showButtonToPlaySound.js | 2 +- .../DomainContent/CellScience/Scripts/showIdentification.js | 2 +- unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js | 2 +- unpublishedScripts/DomainContent/CellScience/importNow.js | 2 +- .../DomainContent/CellScience/motorProteinControllerAC.js | 2 +- unpublishedScripts/DomainContent/Toybox/bow/bow.js | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/billboard.js b/unpublishedScripts/DomainContent/CellScience/Scripts/billboard.js index b5e725cfcf..0e552e2107 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/billboard.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/billboard.js @@ -6,7 +6,7 @@ // -var spriteURL = "https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/Sprites/nucleosomes_sprite.fbx"; +var spriteURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/CellScience/Sprites/nucleosomes_sprite.fbx"; var spriteDimensions = { x: 10, y: 10, diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js b/unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js index 61ccec9f9b..ed0fe770a4 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js @@ -13,7 +13,7 @@ z: -1 } - var baseURL = "https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/"; + var baseURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/CellScience/"; var self = this; diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/nav_button_cells.js b/unpublishedScripts/DomainContent/CellScience/Scripts/nav_button_cells.js index 2253bb8068..b33e081e5d 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/nav_button_cells.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/nav_button_cells.js @@ -9,7 +9,7 @@ var version = 13; - var baseURL = "https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/"; + var baseURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/CellScience/"; var button; var _this; diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/nav_button_hexokinase.js b/unpublishedScripts/DomainContent/CellScience/Scripts/nav_button_hexokinase.js index 7ca8de64a6..cda2018a93 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/nav_button_hexokinase.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/nav_button_hexokinase.js @@ -15,7 +15,7 @@ var version = 13; - var baseURL = "https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/"; + var baseURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/CellScience/"; var button; var _this; diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/nav_button_inside_the_cell.js b/unpublishedScripts/DomainContent/CellScience/Scripts/nav_button_inside_the_cell.js index 47cffa1a52..81f8494a36 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/nav_button_inside_the_cell.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/nav_button_inside_the_cell.js @@ -9,7 +9,7 @@ var version = 13; - var baseURL = "https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/"; + var baseURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/CellScience/"; var button; var _this; diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/nav_button_ribosome.js b/unpublishedScripts/DomainContent/CellScience/Scripts/nav_button_ribosome.js index 95ec29a479..b4adebe865 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/nav_button_ribosome.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/nav_button_ribosome.js @@ -8,7 +8,7 @@ var version = 13; - var baseURL = "https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/"; + var baseURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/CellScience/"; var button; var _this; diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/navigationButton.js b/unpublishedScripts/DomainContent/CellScience/Scripts/navigationButton.js index 9992c13acb..cd5f954525 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/navigationButton.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/navigationButton.js @@ -14,7 +14,7 @@ Script.include(utilsScript); var self = this; - var baseURL = "https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/"; + var baseURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/CellScience/"; this.preload = function(entityId) { this.entityId = entityId; diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js b/unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js index 6c1533371b..080f985908 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js @@ -6,7 +6,7 @@ // (function() { - var baseURL = "https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/"; + var baseURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/CellScience/"; var self = this; this.buttonImageURL = baseURL + "GUI/play_audio.svg?2"; diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js b/unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js index c33caf8b37..f012fb00ba 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js @@ -8,7 +8,7 @@ (function() { var self = this; - var baseURL = "https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/"; + var baseURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/CellScience/"; var version = 3; this.preload = function(entityId) { diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js b/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js index 156774f8e3..f1c5ba592a 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js @@ -44,7 +44,7 @@ volume: 0.5 }; - self.teleportSound = SoundCache.getSound("https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/Audio/whoosh.wav"); + self.teleportSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/DomainContent/CellScience/Audio/whoosh.wav"); // print(" portal destination is " + self.portalDestination); } } diff --git a/unpublishedScripts/DomainContent/CellScience/importNow.js b/unpublishedScripts/DomainContent/CellScience/importNow.js index 0d06e60954..b6eb98d23e 100644 --- a/unpublishedScripts/DomainContent/CellScience/importNow.js +++ b/unpublishedScripts/DomainContent/CellScience/importNow.js @@ -38,7 +38,7 @@ function transformToSmallerWorld(vector) { } var cellLayout; -var baseLocation = "https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/"; +var baseLocation = "https://cdn-1.vircadia.com/us-e-1/DomainContent/CellScience/"; var utilsScript = Script.resolvePath('Scripts/utils.js'); Script.include(utilsScript); diff --git a/unpublishedScripts/DomainContent/CellScience/motorProteinControllerAC.js b/unpublishedScripts/DomainContent/CellScience/motorProteinControllerAC.js index 54f8d8a924..724effdc85 100644 --- a/unpublishedScripts/DomainContent/CellScience/motorProteinControllerAC.js +++ b/unpublishedScripts/DomainContent/CellScience/motorProteinControllerAC.js @@ -10,7 +10,7 @@ var numKinesin = 2; var percentOnMainMT = 100; -baseLocation = "https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/" +baseLocation = "https://cdn-1.vircadia.com/us-e-1/DomainContent/CellScience/" var WORLD_OFFSET = { x: 0, diff --git a/unpublishedScripts/DomainContent/Toybox/bow/bow.js b/unpublishedScripts/DomainContent/Toybox/bow/bow.js index 2bae1dc16e..5e39c2141d 100644 --- a/unpublishedScripts/DomainContent/Toybox/bow/bow.js +++ b/unpublishedScripts/DomainContent/Toybox/bow/bow.js @@ -16,7 +16,7 @@ var NOTCH_ARROW_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/notch.wav'; var SHOOT_ARROW_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/String_release2.L.wav'; var STRING_PULL_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/Bow_draw.1.L.wav'; - var ARROW_HIT_SOUND_URL = 'https://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/Arrow_impact1.L.wav' + var ARROW_HIT_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/Arrow_impact1.L.wav' var ARROW_DIMENSIONS = { x: 0.02,