diff --git a/unpublishedScripts/DomainContent/Home/dressingRoom/transformer.js b/unpublishedScripts/DomainContent/Home/dressingRoom/transformer.js index 4945c80fa6..0218f174a0 100644 --- a/unpublishedScripts/DomainContent/Home/dressingRoom/transformer.js +++ b/unpublishedScripts/DomainContent/Home/dressingRoom/transformer.js @@ -188,7 +188,7 @@ // delete littleVersionProps.script; littleVersionProps.gravity = { x: 0, - y: -5, + y: -10, z: 0 }; var userData = JSON.parse(littleVersionProps.userData); diff --git a/unpublishedScripts/DomainContent/Home/dressingRoom/wrapper.js b/unpublishedScripts/DomainContent/Home/dressingRoom/wrapper.js index 55435b0b3a..b3280ca8ef 100644 --- a/unpublishedScripts/DomainContent/Home/dressingRoom/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/dressingRoom/wrapper.js @@ -15,7 +15,7 @@ dynamic: true, gravity: { x: 0, - y: -5, + y: -10, z: 0 }, visible: true, diff --git a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js index 2799e8bf6f..cf51678c68 100644 --- a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js @@ -99,7 +99,7 @@ Plant = function(spawnPosition, spawnRotation) { dynamic: true, gravity: { x: 0.0, - y: -2.0, + y: -10.0, z: 0 }, velocity: { diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/books.json b/unpublishedScripts/DomainContent/Home/kineticObjects/books.json index ced3901eb1..d746b6293b 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/books.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/books.json @@ -2,7 +2,7 @@ "Entities": [{ "gravity": { "x": 0, - "y": -7, + "y": -10, "z": 0 }, "userData": "{\"hifiHomeKey\":{\"reset\":true}}", diff --git a/unpublishedScripts/DomainContent/Home/misc/avatarCatcher.js b/unpublishedScripts/DomainContent/Home/misc/avatarCatcher.js new file mode 100644 index 0000000000..a15b667a8a --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/misc/avatarCatcher.js @@ -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(); +}); \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js b/unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js index e160b67a45..3ade768bfd 100644 --- a/unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js +++ b/unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js @@ -35,7 +35,7 @@ var PING_PONG_GUN_GRAVITY = { x: 0, - y: -5, + y: -10, z: 0 }; diff --git a/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js b/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js index 42f48615a0..93544e5113 100644 --- a/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js @@ -29,7 +29,7 @@ HomePingPongGun = function(spawnPosition, spawnRotation) { }, gravity: { x: 0, - y: -3, + y: -10, z: 0 }, rotation: Quat.fromPitchYawRollDegrees(spawnRotation.x, spawnRotation.y, spawnRotation.z), diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js index 6f9a396ae5..552b8da3a1 100644 --- a/unpublishedScripts/DomainContent/Home/reset.js +++ b/unpublishedScripts/DomainContent/Home/reset.js @@ -250,14 +250,14 @@ var stuffOnShelves = new StuffOnShelves({ x: 1105.9432, - y: 461.1020, + y: 461.095, z: -80.7894 }); var junk = new HomeJunk({ - x: 1102.8754, - y: 460.2932, - z: -69.0222 + x: 1102.5861, + y: 460.1812, + z: -69.5005 }); var trashcan = new Trashcan({ @@ -323,7 +323,7 @@ }), position: { x: 1106.9778, - y: 460.6075, + y: 460.3075, z: -74.5842 }, userData: JSON.stringify({ @@ -343,7 +343,7 @@ var DAIS_DIMENSIONS = { x: 1.0654, - y: 0.4679, + y: 0.1695, z: 1.0654 }; diff --git a/unpublishedScripts/DomainContent/Home/tiltMaze/wrapper.js b/unpublishedScripts/DomainContent/Home/tiltMaze/wrapper.js index 95a673a256..6f6d497bc7 100644 --- a/unpublishedScripts/DomainContent/Home/tiltMaze/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/tiltMaze/wrapper.js @@ -83,7 +83,7 @@ TiltMaze = function(spawnPosition, spawnRotation) { var MAZE_ANGULAR_DAMPING = 0.6; var MAZE_GRAVITY = { x: 0, - y: -3, + y: -10, z: 0 }; diff --git a/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js b/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js index ede17c0760..c6f259e718 100644 --- a/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js @@ -112,7 +112,7 @@ Whiteboard = function(spawnPosition, spawnRotation) { dynamic: true, gravity: { x: 0, - y: -1, + y: -10, z: 0 }, velocity: { @@ -195,7 +195,7 @@ Whiteboard = function(spawnPosition, spawnRotation) { dynamic: true, gravity: { x: 0, - y: -1, + y: -10, z: 0 }, velocity: {