Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:47:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #788 from kasenvr/fix/hifi-production-migration

Browse source 
Update hifi-production links
This commit is contained in:
kasenvr 2020-10-15 17:17:36 -04:00 committed by GitHub
commit 2b3b3fb88f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 200 additions and 200 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
domain-server/src/DomainServer.cpp
View file

@ -340,7 +340,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
void DomainServer::parseCommandLine(int argc, char* argv[]) { void DomainServer::parseCommandLine(int argc, char* argv[]) {
QCommandLineParser parser; QCommandLineParser parser;
parser.setApplicationDescription("High Fidelity Domain Server"); parser.setApplicationDescription("Vircadia Domain Server");
const QCommandLineOption versionOption = parser.addVersionOption(); const QCommandLineOption versionOption = parser.addVersionOption();
const QCommandLineOption helpOption = parser.addHelpOption(); const QCommandLineOption helpOption = parser.addHelpOption();

2
interface/src/main.cpp
View file

@ -81,7 +81,7 @@ int main(int argc, const char* argv[]) {
QCommandLineOption noUpdaterOption("no-updater", "Do not show auto-updater"); QCommandLineOption noUpdaterOption("no-updater", "Do not show auto-updater");
QCommandLineOption checkMinSpecOption("checkMinSpec", "Check if machine meets minimum specifications"); QCommandLineOption checkMinSpecOption("checkMinSpec", "Check if machine meets minimum specifications");
QCommandLineOption runServerOption("runServer", "Whether to run the server"); 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 <path>", "serverContentPath");
QCommandLineOption allowMultipleInstancesOption("allowMultipleInstances", "Allow multiple instances to run"); QCommandLineOption allowMultipleInstancesOption("allowMultipleInstances", "Allow multiple instances to run");
QCommandLineOption overrideAppLocalDataPathOption("cache", "set test cache <dir>", "dir"); QCommandLineOption overrideAppLocalDataPathOption("cache", "set test cache <dir>", "dir");
QCommandLineOption overrideScriptsPathOption(SCRIPTS_SWITCH, "set scripts <path>", "path"); QCommandLineOption overrideScriptsPathOption(SCRIPTS_SWITCH, "set scripts <path>", "path");

2
libraries/entities/src/EntityItemProperties.cpp
View file

@ -1214,7 +1214,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
* ], * ],
* strokeWidths: [ 0.1, 0.1, 0.1 ], * strokeWidths: [ 0.1, 0.1, 0.1 ],
* color: { red: 255, green: 0, blue: 0 }, // Use just the red channel from the image. * 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, * isUVModeStretch: true,
* lifetime: 300 // Delete after 5 minutes. * lifetime: 300 // Delete after 5 minutes.
* }); * });

2
scripts/developer/tests/scriptableResource/lib.js
View file

@ -16,7 +16,7 @@ var FRAME_RATE = 30; // 30 default
function getFrame(callback) { function getFrame(callback) {
// A model exported from blender with a texture named 'Picture' on one face. // 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); var model = ModelCache.prefetch(FRAME_URL);
if (model.state === Resource.State.FINISHED) { if (model.state === Resource.State.FINISHED) {

4
scripts/tutorials/butterflies.js
View file

@ -86,13 +86,13 @@ function addButterfly() {
dimensions: dimensions, dimensions: dimensions,
color: color, color: color,
animation: { 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, fps: newFrameRate,
loop: true, loop: true,
running: true, running: true,
startAutomatically:false 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)); butterflies.push(Entities.addEntity(properties));
} }

6
scripts/tutorials/createCow.js
View file

@ -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 // 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 SCRIPT_URL ="https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/entity_scripts/cow.js";
var MODEL_URL = "http://hifi-production.s3.amazonaws.com/tutorials/cow/cow.fbx"; var MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/cow/cow.fbx";
var ANIMATION_URL = 'http://hifi-production.s3.amazonaws.com/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. // this part of the code describes how to center the entity in front of your avatar when it is created.
var orientation = MyAvatar.orientation; var orientation = MyAvatar.orientation;

12
scripts/tutorials/createDice.js
View file

@ -23,7 +23,7 @@ var DIE_SIZE = 0.20;
var madeSound = true; // Set false at start of throw to look for collision 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." 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", { var offButton = toolBar.addOverlay("image", {
width: BUTTON_SIZE, width: BUTTON_SIZE,
height: 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 alpha: 1
}); });
@ -54,11 +54,11 @@ var deleteButton = toolBar.addOverlay("image", {
y: screenSize.y - (BUTTON_SIZE + PADDING)+BOTTOM_PADDING, y: screenSize.y - (BUTTON_SIZE + PADDING)+BOTTOM_PADDING,
width: BUTTON_SIZE, width: BUTTON_SIZE,
height: 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 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", { var diceButton = toolBar.addOverlay("image", {
x: screenSize.x / 2 + PADDING, x: screenSize.x / 2 + PADDING,
y: screenSize.y - (BUTTON_SIZE + PADDING)+BOTTOM_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++) { for (var i = 0; i < NUMBER_OF_DICE; i++) {
dice.push(Entities.addEntity({ dice.push(Entities.addEntity({
type: "Model", 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, position: position,
velocity: velocity, velocity: velocity,
rotation: Quat.fromPitchYawRollDegrees(Math.random() * 360, Math.random() * 360, Math.random() * 360), rotation: Quat.fromPitchYawRollDegrees(Math.random() * 360, Math.random() * 360, Math.random() * 360),
@ -99,7 +99,7 @@ function shootDice(position, velocity) {
lifetime: LIFETIME, lifetime: LIFETIME,
shapeType: "box", shapeType: "box",
dynamic: true, 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())))); position = Vec3.sum(position, Vec3.multiply(DIE_SIZE, Vec3.normalize(Quat.getRight(Camera.getOrientation()))));
} }

4
scripts/tutorials/createFlashlight.js
View file

@ -9,8 +9,8 @@
// //
var SCRIPT_URL = "http://hifi-production.s3.amazonaws.com/tutorials/entity_scripts/flashlight.js"; var SCRIPT_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/entity_scripts/flashlight.js";
var MODEL_URL = "http://hifi-production.s3.amazonaws.com/tutorials/flashlight/flashlight2.fbx"; var MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/flashlight/flashlight2.fbx";
var center = Vec3.sum(Vec3.sum(MyAvatar.position, { var center = Vec3.sum(Vec3.sum(MyAvatar.position, {
x: 0, x: 0,

6
scripts/tutorials/createGolfClub.js
View file

@ -17,8 +17,8 @@ orientation.x = 0;
orientation = Quat.fromVec3Degrees(orientation); orientation = Quat.fromVec3Degrees(orientation);
var center = Vec3.sum(MyAvatar.getHeadPosition(), Vec3.multiply(2, Quat.getForward(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_MODEL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/golfClub/putter_VR.fbx";
var CLUB_COLLISION_HULL = "http://hifi-production.s3.amazonaws.com/tutorials/golfClub/club_collision_hull.obj"; var CLUB_COLLISION_HULL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/golfClub/club_collision_hull.obj";
var CLUB_DIMENSIONS = { var CLUB_DIMENSIONS = {
"x": 0.043093059211969376, "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 = { var golfClubProperties = {
position: center, position: center,
lifetime: 3600, lifetime: 3600,

4
scripts/tutorials/createPictureFrame.js
View file

@ -17,7 +17,7 @@ var center = Vec3.sum(Vec3.sum(MyAvatar.position, {
}), Vec3.multiply(1, Quat.getForward(Camera.getOrientation()))); }), 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. // 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. //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"; 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 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 = { var outerFrameProps = {
name: "Tutorial Outer Frame", name: "Tutorial Outer Frame",
type: "Model", type: "Model",

6
scripts/tutorials/createPingPongGun.js
View file

@ -7,9 +7,9 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // 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 SCRIPT_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/entity_scripts/pingPongGun.js";
var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/tutorials/pingPongGun/Pingpong-Gun-New.fbx'; var MODEL_URL = 'https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pingPongGun/Pingpong-Gun-New.fbx';
var COLLISION_HULL_URL = 'http://hifi-production.s3.amazonaws.com/tutorials/pingPongGun/Pingpong-Gun-New.obj'; 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, { var center = Vec3.sum(Vec3.sum(MyAvatar.position, {
x: 0, x: 0,
y: 0.5, y: 0.5,

6
scripts/tutorials/createPistol.js
View file

@ -7,9 +7,9 @@
// //
var center = Vec3.sum(MyAvatar.position, Vec3.multiply(1.5, Quat.getForward(Camera.getOrientation()))); 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 SCRIPT_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/entity_scripts/pistol.js";
var MODEL_URL = "http://hifi-production.s3.amazonaws.com/tutorials/pistol/gun.fbx"; var MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/gun.fbx";
var COLLISION_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/tutorials/pistol/drop.wav' var COLLISION_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/drop.wav'
var pistolProperties = { var pistolProperties = {
type: 'Model', type: 'Model',

4
scripts/tutorials/createSoundMaker.js
View file

@ -6,8 +6,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // 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 SCRIPT_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/entity_scripts/soundMaker.js";
var MODEL_URL = "http://hifi-production.s3.amazonaws.com/tutorials/soundMaker/Front-Desk-Bell.fbx"; 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, { var center = Vec3.sum(Vec3.sum(MyAvatar.position, {
x: 0, x: 0,

2
scripts/tutorials/entity_scripts/cow.js
View file

@ -19,7 +19,7 @@
//set our id so other methods can get it. //set our id so other methods can get it.
_this.entityID = entityID; _this.entityID = entityID;
//load the mooing sound //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 = { _this.mooSoundOptions = {
volume: 0.7, volume: 0.7,
loop: false loop: false

2
scripts/tutorials/entity_scripts/golfClub.js
View file

@ -13,7 +13,7 @@
(function() { (function() {
var ball = null; 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 triggerState = false;
var BALL_GRAVITY = -9.8; var BALL_GRAVITY = -9.8;
var BALL_START_VELOCITY = 0.1; var BALL_START_VELOCITY = 0.1;

2
scripts/tutorials/entity_scripts/pingPongGun.js
View file

@ -12,7 +12,7 @@
(function() { (function() {
var _this = this; 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() { function PingPongGun() {
return; return;

10
scripts/tutorials/entity_scripts/pistol.js
View file

@ -30,8 +30,8 @@
this.forceMultiplier = 1; this.forceMultiplier = 1;
this.laserLength = 100; this.laserLength = 100;
this.fireSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/tutorials/pistol/GUN-SHOT2.raw"); this.fireSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/GUN-SHOT2.raw");
this.ricochetSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/tutorials/pistol/Ricochet.L.wav"); this.ricochetSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/Ricochet.L.wav");
this.playRichochetSoundChance = 0.1; this.playRichochetSoundChance = 0.1;
this.fireVolume = 0.2; this.fireVolume = 0.2;
this.bulletForce = 10; this.bulletForce = 10;
@ -220,7 +220,7 @@
"alphaStart": 0, "alphaStart": 0,
"alphaFinish": 0, "alphaFinish": 0,
"additiveBlending": true, "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() { Script.setTimeout(function() {
@ -270,7 +270,7 @@
"alphaStart": 0, "alphaStart": 0,
"alphaFinish": 0, "alphaFinish": 0,
"additiveBlending": 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() { Script.setTimeout(function() {
Entities.editEntity(smoke, { Entities.editEntity(smoke, {
@ -333,7 +333,7 @@
"alphaStart": 0, "alphaStart": 0,
"alphaFinish": 0, "alphaFinish": 0,
"additiveBlending": true, "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() { Script.setTimeout(function() {
Entities.editEntity(flash, { Entities.editEntity(flash, {

2
scripts/tutorials/entity_scripts/soundMaker.js
View file

@ -8,7 +8,7 @@
(function(){ (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; var ringSound;
this.preload = function(entityID) { this.preload = function(entityID) {

2
scripts/tutorials/giveAvatarMagicFingers.js
View file

@ -76,7 +76,7 @@ var particleProperties = {
alphaStart: 1, alphaStart: 1,
alphaFinish: 0, alphaFinish: 0,
emitterShouldTrail: true, 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 lifetime: 3600
}; };

2
scripts/tutorials/makeAvatarClap.js
View file

@ -8,7 +8,7 @@
// //
// An animation of the avatar clapping its hands while standing // 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 // overrideRoleAnimation only replaces a single animation at a time. the rest of the motion is driven normally
// @animationRole - name of animation // @animationRole - name of animation

2
unpublishedScripts/DomainContent/CellScience/Scripts/billboard.js
View file

@ -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 = { var spriteDimensions = {
x: 10, x: 10,
y: 10, y: 10,

2
unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js
View file

@ -13,7 +13,7 @@
z: -1 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; var self = this;

2
unpublishedScripts/DomainContent/CellScience/Scripts/nav_button_cells.js
View file

@ -9,7 +9,7 @@
var version = 13; 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 button;
var _this; var _this;

2
unpublishedScripts/DomainContent/CellScience/Scripts/nav_button_hexokinase.js
View file

@ -15,7 +15,7 @@
var version = 13; 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 button;
var _this; var _this;

2
unpublishedScripts/DomainContent/CellScience/Scripts/nav_button_inside_the_cell.js
View file

@ -9,7 +9,7 @@
var version = 13; 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 button;
var _this; var _this;

2
unpublishedScripts/DomainContent/CellScience/Scripts/nav_button_ribosome.js
View file

@ -8,7 +8,7 @@
var version = 13; 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 button;
var _this; var _this;

2
unpublishedScripts/DomainContent/CellScience/Scripts/navigationButton.js
View file

@ -14,7 +14,7 @@
Script.include(utilsScript); Script.include(utilsScript);
var self = this; 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.preload = function(entityId) {
this.entityId = entityId; this.entityId = entityId;

2
unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js
View file

@ -6,7 +6,7 @@
// //
(function() { (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; var self = this;
this.buttonImageURL = baseURL + "GUI/play_audio.svg?2"; this.buttonImageURL = baseURL + "GUI/play_audio.svg?2";

2
unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js
View file

@ -8,7 +8,7 @@
(function() { (function() {
var self = this; 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; var version = 3;
this.preload = function(entityId) { this.preload = function(entityId) {

2
unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js
View file

@ -44,7 +44,7 @@
volume: 0.5 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); // print(" portal destination is " + self.portalDestination);
} }
} }

8
unpublishedScripts/DomainContent/CellScience/backgroundMusicAC.js
View file

@ -1,6 +1,6 @@
var soundMap = [{ var soundMap = [{
name: 'Cells', 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: { audioOptions: {
position: { position: {
x: 15850, x: 15850,
@ -12,7 +12,7 @@ var soundMap = [{
} }
}, { }, {
name: 'Cell Layout', 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: { audioOptions: {
position: { position: {
x: 15950, x: 15950,
@ -24,7 +24,7 @@ var soundMap = [{
} }
}, { }, {
name: 'Ribsome', 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: { audioOptions: {
position: { position: {
x: 15650, x: 15650,
@ -36,7 +36,7 @@ var soundMap = [{
} }
}, { }, {
name: 'Hexokinase', 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: { audioOptions: {
position: { position: {
x: 15750, x: 15750,

2
unpublishedScripts/DomainContent/CellScience/importNow.js
View file

@ -38,7 +38,7 @@ function transformToSmallerWorld(vector) {
} }
var cellLayout; 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'); var utilsScript = Script.resolvePath('Scripts/utils.js');
Script.include(utilsScript); Script.include(utilsScript);

2
unpublishedScripts/DomainContent/CellScience/motorProteinControllerAC.js
View file

@ -10,7 +10,7 @@ var numKinesin = 2;
var percentOnMainMT = 100; 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 = { var WORLD_OFFSET = {
x: 0, x: 0,

14
unpublishedScripts/DomainContent/Toybox/AC_scripts/toybox_sounds.js
View file

@ -10,7 +10,7 @@
var soundMap = [{ var soundMap = [{
name: 'river water', 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: { audioOptions: {
position: { position: {
x: 580, x: 580,
@ -22,7 +22,7 @@ var soundMap = [{
} }
}, { }, {
name: 'windmill', 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: { audioOptions: {
position: { position: {
x: 530, x: 530,
@ -34,7 +34,7 @@ var soundMap = [{
} }
}, { }, {
name: 'insects', 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: { audioOptions: {
position: { position: {
x: 560, x: 560,
@ -46,7 +46,7 @@ var soundMap = [{
} }
}, { }, {
name: 'fireplace', 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: { audioOptions: {
position: { position: {
x: 551.61, x: 551.61,
@ -58,7 +58,7 @@ var soundMap = [{
} }
}, { }, {
name: 'cat purring', 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: { audioOptions: {
position: { position: {
x: 551.48, x: 551.48,
@ -70,7 +70,7 @@ var soundMap = [{
} }
}, { }, {
name: 'dogs barking', 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: { audioOptions: {
position: { position: {
x: 523, x: 523,
@ -83,7 +83,7 @@ var soundMap = [{
playAtInterval: 60 * 1000 playAtInterval: 60 * 1000
}, { }, {
name: 'arcade game', 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: { audioOptions: {
position: { position: {
x: 543.77, x: 543.77,

4
unpublishedScripts/DomainContent/Toybox/basketball/createHoop.js
View file

@ -8,8 +8,8 @@
// //
var hoopURL ="http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball_hoop.fbx"; var hoopURL ="https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball_hoop.fbx";
var hoopCollisionHullURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball_hoop_collision_hull.obj"; var hoopCollisionHullURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball_hoop_collision_hull.obj";
var hoopStartPosition = var hoopStartPosition =
Vec3.sum(MyAvatar.position, Vec3.sum(MyAvatar.position,

8
unpublishedScripts/DomainContent/Toybox/basketball/createRack.js
View file

@ -11,10 +11,10 @@
Script.include("../libraries/utils.js"); Script.include("../libraries/utils.js");
var basketballURL ="http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball2.fbx"; var basketballURL ="https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball2.fbx";
var collisionSoundURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball.wav"; var collisionSoundURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball.wav";
var rackURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball_rack.fbx"; var rackURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball_rack.fbx";
var rackCollisionHullURL ="http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/rack_collision_hull.obj"; var rackCollisionHullURL ="https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/rack_collision_hull.obj";
var NUMBER_OF_BALLS = 4; var NUMBER_OF_BALLS = 4;
var DIAMETER = 0.30; var DIAMETER = 0.30;
var RESET_DISTANCE = 1; var RESET_DISTANCE = 1;

4
unpublishedScripts/DomainContent/Toybox/basketball/createSingleBasketball.js
View file

@ -10,8 +10,8 @@
// //
var basketballURL ="http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball2.fbx"; var basketballURL ="https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball2.fbx";
var collisionSoundURL ="http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball.wav"; var collisionSoundURL ="https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball.wav";
var basketball = null; var basketball = null;

4
unpublishedScripts/DomainContent/Toybox/basketballsResetter.js
View file

@ -41,8 +41,8 @@
createBasketballs: function() { createBasketballs: function() {
var NUMBER_OF_BALLS = 4; var NUMBER_OF_BALLS = 4;
var DIAMETER = 0.30; var DIAMETER = 0.30;
var basketballURL ="http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball2.fbx"; var basketballURL ="https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball2.fbx";
var basketballCollisionSoundURL ="http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball.wav"; var basketballCollisionSoundURL ="https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball.wav";
var position = { var position = {
x: 542.86, x: 542.86,

12
unpublishedScripts/DomainContent/Toybox/bow/bow.js
View file

@ -13,10 +13,10 @@
Script.include("../libraries/utils.js"); Script.include("../libraries/utils.js");
var NOTCH_ARROW_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/notch.wav'; var NOTCH_ARROW_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/notch.wav';
var SHOOT_ARROW_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/String_release2.L.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 = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/Bow_draw.1.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 = { var ARROW_DIMENSIONS = {
x: 0.02, x: 0.02,
@ -32,9 +32,9 @@
z: 0 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 = 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 = { var ARROW_DIMENSIONS = {
x: 0.02, x: 0.02,

4
unpublishedScripts/DomainContent/Toybox/bow/createBow.js
View file

@ -15,8 +15,8 @@ Script.include(utilsPath);
var SCRIPT_URL = Script.resolvePath('bow.js'); var SCRIPT_URL = Script.resolvePath('bow.js');
var MODEL_URL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/bow-deadly.fbx"; var MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/bow-deadly.fbx";
var COLLISION_HULL_URL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/bow_collision_hull.obj"; var COLLISION_HULL_URL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/bow_collision_hull.obj";
var BOW_DIMENSIONS = { var BOW_DIMENSIONS = {
x: 0.04, x: 0.04,
y: 1.3, y: 1.3,

4
unpublishedScripts/DomainContent/Toybox/bubblewand/createWand.js
View file

@ -12,8 +12,8 @@
Script.include("../libraries/utils.js"); Script.include("../libraries/utils.js");
var WAND_MODEL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bubblewand/wand.fbx'; var WAND_MODEL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bubblewand/wand.fbx';
var WAND_COLLISION_SHAPE = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bubblewand/wand_collision_hull.obj'; 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"); var WAND_SCRIPT_URL = Script.resolvePath("wand.js");

2
unpublishedScripts/DomainContent/Toybox/bubblewand/wand.js
View file

@ -16,7 +16,7 @@
Script.include("../libraries/utils.js"); 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 = { var BUBBLE_INITIAL_DIMENSIONS = {
x: 0.01, x: 0.01,

2
unpublishedScripts/DomainContent/Toybox/cat/cat.js
View file

@ -16,7 +16,7 @@
var _this; var _this;
Cat = function() { Cat = function() {
_this = this; _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 = { Cat.prototype = {

2
unpublishedScripts/DomainContent/Toybox/doll/createDoll.js
View file

@ -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 */ /*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() { 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"); var scriptURL = Script.resolvePath("doll.js");

4
unpublishedScripts/DomainContent/Toybox/doll/doll.js
View file

@ -18,7 +18,7 @@
// this is the "constructor" for the entity as a JS object we don't do much here // this is the "constructor" for the entity as a JS object we don't do much here
var Doll = function() { var Doll = function() {
_this = this; _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 = { Doll.prototype = {
@ -31,7 +31,7 @@
Entities.editEntity(this.entityID, { Entities.editEntity(this.entityID, {
animation: { 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 running: true
} }
}); });

24
unpublishedScripts/DomainContent/Toybox/flappyAvatars/flappyAvatars.js
View file

@ -37,7 +37,7 @@
var yVelocity = 0.0; var yVelocity = 0.0;
var yAcceleration = -G; 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; var injector = null;
this.position = function() { this.position = function() {
@ -51,7 +51,7 @@
type: "Model", type: "Model",
modelURL: MyAvatar.skeletonModelURL, modelURL: MyAvatar.skeletonModelURL,
animation: { 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, running: true,
fps: 30, fps: 30,
firstFrame: 1.0, firstFrame: 1.0,
@ -76,7 +76,7 @@
animation: {running: false} 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; injector = null;
} }
@ -132,7 +132,7 @@
var id = entityManager.add({ var id = entityManager.add({
type: "Model", 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 }, angularVelocity: { x: 0, y: 20, z: 0 },
position: to3DPosition(this.position()), position: to3DPosition(this.position()),
dimensions:dimensions dimensions:dimensions
@ -172,14 +172,14 @@
var idUp = entityManager.add({ var idUp = entityManager.add({
type: "Model", 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), rotation: Quat.fromPitchYawRollDegrees(180, 0, 0),
position: to3DPosition({ x: xPosition, y: upYPosition }), position: to3DPosition({ x: xPosition, y: upYPosition }),
dimensions: { x: width, y: upHeight, z: width } dimensions: { x: width, y: upHeight, z: width }
}); });
var idDown = entityManager.add({ var idDown = entityManager.add({
type: "Model", 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 }), position: to3DPosition({ x: xPosition, y: height / 2.0 }),
dimensions: { x: width, y: height, z: width } dimensions: { x: width, y: height, z: width }
}); });
@ -217,7 +217,7 @@
var pipes = new Array(); var pipes = new Array();
var coins = 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; var injector = null;
this.update = function(deltaTime, gameTime, startedPlaying) { this.update = function(deltaTime, gameTime, startedPlaying) {
@ -325,7 +325,7 @@
var numberDimensions = { x: 0.0660, y: 0.1050, z: 0.0048 }; var numberDimensions = { x: 0.0660, y: 0.1050, z: 0.0048 };
function numberUrl(number) { 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) { function digitPosition(digit) {
return Vec3.multiplyQbyV(space.orientation, { x: 0.3778 + digit * (numberDimensions.x + 0.01), y: 0.0, z: 0.0 }); 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({ var bestId = entityManager.add({
type: "Model", 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, position: topLeft,
rotation: Quat.multiply(space.orientation, Quat.fromPitchYawRollDegrees(90, 0, 0)), rotation: Quat.multiply(space.orientation, Quat.fromPitchYawRollDegrees(90, 0, 0)),
dimensions: { x: 0.2781, y: 0.0063, z: 0.1037 } dimensions: { x: 0.2781, y: 0.0063, z: 0.1037 }
@ -359,7 +359,7 @@
var scoreId = entityManager.add({ var scoreId = entityManager.add({
type: "Model", 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, position: bottomLeft,
rotation: Quat.multiply(space.orientation, Quat.fromPitchYawRollDegrees(90, 0, 0)), rotation: Quat.multiply(space.orientation, Quat.fromPitchYawRollDegrees(90, 0, 0)),
dimensions: { x: 0.3678, y: 0.0063, z: 0.1037 } dimensions: { x: 0.3678, y: 0.0063, z: 0.1037 }
@ -453,7 +453,7 @@
var pipes = null; var pipes = null;
var score = 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 injector = null;
var directions = ["UP", "DOWN", "LEFT", "RIGHT"]; var directions = ["UP", "DOWN", "LEFT", "RIGHT"];
@ -466,7 +466,7 @@
current = 0; current = 0;
} }
if (current === sequence.length) { 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; current = 0;
} }
} }

4
unpublishedScripts/DomainContent/Toybox/flappyAvatars/flappyAvatars.json
View file

@ -10,7 +10,7 @@
}, },
"dynamic": 1, "dynamic": 1,
"id": "{ee5b25e6-aca2-4dc7-9462-51537d89c126}", "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": { "queryAACube": {
"scale": 0.5974045991897583, "scale": 0.5974045991897583,
"x": -5.1575918197631836, "x": -5.1575918197631836,
@ -23,7 +23,7 @@
"y": -0.13279926776885986, "y": -0.13279926776885986,
"z": 0.34688329696655273 "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, "scriptTimestamp": 1457031937425,
"shapeType": "box", "shapeType": "box",
"type": "Model", "type": "Model",

2
unpublishedScripts/DomainContent/Toybox/flashlight/createFlashlight.js
View file

@ -16,7 +16,7 @@ Script.include("../libraries/utils.js");
var scriptURL = Script.resolvePath('flashlight.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, { var center = Vec3.sum(Vec3.sum(MyAvatar.position, {
x: 0, x: 0,

4
unpublishedScripts/DomainContent/Toybox/flashlight/flashlight.js
View file

@ -19,8 +19,8 @@
Script.include("../libraries/utils.js"); Script.include("../libraries/utils.js");
var ON_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flashlight/flashlight_on.wav'; var ON_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flashlight/flashlight_on.wav';
var OFF_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flashlight/flashlight_off.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 //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(); var startTime = Date.now();

2
unpublishedScripts/DomainContent/Toybox/flowArts/raveStickEntityScript.js
View file

@ -30,7 +30,7 @@
green: 10, green: 10,
blue: 40 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({ this.trail = Entities.addEntity({
type: "PolyLine", type: "PolyLine",
dimensions: { dimensions: {

74
unpublishedScripts/DomainContent/Toybox/hiddenEntityReset.js
View file

@ -170,7 +170,7 @@
} }
function createRaveStick(position) { 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 rotation = Quat.fromPitchYawRollDegrees(0, 0, 0);
var stick = Entities.addEntity({ var stick = Entities.addEntity({
type: "Model", type: "Model",
@ -260,7 +260,7 @@
alphaSpread: 0.1, alphaSpread: 0.1,
alphaStart: 0.1, alphaStart: 0.1,
alphaFinish: 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, emitterShouldTrail: false,
userData: JSON.stringify({ userData: JSON.stringify({
resetMe: { resetMe: {
@ -272,7 +272,7 @@
} }
function createGun(position) { 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({ var pistol = Entities.addEntity({
type: 'Model', type: 'Model',
@ -281,7 +281,7 @@
position: position, position: position,
restitution: 0, restitution: 0,
damping: 0.5, 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: { dimensions: {
x: 0.05, x: 0.05,
y: 0.23, y: 0.23,
@ -345,8 +345,8 @@
var SCRIPT_URL = Script.resolvePath('bow.js'); var SCRIPT_URL = Script.resolvePath('bow.js');
var BOW_ROTATION = Quat.fromPitchYawRollDegrees(-103.05, -178.60, -87.27); 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 MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/bow-deadly.fbx";
var COLLISION_HULL_URL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/bow_collision_hull.obj"; var COLLISION_HULL_URL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/bow_collision_hull.obj";
var BOW_DIMENSIONS = { var BOW_DIMENSIONS = {
x: 0.04, x: 0.04,
@ -497,7 +497,7 @@
type: "ParticleEffect", type: "ParticleEffect",
name: "fire", name: "fire",
animationSettings: animationSettings, 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: { position: {
x: 551.45, x: 551.45,
y: 494.82, y: 494.82,
@ -560,10 +560,10 @@
var DIAMETER = 0.30; var DIAMETER = 0.30;
var RESET_DISTANCE = 1; var RESET_DISTANCE = 1;
var MINIMUM_MOVE_LENGTH = 0.05; var MINIMUM_MOVE_LENGTH = 0.05;
var basketballURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball2.fbx"; var basketballURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball2.fbx";
var basketballCollisionSoundURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball.wav"; var basketballCollisionSoundURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball.wav";
var rackURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball_rack.fbx"; var rackURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball_rack.fbx";
var rackCollisionHullURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/rack_collision_hull.obj"; var rackCollisionHullURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/rack_collision_hull.obj";
var rackRotation = Quat.fromPitchYawRollDegrees(0, -90, 0); var rackRotation = Quat.fromPitchYawRollDegrees(0, -90, 0);
@ -639,7 +639,7 @@
z: 0 z: 0
}, },
dynamic: true, 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, collisionless: false,
modelURL: basketballURL, modelURL: basketballURL,
userData: JSON.stringify({ userData: JSON.stringify({
@ -734,8 +734,8 @@
function createTargets() { function createTargets() {
var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/target.fbx'; var MODEL_URL = 'https://cdn-1.vircadia.com/us-e-1/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 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 MINIMUM_MOVE_LENGTH = 0.05;
var RESET_DISTANCE = 0.5; var RESET_DISTANCE = 0.5;
@ -814,8 +814,8 @@
function createCat(position) { function createCat(position) {
var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/cat/Dark_Cat.fbx"; var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/cat/Dark_Cat.fbx";
var animationURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/cat/sleeping.fbx"; var animationURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/cat/sleeping.fbx";
var animationSettings = JSON.stringify({ var animationSettings = JSON.stringify({
running: true running: true
}); });
@ -851,7 +851,7 @@
} }
function createFlashlight(position) { 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({ var flashlight = Entities.addEntity({
type: "Model", type: "Model",
@ -865,7 +865,7 @@
z: 0.08 z: 0.08
}, },
dynamic: true, 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: { gravity: {
x: 0, x: 0,
y: -3.5, y: -3.5,
@ -916,7 +916,7 @@
} }
function createLights() { 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 = { var rotation = {
@ -1164,8 +1164,8 @@
function createDice() { function createDice() {
var diceProps = { var diceProps = {
type: "Model", type: "Model",
modelURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/dice/goldDie.fbx", modelURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/dice/goldDie.fbx",
collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/dice/diceCollide.wav", collisionSoundURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/dice/diceCollide.wav",
name: "dice", name: "dice",
position: { position: {
x: 541.61, x: 541.61,
@ -1212,7 +1212,7 @@
} }
function createGates() { 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 rotation = Quat.fromPitchYawRollDegrees(0, -16, 0);
var gate = Entities.addEntity({ var gate = Entities.addEntity({
@ -1253,9 +1253,9 @@
function createPingPongBallGun() { function createPingPongBallGun() {
var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/Pingpong-Gun-New.fbx'; var MODEL_URL = 'https://cdn-1.vircadia.com/us-e-1/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_HULL_URL = 'https://cdn-1.vircadia.com/us-e-1/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 COLLISION_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/plastic_impact.L.wav';
var position = { var position = {
x: 548.6, x: 548.6,
y: 495.4, y: 495.4,
@ -1321,8 +1321,8 @@
} }
function createWand(position) { function createWand(position) {
var WAND_MODEL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bubblewand/wand.fbx'; var WAND_MODEL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bubblewand/wand.fbx';
var WAND_COLLISION_SHAPE = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bubblewand/wand_collision_hull.obj'; var WAND_COLLISION_SHAPE = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bubblewand/wand_collision_hull.obj';
var wand = Entities.addEntity({ var wand = Entities.addEntity({
name: 'Bubble Wand', name: 'Bubble Wand',
@ -1382,7 +1382,7 @@
function createBasketBall(position) { 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({ var entity = Entities.addEntity({
type: "Model", type: "Model",
@ -1408,7 +1408,7 @@
y: -0.01, y: -0.01,
z: 0 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({ userData: JSON.stringify({
resetMe: { resetMe: {
resetMe: true resetMe: true
@ -1422,7 +1422,7 @@
} }
function createDoll(position) { 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 = { var naturalDimensions = {
x: 1.63, x: 1.63,
@ -1463,7 +1463,7 @@
function createSprayCan(position) { 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({ var entity = Entities.addEntity({
type: "Model", type: "Model",
@ -1477,7 +1477,7 @@
z: 0.07 z: 0.07
}, },
dynamic: true, 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', shapeType: 'box',
restitution: 0, restitution: 0,
gravity: { gravity: {
@ -1503,7 +1503,7 @@
} }
function createPottedPlant(position) { 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({ var entity = Entities.addEntity({
type: "Model", type: "Model",
@ -1541,8 +1541,8 @@
function createCombinedArmChair(position) { function createCombinedArmChair(position) {
var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/armchair/combined_chair.fbx"; var modelURL = "https://cdn-1.vircadia.com/us-e-1/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 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); var rotation = Quat.fromPitchYawRollDegrees(0, -143, 0);
@ -1584,8 +1584,8 @@
} }
function createBlocks(position) { function createBlocks(position) {
var baseURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/planky/"; var baseURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/planky/";
var collisionSoundURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/planky/ToyWoodBlock.L.wav"; var collisionSoundURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/planky/ToyWoodBlock.L.wav";
var NUM_BLOCKS_PER_COLOR = 4; var NUM_BLOCKS_PER_COLOR = 4;
var i, j; var i, j;

2
unpublishedScripts/DomainContent/Toybox/lights/lightSwitch.js
View file

@ -21,7 +21,7 @@
Script.include(utilitiesScript); Script.include(utilitiesScript);
LightSwitch = function() { LightSwitch = function() {
_this = this; _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 = { LightSwitch.prototype = {

74
unpublishedScripts/DomainContent/Toybox/masterReset.js
View file

@ -143,7 +143,7 @@ MasterReset = function() {
} }
function createRaveStick(position) { 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 rotation = Quat.fromPitchYawRollDegrees(0, 0, 0);
var stick = Entities.addEntity({ var stick = Entities.addEntity({
type: "Model", type: "Model",
@ -238,7 +238,7 @@ MasterReset = function() {
alphaSpread: 0.1, alphaSpread: 0.1,
alphaStart: 0.1, alphaStart: 0.1,
alphaFinish: 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, emitterShouldTrail: false,
userData: JSON.stringify({ userData: JSON.stringify({
resetMe: { resetMe: {
@ -249,7 +249,7 @@ MasterReset = function() {
} }
function createGun(position) { 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({ var pistol = Entities.addEntity({
@ -277,7 +277,7 @@ MasterReset = function() {
restitution: 0, restitution: 0,
dynamic: true, dynamic: true,
damping: 0.5, 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({ userData: JSON.stringify({
"wearable": { "wearable": {
"joints": { "joints": {
@ -323,8 +323,8 @@ MasterReset = function() {
var SCRIPT_URL = Script.resolvePath('bow.js'); var SCRIPT_URL = Script.resolvePath('bow.js');
var BOW_ROTATION = Quat.fromPitchYawRollDegrees(-103.05, -178.60, -87.27); 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 MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/bow-deadly.fbx";
var COLLISION_HULL_URL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bow/bow_collision_hull.obj"; var COLLISION_HULL_URL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bow/bow_collision_hull.obj";
var BOW_DIMENSIONS = { var BOW_DIMENSIONS = {
x: 0.04, x: 0.04,
y: 1.3, y: 1.3,
@ -474,7 +474,7 @@ MasterReset = function() {
type: "ParticleEffect", type: "ParticleEffect",
name: "fire", name: "fire",
animationSettings: animationSettings, 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: { position: {
x: 551.45, x: 551.45,
y: 494.82, y: 494.82,
@ -538,10 +538,10 @@ MasterReset = function() {
var DIAMETER = 0.30; var DIAMETER = 0.30;
var RESET_DISTANCE = 1; var RESET_DISTANCE = 1;
var MINIMUM_MOVE_LENGTH = 0.05; var MINIMUM_MOVE_LENGTH = 0.05;
var basketballURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball2.fbx"; var basketballURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball2.fbx";
var basketballCollisionSoundURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball.wav"; var basketballCollisionSoundURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball.wav";
var rackURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/basketball_rack.fbx"; var rackURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/basketball_rack.fbx";
var rackCollisionHullURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/basketball/rack_collision_hull.obj"; var rackCollisionHullURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/basketball/rack_collision_hull.obj";
var rackRotation = Quat.fromPitchYawRollDegrees(0, -90, 0); var rackRotation = Quat.fromPitchYawRollDegrees(0, -90, 0);
@ -618,7 +618,7 @@ MasterReset = function() {
z: 0 z: 0
}, },
dynamic: true, 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, collisionless: false,
modelURL: basketballURL, modelURL: basketballURL,
userData: JSON.stringify({ userData: JSON.stringify({
@ -715,8 +715,8 @@ MasterReset = function() {
function createTargets() { function createTargets() {
var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/target.fbx'; var MODEL_URL = 'https://cdn-1.vircadia.com/us-e-1/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 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 MINIMUM_MOVE_LENGTH = 0.05;
var RESET_DISTANCE = 0.5; var RESET_DISTANCE = 0.5;
@ -795,8 +795,8 @@ MasterReset = function() {
function createCat(position) { function createCat(position) {
var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/cat/Dark_Cat.fbx"; var modelURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/cat/Dark_Cat.fbx";
var animationURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/cat/sleeping.fbx"; var animationURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/cat/sleeping.fbx";
var animationSettings = JSON.stringify({ var animationSettings = JSON.stringify({
running: true running: true
}); });
@ -832,7 +832,7 @@ MasterReset = function() {
} }
function createFlashlight(position) { 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({ var flashlight = Entities.addEntity({
type: "Model", type: "Model",
@ -846,7 +846,7 @@ MasterReset = function() {
z: 0.08 z: 0.08
}, },
dynamic: true, 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: { gravity: {
x: 0, x: 0,
y: -3.5, y: -3.5,
@ -897,7 +897,7 @@ MasterReset = function() {
} }
function createLights() { 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 = { var rotation = {
w: 0.63280689716339111, w: 0.63280689716339111,
@ -1144,8 +1144,8 @@ MasterReset = function() {
function createDice() { function createDice() {
var diceProps = { var diceProps = {
type: "Model", type: "Model",
modelURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/dice/goldDie.fbx", modelURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/dice/goldDie.fbx",
collisionSoundURL: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/dice/diceCollide.wav", collisionSoundURL: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/dice/diceCollide.wav",
name: "dice", name: "dice",
position: { position: {
x: 541.61, x: 541.61,
@ -1192,7 +1192,7 @@ MasterReset = function() {
} }
function createGates() { 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 rotation = Quat.fromPitchYawRollDegrees(0, -16, 0);
var gate = Entities.addEntity({ var gate = Entities.addEntity({
name: 'Front Door Fence', name: 'Front Door Fence',
@ -1231,9 +1231,9 @@ MasterReset = function() {
} }
function createPingPongBallGun() { function createPingPongBallGun() {
var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/Pingpong-Gun-New.fbx'; var MODEL_URL = 'https://cdn-1.vircadia.com/us-e-1/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_HULL_URL = 'https://cdn-1.vircadia.com/us-e-1/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 COLLISION_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/plastic_impact.L.wav';
var position = { var position = {
x: 548.6, x: 548.6,
y: 495.4, y: 495.4,
@ -1299,8 +1299,8 @@ MasterReset = function() {
} }
function createWand(position) { function createWand(position) {
var WAND_MODEL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bubblewand/wand.fbx'; var WAND_MODEL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bubblewand/wand.fbx';
var WAND_COLLISION_SHAPE = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/bubblewand/wand_collision_hull.obj'; var WAND_COLLISION_SHAPE = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/bubblewand/wand_collision_hull.obj';
var wand = Entities.addEntity({ var wand = Entities.addEntity({
name: 'Bubble Wand', name: 'Bubble Wand',
@ -1360,7 +1360,7 @@ MasterReset = function() {
function createBasketBall(position) { 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({ var entity = Entities.addEntity({
type: "Model", type: "Model",
@ -1386,7 +1386,7 @@ MasterReset = function() {
y: -0.01, y: -0.01,
z: 0 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({ userData: JSON.stringify({
resetMe: { resetMe: {
resetMe: true resetMe: true
@ -1400,7 +1400,7 @@ MasterReset = function() {
} }
function createDoll(position) { 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 = { var naturalDimensions = {
x: 1.63, x: 1.63,
@ -1442,7 +1442,7 @@ MasterReset = function() {
function createSprayCan(position) { 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({ var entity = Entities.addEntity({
type: "Model", type: "Model",
@ -1456,7 +1456,7 @@ MasterReset = function() {
z: 0.07 z: 0.07
}, },
dynamic: true, 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', shapeType: 'box',
gravity: { gravity: {
x: 0, x: 0,
@ -1482,7 +1482,7 @@ MasterReset = function() {
} }
function createPottedPlant(position) { 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({ var entity = Entities.addEntity({
type: "Model", type: "Model",
@ -1520,8 +1520,8 @@ MasterReset = function() {
function createCombinedArmChair(position) { function createCombinedArmChair(position) {
var modelURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/armchair/combined_chair.fbx"; var modelURL = "https://cdn-1.vircadia.com/us-e-1/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 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); var rotation = Quat.fromPitchYawRollDegrees(0, -143, 0);
@ -1563,8 +1563,8 @@ MasterReset = function() {
} }
function createBlocks(position) { function createBlocks(position) {
var baseURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/planky/"; var baseURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/planky/";
var collisionSoundURL = "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/planky/ToyWoodBlock.L.wav"; var collisionSoundURL = "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/planky/ToyWoodBlock.L.wav";
var NUM_BLOCKS_PER_COLOR = 4; var NUM_BLOCKS_PER_COLOR = 4;
var i, j; var i, j;

2
unpublishedScripts/DomainContent/Toybox/musicPlayer/musicPlayer.js
View file

@ -19,7 +19,7 @@
var PLAYLIST_URL = "https://spreadsheets.google.com/feeds/cells/1x-ceGPGHldkHadARABFWfujLPTOWzXJPhrf2bTwg2cQ/od6/public/basic?alt=json"; var PLAYLIST_URL = "https://spreadsheets.google.com/feeds/cells/1x-ceGPGHldkHadARABFWfujLPTOWzXJPhrf2bTwg2cQ/od6/public/basic?alt=json";
var SONG_VOLUME = 0.1; var SONG_VOLUME = 0.1;
var HEADPHONES_ATTACHMENT = { 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", jointName: "Head",
translation: {"x": 0, "y": 0.19, "z": 0.06}, translation: {"x": 0, "y": 0.19, "z": 0.06},
rotation: {"x":0,"y":0.7071067690849304,"z":0.7071067690849304,"w":0}, rotation: {"x":0,"y":0.7071067690849304,"z":0.7071067690849304,"w":0},

6
unpublishedScripts/DomainContent/Toybox/ping_pong_gun/createPingPongGun.js
View file

@ -13,9 +13,9 @@ Script.include("../libraries/utils.js");
var scriptURL = Script.resolvePath('pingPongGun.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 MODEL_URL = 'https://cdn-1.vircadia.com/us-e-1/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_HULL_URL = 'https://cdn-1.vircadia.com/us-e-1/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 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, { var center = Vec3.sum(Vec3.sum(MyAvatar.position, {
x: 0, x: 0,
y: 0.5, y: 0.5,

4
unpublishedScripts/DomainContent/Toybox/ping_pong_gun/createTargets.js
View file

@ -14,8 +14,8 @@
Script.include("../libraries/utils.js"); Script.include("../libraries/utils.js");
var scriptURL = Script.resolvePath('wallTarget.js'); var scriptURL = Script.resolvePath('wallTarget.js');
var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/target.fbx'; var MODEL_URL = 'https://cdn-1.vircadia.com/us-e-1/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 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 MINIMUM_MOVE_LENGTH = 0.05;
var RESET_DISTANCE = 0.5; var RESET_DISTANCE = 0.5;

4
unpublishedScripts/DomainContent/Toybox/ping_pong_gun/pingPongGun.js
View file

@ -13,8 +13,8 @@
Script.include("../libraries/utils.js"); Script.include("../libraries/utils.js");
var SHOOTING_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/pong_sound.wav'; 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 = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/ping_pong_ball.fbx'; var PING_PONG_BALL_URL = 'https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/ping_pong_gun/ping_pong_ball.fbx';
function PingPongGun() { function PingPongGun() {
return; return;

2
unpublishedScripts/DomainContent/Toybox/ping_pong_gun/wallTarget.js
View file

@ -20,7 +20,7 @@
hasBecomeActive: false, hasBecomeActive: false,
preload: function(entityID) { preload: function(entityID) {
this.entityID = 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); this.hitSound = SoundCache.getSound(SOUND_URL);
}, },
collisionWithEntity: function(me, otherEntity) { collisionWithEntity: function(me, otherEntity) {

4
unpublishedScripts/DomainContent/Toybox/pistol/createPistol.js
View file

@ -1,6 +1,6 @@
var center = Vec3.sum(MyAvatar.position, Vec3.multiply(1.5, Quat.getFront(Camera.getOrientation()))); var center = Vec3.sum(MyAvatar.position, Vec3.multiply(1.5, Quat.getFront(Camera.getOrientation())));
var scriptURL = Script.resolvePath('pistol.js'); 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({ var pistol = Entities.addEntity({
@ -27,7 +27,7 @@ var pistol = Entities.addEntity({
}, },
restitution: 0, restitution: 0,
damping:0.5, 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({ userData: JSON.stringify({
grabbableKey: { grabbableKey: {
invertSolidWhileHeld: true invertSolidWhileHeld: true

6
unpublishedScripts/DomainContent/Toybox/pistol/pistol.js
View file

@ -27,8 +27,8 @@
this.forceMultiplier = 1; this.forceMultiplier = 1;
this.laserLength = 100; this.laserLength = 100;
this.fireSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/pistol/GUN-SHOT2.raw"); this.fireSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/pistol/GUN-SHOT2.raw");
this.ricochetSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/pistol/Ricochet.L.wav"); this.ricochetSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/pistol/Ricochet.L.wav");
this.playRichochetSoundChance = 0.1; this.playRichochetSoundChance = 0.1;
this.fireVolume = 0.2; this.fireVolume = 0.2;
this.bulletForce = 10; this.bulletForce = 10;
@ -216,7 +216,7 @@
"alphaStart": 0, "alphaStart": 0,
"alphaFinish": 0, "alphaFinish": 0,
"additiveBlending": true, "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() { Script.setTimeout(function() {

4
unpublishedScripts/DomainContent/Toybox/spray_paint/sprayPaintCan.js
View file

@ -12,7 +12,7 @@
(function () { (function () {
Script.include("../libraries/utils.js"); 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_Z = 0.02;
var TIP_OFFSET_Y = 0.08; var TIP_OFFSET_Y = 0.08;
@ -60,7 +60,7 @@
name: "streamEffect", name: "streamEffect",
isEmitting: true, isEmitting: true,
position: position, 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, emitSpeed: 3,
speedSpread: 0.02, speedSpread: 0.02,
emitAcceleration: ZERO_VEC, emitAcceleration: ZERO_VEC,

4
unpublishedScripts/DomainContent/Toybox/targetsResetter.js
View file

@ -44,8 +44,8 @@
createTargets: function() { createTargets: function() {
var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/ping_pong_gun/target.fbx'; var MODEL_URL = 'https://cdn-1.vircadia.com/us-e-1/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 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 MINIMUM_MOVE_LENGTH = 0.05;
var RESET_DISTANCE = 0.5; var RESET_DISTANCE = 0.5;