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

Merge pull request #6941 from imgntn/dicelocation

Browse source 
Update dice location in toybox
This commit is contained in:
Seth Alves 2016-01-27 14:49:21 -08:00
commit 8286a037b0
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
unpublishedScripts/hiddenEntityReset.js
View file

@ -1110,9 +1110,9 @@
collisionSoundURL: "http://s3.amazonaws.com/hifi-public/sounds/dice/diceCollide.wav", collisionSoundURL: "http://s3.amazonaws.com/hifi-public/sounds/dice/diceCollide.wav",
name: "dice", name: "dice",
position: { position: {
x: 541, x: 541.61,
y: 494.96, y: 495.21,
z: 509.1 z: 508.52
}, },
dimensions: { dimensions: {
x: 0.09, x: 0.09,
@ -1144,16 +1144,15 @@
var dice1 = Entities.addEntity(diceProps); var dice1 = Entities.addEntity(diceProps);
diceProps.position = { diceProps.position = {
x: 541.05, x: 541.52,
y: 494.96, y: 495.21,
z: 509.0 z: 508.41
}; };
var dice2 = Entities.addEntity(diceProps); var dice2 = Entities.addEntity(diceProps);
} }
function createGates() { function createGates() {
var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/ryan/fence.fbx'; var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/ryan/fence.fbx';

15
unpublishedScripts/masterReset.js
View file

@ -1098,9 +1098,9 @@ MasterReset = function() {
collisionSoundURL: "http://s3.amazonaws.com/hifi-public/sounds/dice/diceCollide.wav", collisionSoundURL: "http://s3.amazonaws.com/hifi-public/sounds/dice/diceCollide.wav",
name: "dice", name: "dice",
position: { position: {
x: 541, x: 541.61,
y: 494.96, y: 495.21,
z: 509.1 z: 508.52
}, },
dimensions: { dimensions: {
x: 0.09, x: 0.09,
@ -1132,16 +1132,15 @@ MasterReset = function() {
var dice1 = Entities.addEntity(diceProps); var dice1 = Entities.addEntity(diceProps);
diceProps.position = { diceProps.position = {
x: 541.05, x: 541.52,
y: 494.96, y: 495.21,
z: 509.0 z: 508.41
}; };
var dice2 = Entities.addEntity(diceProps); var dice2 = Entities.addEntity(diceProps);
} }
function createGates() { function createGates() {
var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/ryan/fence.fbx'; var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/ryan/fence.fbx';