From d80bfc0af615d23449bc884f4898b11ac4e43358 Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Tue, 1 Dec 2015 09:41:04 -0800
Subject: [PATCH 1/3] more gravity for spraycan

---
 unpublishedScripts/hiddenEntityReset.js | 2 +-
 unpublishedScripts/masterReset.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js
index e54be00761..d18b717f7e 100644
--- a/unpublishedScripts/hiddenEntityReset.js
+++ b/unpublishedScripts/hiddenEntityReset.js
@@ -1134,7 +1134,7 @@
                 shapeType: 'box',
                 gravity: {
                     x: 0,
-                    y: -0.5,
+                    y: -3.0,
                     z: 0
                 },
                 velocity: {
diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js
index 4700126e97..185cf4217e 100644
--- a/unpublishedScripts/masterReset.js
+++ b/unpublishedScripts/masterReset.js
@@ -1114,7 +1114,7 @@ MasterReset = function() {
             shapeType: 'box',
             gravity: {
                 x: 0,
-                y: -0.5,
+                y: -3.0,
                 z: 0
             },
             velocity: {

From a3f8c52aa39e518d7d8c2d3d2da7fab5159827d3 Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Tue, 1 Dec 2015 10:09:29 -0800
Subject: [PATCH 2/3] temp fix for doll, moved cat

---
 examples/toybox/doll/doll.js            | 14 ++++++--------
 unpublishedScripts/hiddenEntityReset.js |  7 ++++---
 unpublishedScripts/masterReset.js       |  6 +++---
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/examples/toybox/doll/doll.js b/examples/toybox/doll/doll.js
index 577f86cae2..c8cfbfb72f 100644
--- a/examples/toybox/doll/doll.js
+++ b/examples/toybox/doll/doll.js
@@ -36,14 +36,10 @@
             Entities.editEntity(this.entityID, {
                 animation: {
                     url: "https://hifi-public.s3.amazonaws.com/models/Bboys/zombie_scream.fbx",
-                    currentFrame: 0
+                    running: true
                 }
             });
 
-            Entities.editEntity(_this.entityID, {
-                animationIsPlaying: true
-            });
-
             var position = Entities.getEntityProperties(this.entityID, "position").position;
             this.audioInjector = Audio.playSound(this.screamSounds[randInt(0, this.screamSounds.length)], {
                 position: position,
@@ -67,8 +63,10 @@
                 this.audioInjector.stop();
                 Entities.editEntity(this.entityID, {
                     animation: {
-                        url: "http://hifi-public.s3.amazonaws.com/models/Bboys/bboy2/bboy2.fbx",
-                        currentFrame: 0
+                        // Providing actual model fbx for animation used to work, now contorts doll into a weird ball
+                        // See bug: 
+                        // url: "http://hifi-public.s3.amazonaws.com/models/Bboys/bboy2/bboy2.fbx",
+                        running: false,
                     }
                 });
 
@@ -82,4 +80,4 @@
     };
     // entity scripts always need to return a newly constructed object of our type
     return new Doll();
-});
+});
\ No newline at end of file
diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js
index d18b717f7e..9518a6ad45 100644
--- a/unpublishedScripts/hiddenEntityReset.js
+++ b/unpublishedScripts/hiddenEntityReset.js
@@ -125,11 +125,12 @@
             createLights();
 
             createCat({
-                x: 551.09,
-                y: 494.98,
-                z: 503.49
+                x: 551.0,
+                y: 495.3,
+                z: 503.3
             });
 
+
             createSprayCan({
                 x: 549.7,
                 y: 495.6,
diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js
index 185cf4217e..03ee110d7a 100644
--- a/unpublishedScripts/masterReset.js
+++ b/unpublishedScripts/masterReset.js
@@ -102,9 +102,9 @@ MasterReset = function() {
 
 
         createCat({
-            x: 551.09,
-            y: 494.98,
-            z: 503.49
+            x: 551.0,
+            y: 495.3,
+            z: 503.3
         });
 
 

From b787e7158785000c6d954406c54fc781d322beef Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Tue, 1 Dec 2015 13:06:30 -0800
Subject: [PATCH 3/3] Update doll.js

---
 examples/toybox/doll/doll.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/toybox/doll/doll.js b/examples/toybox/doll/doll.js
index c8cfbfb72f..04712f0e1d 100644
--- a/examples/toybox/doll/doll.js
+++ b/examples/toybox/doll/doll.js
@@ -64,7 +64,7 @@
                 Entities.editEntity(this.entityID, {
                     animation: {
                         // Providing actual model fbx for animation used to work, now contorts doll into a weird ball
-                        // See bug: 
+                        // See bug:  https://app.asana.com/0/26225263936266/70097355490098
                         // url: "http://hifi-public.s3.amazonaws.com/models/Bboys/bboy2/bboy2.fbx",
                         running: false,
                     }
@@ -80,4 +80,4 @@
     };
     // entity scripts always need to return a newly constructed object of our type
     return new Doll();
-});
\ No newline at end of file
+});