Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-09 09:12:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
James B. Pollack 2015-11-30 13:24:33 -08:00
parent 171ae02b03
commit 9b90c19781
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
unpublishedScripts/hiddenEntityReset.js
View file

@ -930,7 +930,7 @@
}
function createWand(position) {
var WAND_MODEL = 'http://hifi-public.s3.amazonaws.com/models/bubblewand/wand.fbx';
var WAND_MODEL = 'http://hifi-content.s3.amazonaws.com/james/bubblewand/wand.fbx';
var WAND_COLLISION_SHAPE = 'http://hifi-content.s3.amazonaws.com/james/bubblewand/wand_collision_hull.obj';
var wand = Entities.addEntity({
@ -941,7 +941,7 @@
position: position,
gravity: {
x: 0,
y: 0,
y: -9.8,
z: 0,
},
dimensions: {
@ -954,10 +954,10 @@
compoundShapeURL: WAND_COLLISION_SHAPE,
script: wandScriptURL,
userData: JSON.stringify({
resetMe: {
resetMe: true
},
grabbableKey: {
resetMe: {
resetMe: true
},
invertSolidWhileHeld: true,
spatialKey: {
relativePosition: {

10
unpublishedScripts/masterReset.js
View file

@ -912,7 +912,7 @@ MasterReset = function() {
}
function createWand(position) {
var WAND_MODEL = 'http://hifi-public.s3.amazonaws.com/models/bubblewand/wand.fbx';
var WAND_MODEL = 'http://hifi-content.s3.amazonaws.com/james/bubblewand/wand.fbx';
var WAND_COLLISION_SHAPE = 'http://hifi-content.s3.amazonaws.com/james/bubblewand/wand_collision_hull.obj';
var wand = Entities.addEntity({
@ -923,7 +923,7 @@ MasterReset = function() {
position: position,
gravity: {
x: 0,
y: 0,
y: -9.8,
z: 0,
},
dimensions: {
@ -936,10 +936,10 @@ MasterReset = function() {
compoundShapeURL: WAND_COLLISION_SHAPE,
script: wandScriptURL,
userData: JSON.stringify({
resetMe: {
resetMe: true
},
grabbableKey: {
resetMe: {
resetMe: true
},
invertSolidWhileHeld: true,
spatialKey: {
relativePosition: {