From 0cb6261d11a2b03926b15726bd95e2c453142795 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Tue, 22 Sep 2020 20:25:19 -0400 Subject: [PATCH] Catch stragglers. --- interface/resources/serverless/redirect.json | 2 +- screenshare/README.md | 2 +- .../utilities/render/photobooth/photoboothSetup.json | 12 ++++++------ scripts/system/libraries/networkingConstants.js | 2 +- tools/nitpick/AppDataHighFidelity/Interface.json | 2 +- unpublishedScripts/marketplace/bow/bow.svo.json | 6 +++--- .../gameTable/assets/dominoes/domino.json | 2 +- .../marketplace/shortbow/bow/bow.svo.json | 6 +++--- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/interface/resources/serverless/redirect.json b/interface/resources/serverless/redirect.json index 0b96bad961..efd5015c4d 100644 --- a/interface/resources/serverless/redirect.json +++ b/interface/resources/serverless/redirect.json @@ -296,7 +296,7 @@ "lastEdited": 1537901430334966, "lastEditedBy": "{69540019-db48-4375-86c8-ac1a4a90d043}", "locked": true, - "modelURL": "http://hifi-content.s3.amazonaws.com/alexia/LoadingScreens/floor.fbx", + "modelURL": "https://cdn-1.vircadia.com/eu-c-1/vircadia-public/alexia/LoadingScreens/floor.fbx", "name": "floorModel", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "position": { diff --git a/screenshare/README.md b/screenshare/README.md index e57f37adc1..d02ab56870 100644 --- a/screenshare/README.md +++ b/screenshare/README.md @@ -1,5 +1,5 @@ # Screen Sharing within High Fidelity -This Screen Share app, built using Electron, allows for easy desktop screen sharing when used in conjuction with various scripts in the `hifi-content` repository. +This Screen Share app, built using Electron, allows for easy desktop screen sharing when used in conjuction with various scripts in the `vircadia-content` repository. # Screen Sharing Source Files ## `packager.js` diff --git a/scripts/developer/utilities/render/photobooth/photoboothSetup.json b/scripts/developer/utilities/render/photobooth/photoboothSetup.json index daa19b22ea..6c52522d7a 100644 --- a/scripts/developer/utilities/render/photobooth/photoboothSetup.json +++ b/scripts/developer/utilities/render/photobooth/photoboothSetup.json @@ -140,7 +140,7 @@ "id": "{349e0687-52d4-4e0d-a03c-88f5bf427ce8}", "ignoreForCollisions": 1, "lastEditedBy": "{42574037-43c0-4446-8d75-56a232fa2da5}", - "modelURL": "http://hifi-content.s3.amazonaws.com/caitlyn/production/lazybonesToybox/cameras/35mm%20camera.fbx?232222", + "modelURL": "https://cdn-1.vircadia.com/eu-c-1/vircadia-content/caitlyn/production/lazybonesToybox/cameras/35mm%20camera.fbx?232222", "name": "35 MM SLR by Lazybones", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "parentID": "{8da928c7-a1d0-4a2e-b256-047498ddcfe7}", @@ -183,7 +183,7 @@ "id": "{16f2cec8-2ba0-4567-ac3c-89b2779b1351}", "ignoreForCollisions": 1, "lastEditedBy": "{42574037-43c0-4446-8d75-56a232fa2da5}", - "modelURL": "http://hifi-content.s3.amazonaws.com/caitlyn/production/lazybonesToybox/cameras/35mm%20camera.fbx?232222", + "modelURL": "https://cdn-1.vircadia.com/eu-c-1/vircadia-content/caitlyn/production/lazybonesToybox/cameras/35mm%20camera.fbx?232222", "name": "35 MM SLR by Lazybones", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "parentID": "{8da928c7-a1d0-4a2e-b256-047498ddcfe7}", @@ -226,7 +226,7 @@ "id": "{f81a5b69-6d64-4a79-8233-a4cc182bf9f8}", "ignoreForCollisions": 1, "lastEditedBy": "{42574037-43c0-4446-8d75-56a232fa2da5}", - "modelURL": "http://hifi-content.s3.amazonaws.com/caitlyn/production/lazybonesToybox/cameras/35mm%20camera.fbx?232222", + "modelURL": "https://cdn-1.vircadia.com/eu-c-1/vircadia-content/caitlyn/production/lazybonesToybox/cameras/35mm%20camera.fbx?232222", "name": "35 MM SLR by Lazybones", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "parentID": "{8da928c7-a1d0-4a2e-b256-047498ddcfe7}", @@ -262,7 +262,7 @@ }, "id": "{5d8e6ca9-eec6-4cd9-9931-343c8e122f5d}", "lastEditedBy": "{42574037-43c0-4446-8d75-56a232fa2da5}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Test-Object-7-metal.fbx", + "modelURL": "https://cdn-1.vircadia.com/eu-c-1/vircadia-content/alan/dev/Test-Object-7-metal.fbx", "name": "Photo Booth Model", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "parentID": "{8da928c7-a1d0-4a2e-b256-047498ddcfe7}", @@ -362,7 +362,7 @@ }, "shapeType": "box", "skybox": { - "url": "http://hifi-content.s3.amazonaws.com/alan/dev/Skybox-Sun-high.png" + "url": "https://cdn-1.vircadia.com/eu-c-1/vircadia-content/alan/dev/Skybox-Sun-high.png" }, "type": "Zone" }, @@ -376,7 +376,7 @@ }, "id": "{8da928c7-a1d0-4a2e-b256-047498ddcfe7}", "lastEditedBy": "{42574037-43c0-4446-8d75-56a232fa2da5}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/PhotoStage-v1.fbx", + "modelURL": "https://cdn-1.vircadia.com/eu-c-1/vircadia-content/alan/dev/PhotoStage-v1.fbx", "name": "Photo Booth Stage", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { diff --git a/scripts/system/libraries/networkingConstants.js b/scripts/system/libraries/networkingConstants.js index 7da0951eea..2a9c60f525 100644 --- a/scripts/system/libraries/networkingConstants.js +++ b/scripts/system/libraries/networkingConstants.js @@ -10,7 +10,7 @@ var INTERFACE_METADATA_SOURCE = "https://cdn.vircadia.com/dist/launcher/vircadiaMeta.json"; // Base CDN URLs -var CONTENT_CDN_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/"); // "https://cdn-1.vircadia.com/" + usCDN; +var CONTENT_CDN_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/"); var PUBLIC_BUCKET_CDN_URL = Script.getExternalPath(Script.ExternalPaths.HF_Public, "/"); module.exports = { diff --git a/tools/nitpick/AppDataHighFidelity/Interface.json b/tools/nitpick/AppDataHighFidelity/Interface.json index 41d63d2c55..9f39295610 100644 --- a/tools/nitpick/AppDataHighFidelity/Interface.json +++ b/tools/nitpick/AppDataHighFidelity/Interface.json @@ -279,6 +279,6 @@ "toolbar/com.highfidelity.interface.toolbar.system/x": 655, "toolbar/com.highfidelity.interface.toolbar.system/y": 953, "toolbar/constrainToolbarToCenterX": true, - "private/selectedMetaverseURL": "https://metaverse.highfidelity.com", + "private/selectedMetaverseURL": "https://metaverse.vircadia.com/live", "wallet/autoLogout": true } diff --git a/unpublishedScripts/marketplace/bow/bow.svo.json b/unpublishedScripts/marketplace/bow/bow.svo.json index 1ef66860a6..ffccf14fed 100644 --- a/unpublishedScripts/marketplace/bow/bow.svo.json +++ b/unpublishedScripts/marketplace/bow/bow.svo.json @@ -1,7 +1,7 @@ { "Entities": [ { "collisionsWillMove": 1, - "compoundShapeURL": "http://hifi-content.s3.amazonaws.com/caitlyn/production/bow/bow_collision_hull.obj", + "compoundShapeURL": "https://cdn-1.vircadia.com/eu-c-1/vircadia-content/caitlyn/production/bow/bow_collision_hull.obj", "created": "2016-09-01T23:57:55Z", "dimensions": { "x": 0.039999999105930328, @@ -14,7 +14,7 @@ "y": -1, "z": 0 }, - "modelURL": "http://hifi-content.s3.amazonaws.com/caitlyn/production/bow/bow-deadly.fbx", + "modelURL": "https://cdn-1.vircadia.com/eu-c-1/vircadia-content/caitlyn/production/bow/bow-deadly.fbx", "name": "Hifi-Bow", "rotation": { "w": 0.9718012809753418, @@ -22,7 +22,7 @@ "y": -0.10469216108322144, "z": -0.14418250322341919 }, - "script": "http://hifi-content.s3.amazonaws.com/caitlyn/production/bow/bow.js", + "script": "https://cdn-1.vircadia.com/eu-c-1/vircadia-content/caitlyn/production/bow/bow.js", "shapeType": "compound", "type": "Model", "userData": "{\"grabbableKey\":{\"grabbable\":true},\"wearable\":{\"joints\":{\"RightHand\":[{\"x\":0.0813,\"y\":0.0452,\"z\":0.0095},{\"x\":-0.3946,\"y\":-0.6604,\"z\":0.4748,\"w\":-0.4275}],\"LeftHand\":[{\"x\":-0.0881,\"y\":0.0259,\"z\":0.0159},{\"x\":0.4427,\"y\":-0.6519,\"z\":0.4592,\"w\":0.4099}]}}}" diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino.json index ac5ff2e266..29b5de0d0d 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/assets/dominoes/domino.fbx", + "modelURL": "https://cdn-1.vircadia.com/eu-c-1/vircadia-content/thoys/production/gameTable/assets/dominoes/domino.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/shortbow/bow/bow.svo.json b/unpublishedScripts/marketplace/shortbow/bow/bow.svo.json index 1ef66860a6..ffccf14fed 100644 --- a/unpublishedScripts/marketplace/shortbow/bow/bow.svo.json +++ b/unpublishedScripts/marketplace/shortbow/bow/bow.svo.json @@ -1,7 +1,7 @@ { "Entities": [ { "collisionsWillMove": 1, - "compoundShapeURL": "http://hifi-content.s3.amazonaws.com/caitlyn/production/bow/bow_collision_hull.obj", + "compoundShapeURL": "https://cdn-1.vircadia.com/eu-c-1/vircadia-content/caitlyn/production/bow/bow_collision_hull.obj", "created": "2016-09-01T23:57:55Z", "dimensions": { "x": 0.039999999105930328, @@ -14,7 +14,7 @@ "y": -1, "z": 0 }, - "modelURL": "http://hifi-content.s3.amazonaws.com/caitlyn/production/bow/bow-deadly.fbx", + "modelURL": "https://cdn-1.vircadia.com/eu-c-1/vircadia-content/caitlyn/production/bow/bow-deadly.fbx", "name": "Hifi-Bow", "rotation": { "w": 0.9718012809753418, @@ -22,7 +22,7 @@ "y": -0.10469216108322144, "z": -0.14418250322341919 }, - "script": "http://hifi-content.s3.amazonaws.com/caitlyn/production/bow/bow.js", + "script": "https://cdn-1.vircadia.com/eu-c-1/vircadia-content/caitlyn/production/bow/bow.js", "shapeType": "compound", "type": "Model", "userData": "{\"grabbableKey\":{\"grabbable\":true},\"wearable\":{\"joints\":{\"RightHand\":[{\"x\":0.0813,\"y\":0.0452,\"z\":0.0095},{\"x\":-0.3946,\"y\":-0.6604,\"z\":0.4748,\"w\":-0.4275}],\"LeftHand\":[{\"x\":-0.0881,\"y\":0.0259,\"z\":0.0159},{\"x\":0.4427,\"y\":-0.6519,\"z\":0.4592,\"w\":0.4099}]}}}"