Merge pull request #6509 from ericrius1/toyboxFixes

Toybox Tweaking

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",
+                        // Providing actual model fbx for animation used to work, now contorts doll into a weird ball
-                        currentFrame: 0
+                        // See bug:  https://app.asana.com/0/26225263936266/70097355490098
+                        // url: "http://hifi-public.s3.amazonaws.com/models/Bboys/bboy2/bboy2.fbx",
+                        running: false,
                     }
                 });
 

unpublishedScripts/hiddenEntityReset.js

@@ -132,11 +132,12 @@
             createLights();
 
             createCat({
-                x: 551.09,
+                x: 551.0,
-                y: 494.98,
+                y: 495.3,
-                z: 503.49
+                z: 503.3
             });
 
+
             createSprayCan({
                 x: 549.7,
                 y: 495.6,
@@ -1187,7 +1188,7 @@
                 shapeType: 'box',
                 gravity: {
                     x: 0,
-                    y: -0.5,
+                    y: -3.0,
                     z: 0
                 },
                 velocity: {

unpublishedScripts/masterReset.js

@@ -110,9 +110,9 @@ MasterReset = function() {
 
 
         createCat({
-            x: 551.09,
+            x: 551.0,
-            y: 494.98,
+            y: 495.3,
-            z: 503.49
+            z: 503.3
         });
 
         createSprayCan({
@@ -1168,7 +1168,7 @@ MasterReset = function() {
             shapeType: 'box',
             gravity: {
                 x: 0,
-                y: -0.5,
+                y: -3.0,
                 z: 0
             },
             velocity: {