From 68b1c74b43ae63cce2fa804aaaf7d11f97ae0f9e Mon Sep 17 00:00:00 2001 From: Johnathan Franck Date: Wed, 10 May 2017 14:46:12 -0400 Subject: [PATCH] Change URLs to point to high fidelity server --- .../{balloonSpawner.json => balloonParty.json} | 4 ++-- .../balloonSpawner/spawnBalloons.js | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) rename scripts/tutorials/entity_scripts/balloonSpawner/{balloonSpawner.json => balloonParty.json} (64%) diff --git a/scripts/tutorials/entity_scripts/balloonSpawner/balloonSpawner.json b/scripts/tutorials/entity_scripts/balloonSpawner/balloonParty.json similarity index 64% rename from scripts/tutorials/entity_scripts/balloonSpawner/balloonSpawner.json rename to scripts/tutorials/entity_scripts/balloonSpawner/balloonParty.json index 74eca87bfd..d9dd2c17fd 100644 --- a/scripts/tutorials/entity_scripts/balloonSpawner/balloonSpawner.json +++ b/scripts/tutorials/entity_scripts/balloonSpawner/balloonParty.json @@ -8,12 +8,12 @@ "z": 2 }, "name": "Balloon Spawner", - "serverScripts": "https://s3.amazonaws.com/hifi-rabelaiis/spawnBalloons.js", + "serverScripts": "http://mpassets.highfidelity.com/8410ef73-9506-4dc7-b364-0174998a859e-v1/Scripts/spawnBalloons.js", "type": "Shape", "shape": "Cube", "visible": "false", "collisionless": "true", - "userData": "{\"spawnRate\":1000,\"xRangeMax\":1,\"zRangeMax\":1,\"gravityCoefficient\":0.25,\"balloonLifetime\":10,\"spawnTime\":300,\"spawnMusicURL\":\"https://s3.amazonaws.com/hifi-rabelaiis/Blue_Skies.wav\",\"spawnMusicVolume\":0.1}" + "userData": "{\"spawnRate\":1000,\"xRangeMax\":1,\"zRangeMax\":1,\"gravityCoefficient\":0.25,\"balloonLifetime\":10,\"spawnTime\":300,\"spawnMusicURL\":\"http://mpassets.highfidelity.com/8410ef73-9506-4dc7-b364-0174998a859e-v1/Audio/Blue_Skies.wav\",\"spawnMusicVolume\":0.1}" } ], "Version": 63 diff --git a/scripts/tutorials/entity_scripts/balloonSpawner/spawnBalloons.js b/scripts/tutorials/entity_scripts/balloonSpawner/spawnBalloons.js index dcdd49dd3b..696efc912f 100644 --- a/scripts/tutorials/entity_scripts/balloonSpawner/spawnBalloons.js +++ b/scripts/tutorials/entity_scripts/balloonSpawner/spawnBalloons.js @@ -11,15 +11,15 @@ // (function() { - var RED_BALLOON_URL = "https://s3.amazonaws.com/hifi-rabelaiis/redBalloon.fbx"; - var BLUE_BALLOON_URL = "https://s3.amazonaws.com/hifi-rabelaiis/blueBalloon.fbx"; - var GREEN_BALLOON_URL = "https://s3.amazonaws.com/hifi-rabelaiis/greenBalloon.fbx"; - var YELLOW_BALLOON_URL = "https://s3.amazonaws.com/hifi-rabelaiis/yellowBalloon.fbx"; - var ORANGE_BALLOON_URL = "https://s3.amazonaws.com/hifi-rabelaiis/orangeBalloon.fbx"; - var CYAN_BALLOON_URL = "https://s3.amazonaws.com/hifi-rabelaiis/cyanBalloon.fbx"; - var PURPLE_BALLOON_URL = "https://s3.amazonaws.com/hifi-rabelaiis/purpleBalloon.fbx"; + var RED_BALLOON_URL = "http://mpassets.highfidelity.com/8410ef73-9506-4dc7-b364-0174998a859e-v1/Models/redBalloon.fbx"; + var BLUE_BALLOON_URL = "http://mpassets.highfidelity.com/8410ef73-9506-4dc7-b364-0174998a859e-v1/Models/blueBalloon.fbx"; + var GREEN_BALLOON_URL = "http://mpassets.highfidelity.com/8410ef73-9506-4dc7-b364-0174998a859e-v1/Models/greenBalloon.fbx"; + var YELLOW_BALLOON_URL = "http://mpassets.highfidelity.com/8410ef73-9506-4dc7-b364-0174998a859e-v1/Models/yellowBalloon.fbx"; + var ORANGE_BALLOON_URL = "http://mpassets.highfidelity.com/8410ef73-9506-4dc7-b364-0174998a859e-v1/Models/orangeBalloon.fbx"; + var CYAN_BALLOON_URL = "http://mpassets.highfidelity.com/8410ef73-9506-4dc7-b364-0174998a859e-v1/Models/cyanBalloon.fbx"; + var PURPLE_BALLOON_URL = "http://mpassets.highfidelity.com/8410ef73-9506-4dc7-b364-0174998a859e-v1/Models/purpleBalloon.fbx"; //'Blue Skies' by Silent Partner from youtube audio library. Listed as attribution not required - var SPAWN_MUSIC_URL = "https://s3.amazonaws.com/hifi-rabelaiis/Blue_Skies.wav" + var SPAWN_MUSIC_URL = "http://mpassets.highfidelity.com/8410ef73-9506-4dc7-b364-0174998a859e-v1/Audio/Blue_Skies.wav" var BALLOON_COLORS = ["red", "blue", "green", "yellow", "orange", "cyan", "purple"]; var BALLOON_URLS = [RED_BALLOON_URL, BLUE_BALLOON_URL, GREEN_BALLOON_URL,