From 1f83ae53baef27be244c8cfad3028250efbf17e7 Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Fri, 31 Mar 2017 18:33:34 +0200 Subject: [PATCH] move assets and links to be local --- unpublishedScripts/marketplace/gameTable/README.md | 4 ++-- .../gameTable/assets/cards/deckOfCards.json | 4 ++-- .../gameTable/assets/checkers/blackChecker.json | 4 ++-- .../gameTable/assets/checkers/redChecker.json | 4 ++-- .../gameTable/assets/chess/bishop_black.json | 4 ++-- .../gameTable/assets/chess/bishop_white.json | 4 ++-- .../gameTable/assets/chess/king_black.json | 4 ++-- .../gameTable/assets/chess/king_white.json | 4 ++-- .../gameTable/assets/chess/knight_black.json | 4 ++-- .../gameTable/assets/chess/knight_white.json | 4 ++-- .../gameTable/assets/chess/pawn_black.json | 4 ++-- .../gameTable/assets/chess/pawn_white.json | 4 ++-- .../gameTable/assets/chess/queen_black.json | 4 ++-- .../gameTable/assets/chess/queen_white.json | 4 ++-- .../gameTable/assets/chess/rook_black.json | 4 ++-- .../gameTable/assets/chess/rook_white.json | 4 ++-- .../marketplace/gameTable/assets/dice/dice.fbx | 3 --- .../marketplace/gameTable/assets/dice/dice.json | 4 ++-- .../gameTable/assets/dice/newDice3e.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/00.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/10.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/11.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/12.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/13.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/14.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/15.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/16.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/20.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/22.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/23.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/24.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/25.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/26.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/30.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/33.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/34.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/35.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/36.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/40.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/44.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/45.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/46.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/50.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/55.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/56.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/60.fbx | 3 +++ .../marketplace/gameTable/assets/dominoes/66.fbx | 3 +++ .../gameTable/assets/dominoes/DominoFBX.fbx | 3 --- .../gameTable/assets/dominoes/domino0.json | 2 +- .../gameTable/assets/dominoes/domino1.json | 2 +- .../gameTable/assets/dominoes/domino10.json | 2 +- .../gameTable/assets/dominoes/domino11.json | 2 +- .../gameTable/assets/dominoes/domino12.json | 2 +- .../gameTable/assets/dominoes/domino13.json | 2 +- .../gameTable/assets/dominoes/domino14.json | 2 +- .../gameTable/assets/dominoes/domino15.json | 2 +- .../gameTable/assets/dominoes/domino16.json | 2 +- .../gameTable/assets/dominoes/domino17.json | 2 +- .../gameTable/assets/dominoes/domino18.json | 2 +- .../gameTable/assets/dominoes/domino19.json | 2 +- .../gameTable/assets/dominoes/domino2.json | 2 +- .../gameTable/assets/dominoes/domino20.json | 2 +- .../gameTable/assets/dominoes/domino21.json | 2 +- .../gameTable/assets/dominoes/domino22.json | 2 +- .../gameTable/assets/dominoes/domino23.json | 2 +- .../gameTable/assets/dominoes/domino24.json | 2 +- .../gameTable/assets/dominoes/domino25.json | 2 +- .../gameTable/assets/dominoes/domino26.json | 2 +- .../gameTable/assets/dominoes/domino27.json | 2 +- .../gameTable/assets/dominoes/domino3.json | 2 +- .../gameTable/assets/dominoes/domino4.json | 2 +- .../gameTable/assets/dominoes/domino5.json | 2 +- .../gameTable/assets/dominoes/domino6.json | 2 +- .../gameTable/assets/dominoes/domino7.json | 2 +- .../gameTable/assets/dominoes/domino8.json | 2 +- .../gameTable/assets/dominoes/domino9.json | 2 +- .../marketplace/gameTable/entitySpawner.js | 14 ++++++++++++++ 77 files changed, 163 insertions(+), 68 deletions(-) delete mode 100644 unpublishedScripts/marketplace/gameTable/assets/dice/dice.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dice/newDice3e.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/00.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/10.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/11.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/12.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/13.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/14.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/15.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/16.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/20.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/22.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/23.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/24.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/25.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/26.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/30.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/33.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/34.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/35.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/36.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/40.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/44.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/45.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/46.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/50.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/55.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/56.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/60.fbx create mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/66.fbx delete mode 100644 unpublishedScripts/marketplace/gameTable/assets/dominoes/DominoFBX.fbx diff --git a/unpublishedScripts/marketplace/gameTable/README.md b/unpublishedScripts/marketplace/gameTable/README.md index 4e8cc1745d..86764b8b7e 100644 --- a/unpublishedScripts/marketplace/gameTable/README.md +++ b/unpublishedScripts/marketplace/gameTable/README.md @@ -8,7 +8,7 @@ The gaming table is designed with the following principles: 1. Gets its list of games from a remote location, and so can be updated without requiring a new download by users. 2. New games can be defined in a simple JSON data structure. 3. Games are made for using hand controllers. Pieces are physical as much as possible. -4. Simple controls: reset game, next game, and new seat buttons. +4. Simple controls: reset game, next game. 5. No 'rules' are enforced. It's up to players to respect each other. @@ -23,7 +23,7 @@ JSON GAME PARAMETERS ============= (BOTH STYLES) - @gameName - string - what the game is called.```checkers``` -- @matURL - string - url of picture to put on the table. ```http://mywebsite/chekers.jpg``` +- @matURL - string - url of picture to put on the table. ```http://mywebsite/checkers.jpg``` - @spawnStyle - string - either ```pile``` or ```arranged```. (ARRANGED STYLE) diff --git a/unpublishedScripts/marketplace/gameTable/assets/cards/deckOfCards.json b/unpublishedScripts/marketplace/gameTable/assets/cards/deckOfCards.json index 9a001c10e7..186f3bcc35 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/cards/deckOfCards.json +++ b/unpublishedScripts/marketplace/gameTable/assets/cards/deckOfCards.json @@ -23,7 +23,7 @@ "friction":1, "restitution":0, "id": "{36bdb632-06be-4d13-b9be-e620ebec6422}", - "modelURL": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/assets/deckOfCards/playing_card.fbx", + "modelURL": "assets/cards/playing_card.fbx", "name": "Deck of Cards", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { @@ -38,7 +38,7 @@ "y": -0.29045546054840088, "z": 1.52587890625e-05 }, - "script": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/deckOfCards/deckOfCards.js", + "script": "games/deckOfCards/deckOfCards.js", "shapeType": "simple-compound", "type": "Model" }], diff --git a/unpublishedScripts/marketplace/gameTable/assets/checkers/blackChecker.json b/unpublishedScripts/marketplace/gameTable/assets/checkers/blackChecker.json index 64e3da8ec6..179cb9b129 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/checkers/blackChecker.json +++ b/unpublishedScripts/marketplace/gameTable/assets/checkers/blackChecker.json @@ -25,7 +25,7 @@ "z": 0 }, "id": "{551e5154-db28-4f65-a5cb-ef6214a83288}", - "modelURL": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/assets/checkers/black_checker.fbx", + "modelURL": "assets/checkers/black_checker.fbx", "name": "Checker Piece", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { @@ -40,7 +40,7 @@ "y": 0.79168379306793213, "z": -1.52587890625e-05 }, - "script": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/snapToGrid.js", + "script": "snapToGrid.js", "shapeType": "box", "type": "Model", "velocity": { diff --git a/unpublishedScripts/marketplace/gameTable/assets/checkers/redChecker.json b/unpublishedScripts/marketplace/gameTable/assets/checkers/redChecker.json index 4d4164e9ff..ff8b9cb0d0 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/checkers/redChecker.json +++ b/unpublishedScripts/marketplace/gameTable/assets/checkers/redChecker.json @@ -25,7 +25,7 @@ "z": 0 }, "id": "{551e5154-db28-4f65-a5cb-ef6214a83288}", - "modelURL": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/assets/checkers/red_checker.fbx", + "modelURL": "red_checker.fbx", "name": "Checker Piece", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { @@ -40,7 +40,7 @@ "y": 0.79168379306793213, "z": -1.52587890625e-05 }, - "script": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/snapToGrid.js", + "script": "snapToGrid.js", "shapeType": "box", "type": "Model", "velocity": { diff --git a/unpublishedScripts/marketplace/gameTable/assets/chess/bishop_black.json b/unpublishedScripts/marketplace/gameTable/assets/chess/bishop_black.json index 0131ed7097..650620ec4b 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/chess/bishop_black.json +++ b/unpublishedScripts/marketplace/gameTable/assets/chess/bishop_black.json @@ -22,7 +22,7 @@ }, "id": "{1762eec3-ee76-4393-a480-29ef13520dd0}", "marketplaceID": "31987a70-7a69-4ba8-b022-80f1d2320c93", - "modelURL": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/assets/chess/lowPoly/bishop_dk.fbx", + "modelURL": "assets/chess/lowPoly/bishop_dk.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.2920001745223999, @@ -41,7 +41,7 @@ "y": 0.97436141967773438, "z": -3.822671715170145e-06 }, - "script": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/snapToGrid.js", + "script": "snapToGrid.js", "type": "Model", "userData": "{\"grabbableKey\":{\"grabbable\":true}}" }], diff --git a/unpublishedScripts/marketplace/gameTable/assets/chess/bishop_white.json b/unpublishedScripts/marketplace/gameTable/assets/chess/bishop_white.json index ef59454409..6e47271021 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/chess/bishop_white.json +++ b/unpublishedScripts/marketplace/gameTable/assets/chess/bishop_white.json @@ -22,7 +22,7 @@ }, "id": "{a6cf9687-b697-413c-aded-5b876544d5b4}", "marketplaceID": "31987a70-7a69-4ba8-b022-80f1d2320c93", - "modelURL": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/assets/chess/lowPoly/bishop_lt.fbx", + "modelURL": "assets/chess/lowPoly/bishop_lt.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.2920001745223999, @@ -41,7 +41,7 @@ "y": 0.22488787770271301, "z": -3.822671715170145e-06 }, - "script": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/snapToGrid.js", + "script": "snapToGrid.js", "type": "Model", "userData": "{\"grabbableKey\":{\"grabbable\":true}}" }], diff --git a/unpublishedScripts/marketplace/gameTable/assets/chess/king_black.json b/unpublishedScripts/marketplace/gameTable/assets/chess/king_black.json index 051b5ebaa5..c59d8cd8f8 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/chess/king_black.json +++ b/unpublishedScripts/marketplace/gameTable/assets/chess/king_black.json @@ -22,7 +22,7 @@ }, "id": "{b04b255d-73a2-465d-bb9b-4a6324c1ade2}", "marketplaceID": "31987a70-7a69-4ba8-b022-80f1d2320c93", - "modelURL": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/assets/chess/lowPoly/king_dk.fbx", + "modelURL": "assets/chess/lowPoly/king_dk.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.40935343503952026, @@ -41,7 +41,7 @@ "y": 0.97436141967773438, "z": -3.822671715170145e-06 }, - "script": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/snapToGrid.js", + "script": "snapToGrid.js", "type": "Model", "userData": "{\"grabbableKey\":{\"grabbable\":true}}" }], diff --git a/unpublishedScripts/marketplace/gameTable/assets/chess/king_white.json b/unpublishedScripts/marketplace/gameTable/assets/chess/king_white.json index 1e5dc0b5da..98ffd8a992 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/chess/king_white.json +++ b/unpublishedScripts/marketplace/gameTable/assets/chess/king_white.json @@ -22,7 +22,7 @@ }, "id": "{f5d50ec3-f72a-4ba4-906c-afaa417405c5}", "marketplaceID": "31987a70-7a69-4ba8-b022-80f1d2320c93", - "modelURL": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/assets/chess/lowPoly/king_lt.fbx", + "modelURL": "assets/chess/lowPoly/king_lt.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.40935343503952026, @@ -41,7 +41,7 @@ "y": 0.22488787770271301, "z": -3.822671715170145e-06 }, - "script": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/snapToGrid.js", + "script": "snapToGrid.js", "type": "Model", "userData": "{\"grabbableKey\":{\"grabbable\":true}}" }], diff --git a/unpublishedScripts/marketplace/gameTable/assets/chess/knight_black.json b/unpublishedScripts/marketplace/gameTable/assets/chess/knight_black.json index 9a246818a5..2266651301 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/chess/knight_black.json +++ b/unpublishedScripts/marketplace/gameTable/assets/chess/knight_black.json @@ -22,7 +22,7 @@ }, "id": "{2bbe161c-4eab-4526-8519-8773fc2c3bc6}", "marketplaceID": "31987a70-7a69-4ba8-b022-80f1d2320c93", - "modelURL": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/assets/chess/lowPoly/knight_dk.fbx", + "modelURL": "assets/chess/lowPoly/knight_dk.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.25709879398345947, @@ -41,7 +41,7 @@ "z": -0.0000011765481531256228, "w": 0.7071069478988647 }, - "script": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/snapToGrid.js", + "script": "snapToGrid.js", "type": "Model", "userData": "{\"grabbableKey\":{\"grabbable\":true}}" }], diff --git a/unpublishedScripts/marketplace/gameTable/assets/chess/knight_white.json b/unpublishedScripts/marketplace/gameTable/assets/chess/knight_white.json index f0de30f14a..ad6bce0461 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/chess/knight_white.json +++ b/unpublishedScripts/marketplace/gameTable/assets/chess/knight_white.json @@ -22,7 +22,7 @@ }, "id": "{03593067-9430-4cf6-8d4f-642e17bcc1d5}", "marketplaceID": "31987a70-7a69-4ba8-b022-80f1d2320c93", - "modelURL": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/assets/chess/lowPoly/knight_lt.fbx", + "modelURL": "assets/chess/lowPoly/knight_lt.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.25709879398345947, @@ -41,7 +41,7 @@ "z": -0.000012694558790826704, "w": 0.7071805596351624 }, - "script": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/snapToGrid.js", + "script": "snapToGrid.js", "type": "Model", "userData": "{\"grabbableKey\":{\"grabbable\":true}}" }], diff --git a/unpublishedScripts/marketplace/gameTable/assets/chess/pawn_black.json b/unpublishedScripts/marketplace/gameTable/assets/chess/pawn_black.json index 82408f06a2..ed10ac1e27 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/chess/pawn_black.json +++ b/unpublishedScripts/marketplace/gameTable/assets/chess/pawn_black.json @@ -22,7 +22,7 @@ }, "id": "{320a7944-6e31-4ed0-9c94-18c4a82867f6}", "marketplaceID": "31987a70-7a69-4ba8-b022-80f1d2320c93", - "modelURL": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/assets/chess/lowPoly/pawn_dk.fbx", + "modelURL": "assets/chess/lowPoly/pawn_dk.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.19870693981647491, @@ -41,7 +41,7 @@ "y": 0.97436141967773438, "z": -3.822671715170145e-06 }, - "script": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/snapToGrid.js", + "script": "snapToGrid.js", "type": "Model", "userData": "{\"grabbableKey\":{\"grabbable\":true}}" }], diff --git a/unpublishedScripts/marketplace/gameTable/assets/chess/pawn_white.json b/unpublishedScripts/marketplace/gameTable/assets/chess/pawn_white.json index 63346b69e9..c1e41ab7e4 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/chess/pawn_white.json +++ b/unpublishedScripts/marketplace/gameTable/assets/chess/pawn_white.json @@ -22,7 +22,7 @@ }, "id": "{51fee675-ba92-4cff-9631-41da3af1a167}", "marketplaceID": "31987a70-7a69-4ba8-b022-80f1d2320c93", - "modelURL": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/assets/chess/lowPoly/pawn_lt.fbx", + "modelURL": "assets/chess/lowPoly/pawn_lt.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.19870693981647491, @@ -41,7 +41,7 @@ "y": 0.22488787770271301, "z": -3.822671715170145e-06 }, - "script": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/snapToGrid.js", + "script": "snapToGrid.js", "type": "Model", "userData": "{\"grabbableKey\":{\"grabbable\":true}}" }], diff --git a/unpublishedScripts/marketplace/gameTable/assets/chess/queen_black.json b/unpublishedScripts/marketplace/gameTable/assets/chess/queen_black.json index 4e38af3800..a6098cfc8f 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/chess/queen_black.json +++ b/unpublishedScripts/marketplace/gameTable/assets/chess/queen_black.json @@ -22,7 +22,7 @@ }, "id": "{bf46cba5-01ef-4296-b87e-6849b3370bb5}", "marketplaceID": "31987a70-7a69-4ba8-b022-80f1d2320c93", - "modelURL": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/assets/chess/lowPoly/queen_dk.fbx", + "modelURL": "assets/chess/lowPoly/queen_dk.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.3479781448841095, @@ -41,7 +41,7 @@ "y": 0.97436141967773438, "z": -3.822671715170145e-06 }, - "script": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/snapToGrid.js", + "script": "snapToGrid.js", "type": "Model", "userData": "{\"grabbableKey\":{\"grabbable\":true}}" }], diff --git a/unpublishedScripts/marketplace/gameTable/assets/chess/queen_white.json b/unpublishedScripts/marketplace/gameTable/assets/chess/queen_white.json index 224a4ce709..54348893cc 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/chess/queen_white.json +++ b/unpublishedScripts/marketplace/gameTable/assets/chess/queen_white.json @@ -22,7 +22,7 @@ }, "id": "{d3768890-a7d2-473f-81a9-b1ff409b62c5}", "marketplaceID": "31987a70-7a69-4ba8-b022-80f1d2320c93", - "modelURL": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/assets/chess/lowPoly/queen_lt.fbx", + "modelURL": "assets/chess/lowPoly/queen_lt.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.3479781448841095, @@ -41,7 +41,7 @@ "y": 0.22488787770271301, "z": -3.822671715170145e-06 }, - "script": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/snapToGrid.js", + "script": "snapToGrid.js", "type": "Model", "userData": "{\"grabbableKey\":{\"grabbable\":true}}" }], diff --git a/unpublishedScripts/marketplace/gameTable/assets/chess/rook_black.json b/unpublishedScripts/marketplace/gameTable/assets/chess/rook_black.json index b3b09d4d03..25454ac04b 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/chess/rook_black.json +++ b/unpublishedScripts/marketplace/gameTable/assets/chess/rook_black.json @@ -22,7 +22,7 @@ }, "id": "{ef723ba2-9143-406a-9785-667ab126963f}", "marketplaceID": "31987a70-7a69-4ba8-b022-80f1d2320c93", - "modelURL": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/assets/chess/lowPoly/rook_dk.fbx", + "modelURL": "assets/chess/lowPoly/rook_dk.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.23554044961929321, @@ -41,7 +41,7 @@ "y": 0.97436141967773438, "z": -3.822671715170145e-06 }, - "script": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/snapToGrid.js", + "script": "snapToGrid.js", "type": "Model", "userData": "{\"grabbableKey\":{\"grabbable\":true}}" }], diff --git a/unpublishedScripts/marketplace/gameTable/assets/chess/rook_white.json b/unpublishedScripts/marketplace/gameTable/assets/chess/rook_white.json index e866573f29..c6131b60b1 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/chess/rook_white.json +++ b/unpublishedScripts/marketplace/gameTable/assets/chess/rook_white.json @@ -22,7 +22,7 @@ }, "id": "{db3ee0bd-214f-4ed0-bd4f-7d2e964028cf}", "marketplaceID": "31987a70-7a69-4ba8-b022-80f1d2320c93", - "modelURL": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/assets/chess/lowPoly/rook_lt.fbx", + "modelURL": "assets/chess/lowPoly/rook_lt.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.23554044961929321, @@ -41,7 +41,7 @@ "y": 0.22488787770271301, "z": -3.822671715170145e-06 }, - "script": "http://hifi-content.s3.amazonaws.com/thoys/production/gameTable/snapToGrid.js", + "script": "snapToGrid.js", "type": "Model", "userData": "{\"grabbableKey\":{\"grabbable\":true}}" }], diff --git a/unpublishedScripts/marketplace/gameTable/assets/dice/dice.fbx b/unpublishedScripts/marketplace/gameTable/assets/dice/dice.fbx deleted file mode 100644 index 25fd7bbfed..0000000000 --- a/unpublishedScripts/marketplace/gameTable/assets/dice/dice.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:321760aac4e7a6fcea693f0532a05ad789a0a0f72200ff53fcef50f160d8529d -size 323424 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dice/dice.json b/unpublishedScripts/marketplace/gameTable/assets/dice/dice.json index 5f02852598..4453f1b082 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dice/dice.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dice/dice.json @@ -22,7 +22,7 @@ "z": 0 }, "id": "{18424328-df9d-4a6f-9c64-b9e51de43534}", - "modelURL": "https://hifi-content.s3.amazonaws.com/james/gametable-dev/assets/dice/dice.fbx", + "modelURL": "assets/dice/newDice3e.fbx", "name": "Dice", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { @@ -37,7 +37,7 @@ "y": 0.69715219736099243, "z": 0.69532883167266846 }, - "shapeType": "simple-compound", + "shapeType": "box", "type": "Model" } ], diff --git a/unpublishedScripts/marketplace/gameTable/assets/dice/newDice3e.fbx b/unpublishedScripts/marketplace/gameTable/assets/dice/newDice3e.fbx new file mode 100644 index 0000000000..22ea0aa651 --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dice/newDice3e.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8fe443c41e940a303702072fc5c0f46b18ca4fdfb99db9dbd4b57baccb9f772b +size 173616 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/00.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/00.fbx new file mode 100644 index 0000000000..03c5791181 --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/00.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cde28ccc426ad5dfcd6da278ee61c0a9b1e5ac73293802be6d1658f7bed26e38 +size 190160 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/10.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/10.fbx new file mode 100644 index 0000000000..d5305d96a9 --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/10.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6ae89119c51a023416c059c59401ea14c7c831a2a7a1af3369d1d192447be3d +size 191728 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/11.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/11.fbx new file mode 100644 index 0000000000..f8795675ee --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/11.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c2fc0b8df3f677f18590a5463f75e1f4e150b7c1520b83491e4776ab13f5a03 +size 193232 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/12.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/12.fbx new file mode 100644 index 0000000000..a3800d5e8d --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/12.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d84c6d1caf4f5e0ba3fa4bac16bd5ccaca0d2bbda0bbe964d88183c3327b12a +size 195536 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/13.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/13.fbx new file mode 100644 index 0000000000..a472205b7d --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/13.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02ceb32c8df0dd00da92658f362e142214a4a437f148da294267204f8725cfde +size 197296 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/14.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/14.fbx new file mode 100644 index 0000000000..887f2e07c6 --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/14.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dfd249b140e0dc4228b14568f96eb997278fd1850ae8f9a4ffe800a2ab760e36 +size 198512 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/15.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/15.fbx new file mode 100644 index 0000000000..c959f7587d --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/15.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81a4ddb65225a915459e3534e3a82e92f616433fa03383c3842b6106981ec76e +size 200160 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/16.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/16.fbx new file mode 100644 index 0000000000..0f070c7745 --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/16.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18d53ecb5dc96fa6a6a1008ee06b6c28f23d5f73d19f0d384be3454ad2c193ee +size 201744 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/20.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/20.fbx new file mode 100644 index 0000000000..525933bc96 --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/20.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1973db3b7f0476684c5d503fbb81c51daf38e44c1c599584f6a48e98e366c2a3 +size 193680 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/22.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/22.fbx new file mode 100644 index 0000000000..b4b91aa01a --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/22.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6897ab48176ed402e40eb7e5ab31edf9a26f4e5d6eae01d1f7b9c0f85265ecb +size 196832 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/23.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/23.fbx new file mode 100644 index 0000000000..d407610bea --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/23.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfa6bb973c1ab4617032c9e798d23d277c1b91f25658bd3be6a515247eab4a94 +size 198960 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/24.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/24.fbx new file mode 100644 index 0000000000..fe972bfa14 --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/24.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a42db5de628b62a2dda3c2fdf6e5d337514ba1b4c2fafbc29f40fc38fce47bbe +size 200192 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/25.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/25.fbx new file mode 100644 index 0000000000..d521382dd5 --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/25.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2033800fd2092a242f102f3aa86aa865abdfe6e4bc7d86c95ba6b1194c1b3c41 +size 202080 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/26.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/26.fbx new file mode 100644 index 0000000000..6bf53131c1 --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/26.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:abff95562e6f96e150f6cc33c12e02b8617b19d01b03183246d78ca17f77db30 +size 203584 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/30.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/30.fbx new file mode 100644 index 0000000000..341d34535f --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/30.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58844aa355748356a9b7b9727d736f6dd0ace0942a9935780f821130ecc65d44 +size 195552 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/33.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/33.fbx new file mode 100644 index 0000000000..b49c0179df --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/33.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7701f0b021434e56d7946915f84c01a826bf8eab8886cfc387b5c4319e02045e +size 199936 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/34.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/34.fbx new file mode 100644 index 0000000000..3dd6604926 --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/34.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2061c8dcf656c62df6f5febf177ab98e3f974a233b1bc75e12d418f6a88eace4 +size 202032 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/35.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/35.fbx new file mode 100644 index 0000000000..a318c36e54 --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/35.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:466a28deba791ce1b4a65695da8ffda8e6e227d9c8d0563f638d7c7d9573f102 +size 203744 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/36.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/36.fbx new file mode 100644 index 0000000000..3590a4b29b --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/36.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d396f61eeb4ea5b6753c9ebefb230ddb3bab0a8ac455dab4407b4abbde8ecd00 +size 205344 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/40.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/40.fbx new file mode 100644 index 0000000000..7a7f871648 --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/40.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:650f0f35eba4a4be4148866745201bc6d4cda94dd79bc3dd219a5341fc1813d7 +size 196816 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/44.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/44.fbx new file mode 100644 index 0000000000..9bdd3b27cd --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/44.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6550cfdd62a205fbcca77b59980d34133a33ffa76c46a9a4848f69c9128abff0 +size 202720 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/45.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/45.fbx new file mode 100644 index 0000000000..6d2bb67349 --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/45.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d8e65617461c5f58ad24b8e39625d97874b65370fcc7de532a44c57fdd0c328 +size 205120 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/46.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/46.fbx new file mode 100644 index 0000000000..71eab5ba85 --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/46.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6263a2b5595f332d76af401936b7681714c8cf15e508130cf172c0823d28a10b +size 206384 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/50.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/50.fbx new file mode 100644 index 0000000000..9a3a72ae56 --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/50.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f2d44209e11f9bbf8cee3554b111d973dc63b398069ee5f896003466b0d066d +size 198576 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/55.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/55.fbx new file mode 100644 index 0000000000..1a991af53a --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/55.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8682c3905899c9adc2791c72c13611670f941ce4d4b12788ef79f440490d501d +size 205888 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/56.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/56.fbx new file mode 100644 index 0000000000..08449649f0 --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/56.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12d35858d0caa4e0eac27815f317b32373b0c8be182adbe97a14eb17a5143022 +size 207984 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/60.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/60.fbx new file mode 100644 index 0000000000..a3a60f9afa --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/60.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9498657ea4637334e4b6c9baa18b444fa224669a89f98e1c22be94093522b5d7 +size 200240 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/66.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/66.fbx new file mode 100644 index 0000000000..603cf2c4c8 --- /dev/null +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/66.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e8253e15bb07cabeeb27db4bec74b0fc595d674176a7f1d468fe85714c58ecb +size 208912 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/DominoFBX.fbx b/unpublishedScripts/marketplace/gameTable/assets/dominoes/DominoFBX.fbx deleted file mode 100644 index 1641763368..0000000000 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/DominoFBX.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b4d56c2f9240e0f51fc3e77986633b70ed19b694dfdc3305804fbcbc34f8561 -size 3152064 diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino0.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino0.json index 41ef3a10d5..4021bcba0e 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino0.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino0.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/00.fbx", + "modelURL": "assets/dominoes/00.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino1.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino1.json index 452ed6c0cf..71bf1cbe37 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino1.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino1.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/10.fbx", + "modelURL": "assets/dominoes/10.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino10.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino10.json index fad562e998..203d6a588b 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino10.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino10.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/23.fbx", + "modelURL": "assets/dominoes/23.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino11.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino11.json index 5a673e4d00..4d7db094cf 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino11.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino11.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/24.fbx", + "modelURL": "assets/dominoes/24.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino12.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino12.json index b3ebc7c81e..4cbdc8f364 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino12.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino12.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/25.fbx", + "modelURL": "assets/dominoes/25.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino13.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino13.json index 9a6b77c978..f497119a12 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino13.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino13.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/26.fbx", + "modelURL": "assets/dominoes/26.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino14.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino14.json index 3096c59f3f..a92e329fa6 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino14.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino14.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/30.fbx", + "modelURL": "assets/dominoes/30.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino15.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino15.json index 111d4766af..da72dfaac7 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino15.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino15.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/33.fbx", + "modelURL": "assets/dominoes/33.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino16.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino16.json index 8302ae0f1d..07c26a2d6c 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino16.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino16.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/34.fbx", + "modelURL": "assets/dominoes/34.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino17.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino17.json index 3d19949ab0..d65618c23d 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino17.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino17.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/35.fbx", + "modelURL": "assets/dominoes/35.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino18.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino18.json index 8f671cdcf6..cdef0ce0fe 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino18.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino18.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/36.fbx", + "modelURL": "assets/dominoes/36.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino19.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino19.json index ef3686d33c..3c9860a13f 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino19.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino19.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/40.fbx", + "modelURL": "assets/dominoes/40.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino2.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino2.json index 56f1177388..59d863b090 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino2.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino2.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/11.fbx", + "modelURL": "assets/dominoes/11.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino20.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino20.json index b6973b6b13..062bd59257 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino20.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino20.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/44.fbx", + "modelURL": "assets/dominoes/44.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino21.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino21.json index 0fbe5988e8..bd93198671 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino21.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino21.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/45.fbx", + "modelURL": "assets/dominoes/45.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino22.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino22.json index 111d4d39a1..2d505a482c 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino22.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino22.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/46.fbx", + "modelURL": "assets/dominoes/46.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino23.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino23.json index 5c8146512b..dd018ba5b2 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino23.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino23.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/50.fbx", + "modelURL": "assets/dominoes/50.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino24.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino24.json index d86da57cb5..e856fbf436 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino24.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino24.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/55.fbx", + "modelURL": "assets/dominoes/55.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino25.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino25.json index 4b2c0a7049..40b7cf3732 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino25.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino25.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/56.fbx", + "modelURL": "assets/dominoes/56.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino26.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino26.json index 6dc2af9e19..874051a9b0 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino26.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino26.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/60.fbx", + "modelURL": "assets/dominoes/60.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino27.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino27.json index 01ee7ba747..4e1c6def74 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino27.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino27.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/66.fbx", + "modelURL": "assets/dominoes/66.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino3.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino3.json index f7e6a73f4e..ac82db390e 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino3.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino3.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/12.fbx", + "modelURL": "assets/dominoes/12.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino4.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino4.json index 3bd3db0fdd..c3b295970e 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino4.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino4.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/13.fbx", + "modelURL": "assets/dominoes/13.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino5.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino5.json index dc2a0711bc..cebca0695d 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino5.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino5.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/14.fbx", + "modelURL": "assets/dominoes/14.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino6.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino6.json index 15abfdcfad..a5edc85dc9 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino6.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino6.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/15.fbx", + "modelURL": "assets/dominoes/15.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino7.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino7.json index 9401553ccf..12e57a57ec 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino7.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino7.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/16.fbx", + "modelURL": "assets/dominoes/16.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino8.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino8.json index dd9cf7a455..f452fc1bed 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino8.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino8.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/20.fbx", + "modelURL": "assets/dominoes/20.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino9.json b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino9.json index 4729a9c539..e6fc47b8aa 100644 --- a/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino9.json +++ b/unpublishedScripts/marketplace/gameTable/assets/dominoes/domino9.json @@ -11,7 +11,7 @@ "dynamic": 1, "description":"hifi:gameTable:piece:dominoes", "id": "{e25e3ece-6b84-4c0d-925c-aacebf9ebc6c}", - "modelURL": "https://hifi-content.s3.amazonaws.com/jimi/gameTable/domino/22.fbx", + "modelURL": "assets/dominoes/22.fbx", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "queryAACube": { "scale": 0.12253325432538986, diff --git a/unpublishedScripts/marketplace/gameTable/entitySpawner.js b/unpublishedScripts/marketplace/gameTable/entitySpawner.js index 19b1efbb0f..dcee2f0652 100644 --- a/unpublishedScripts/marketplace/gameTable/entitySpawner.js +++ b/unpublishedScripts/marketplace/gameTable/entitySpawner.js @@ -54,6 +54,13 @@ return null; } + function fixLocalPath(link) { + if (link.indexOf('://') === -1) { + return Script.resolvePath(link); + } + return link; + } + //Creates an entity and returns a mixed object of the creation properties and the assigned entityID var createEntity = function(entityProperties, parent, overrideProperties) { // JSON.stringify -> JSON.parse trick to create a fresh copy of JSON data @@ -78,6 +85,13 @@ if (parent.id !== undefined) { newEntityProperties.parentID = parent.id; } + // Fix up paths + if (entityProperties.modelURL !== undefined) { + newEntityProperties.modelURL = fixLocalPath(newEntityProperties.modelURL); + } + if (entityProperties.script !== undefined) { + newEntityProperties.script = fixLocalPath(newEntityProperties.script); + } newEntityProperties.id = Entities.addEntity(newEntityProperties); return newEntityProperties; };