This commit is contained in:
James B. Pollack 2016-04-01 14:48:12 -07:00
parent 619a724eb8
commit e7f5ddf67a
10 changed files with 45 additions and 15 deletions

View file

@ -188,7 +188,7 @@
// delete littleVersionProps.script; // delete littleVersionProps.script;
littleVersionProps.gravity = { littleVersionProps.gravity = {
x: 0, x: 0,
y: -5, y: -10,
z: 0 z: 0
}; };
var userData = JSON.parse(littleVersionProps.userData); var userData = JSON.parse(littleVersionProps.userData);

View file

@ -15,7 +15,7 @@
dynamic: true, dynamic: true,
gravity: { gravity: {
x: 0, x: 0,
y: -5, y: -10,
z: 0 z: 0
}, },
visible: true, visible: true,

View file

@ -99,7 +99,7 @@ Plant = function(spawnPosition, spawnRotation) {
dynamic: true, dynamic: true,
gravity: { gravity: {
x: 0.0, x: 0.0,
y: -2.0, y: -10.0,
z: 0 z: 0
}, },
velocity: { velocity: {

View file

@ -2,7 +2,7 @@
"Entities": [{ "Entities": [{
"gravity": { "gravity": {
"x": 0, "x": 0,
"y": -7, "y": -10,
"z": 0 "z": 0
}, },
"userData": "{\"hifiHomeKey\":{\"reset\":true}}", "userData": "{\"hifiHomeKey\":{\"reset\":true}}",

View file

@ -0,0 +1,30 @@
(function() {
var _this;
var LIVING_ROOM_POSITION = {
"x": 1101.7781982421875,
"y": 460.5820007324219,
"z": -77.89060974121094
}
var ROTATION = {
"x": -0.04497870057821274,
"y": -0.4520675241947174,
"z": -0.02283225581049919,
"w": 0.890556275844574
}
var AvatarCatcher = function() {
_this = this;
}
AvatarCatcher.prototype = {
enterEntity: function() {
this.teleportToLivingRoom();
},
teleportToLivingRoom: function() {
MyAvatar.goToLocation(LIVING_ROOM_POSITION, true, ROTATION);
}
}
return new AvatarCatcher();
});

View file

@ -35,7 +35,7 @@
var PING_PONG_GUN_GRAVITY = { var PING_PONG_GUN_GRAVITY = {
x: 0, x: 0,
y: -5, y: -10,
z: 0 z: 0
}; };

View file

@ -29,7 +29,7 @@ HomePingPongGun = function(spawnPosition, spawnRotation) {
}, },
gravity: { gravity: {
x: 0, x: 0,
y: -3, y: -10,
z: 0 z: 0
}, },
rotation: Quat.fromPitchYawRollDegrees(spawnRotation.x, spawnRotation.y, spawnRotation.z), rotation: Quat.fromPitchYawRollDegrees(spawnRotation.x, spawnRotation.y, spawnRotation.z),

View file

@ -250,14 +250,14 @@
var stuffOnShelves = new StuffOnShelves({ var stuffOnShelves = new StuffOnShelves({
x: 1105.9432, x: 1105.9432,
y: 461.1020, y: 461.095,
z: -80.7894 z: -80.7894
}); });
var junk = new HomeJunk({ var junk = new HomeJunk({
x: 1102.8754, x: 1102.5861,
y: 460.2932, y: 460.1812,
z: -69.0222 z: -69.5005
}); });
var trashcan = new Trashcan({ var trashcan = new Trashcan({
@ -323,7 +323,7 @@
}), }),
position: { position: {
x: 1106.9778, x: 1106.9778,
y: 460.6075, y: 460.3075,
z: -74.5842 z: -74.5842
}, },
userData: JSON.stringify({ userData: JSON.stringify({
@ -343,7 +343,7 @@
var DAIS_DIMENSIONS = { var DAIS_DIMENSIONS = {
x: 1.0654, x: 1.0654,
y: 0.4679, y: 0.1695,
z: 1.0654 z: 1.0654
}; };

View file

@ -83,7 +83,7 @@ TiltMaze = function(spawnPosition, spawnRotation) {
var MAZE_ANGULAR_DAMPING = 0.6; var MAZE_ANGULAR_DAMPING = 0.6;
var MAZE_GRAVITY = { var MAZE_GRAVITY = {
x: 0, x: 0,
y: -3, y: -10,
z: 0 z: 0
}; };

View file

@ -112,7 +112,7 @@ Whiteboard = function(spawnPosition, spawnRotation) {
dynamic: true, dynamic: true,
gravity: { gravity: {
x: 0, x: 0,
y: -1, y: -10,
z: 0 z: 0
}, },
velocity: { velocity: {
@ -195,7 +195,7 @@ Whiteboard = function(spawnPosition, spawnRotation) {
dynamic: true, dynamic: true,
gravity: { gravity: {
x: 0, x: 0,
y: -1, y: -10,
z: 0 z: 0
}, },
velocity: { velocity: {