From 46aebabd9b2330567dc89feca3f57a1ed42a0e66 Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Mon, 22 Feb 2016 17:54:45 -0800
Subject: [PATCH] switch branches

---
 .../Scripts/zoomAndMoveRandomly.js            | 20 ++++++-------------
 .../CellScience/importCellScience.js          | 10 +++++-----
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/zoomAndMoveRandomly.js b/unpublishedScripts/DomainContent/CellScience/Scripts/zoomAndMoveRandomly.js
index 703c4ead33..dd6a48c617 100644
--- a/unpublishedScripts/DomainContent/CellScience/Scripts/zoomAndMoveRandomly.js
+++ b/unpublishedScripts/DomainContent/CellScience/Scripts/zoomAndMoveRandomly.js
@@ -38,8 +38,8 @@
         this.initTimeout = null;
         this.minVelocity = 1;
         this.maxVelocity = 5;
-        this.minAngularVelocity = 0.01;
-        this.maxAngularVelocity = 0.03;
+        this.minAngularVelocity = 0.03;
+        this.maxAngularVelocity = 0.10;
         baton = virtualBaton({
             batonName: 'io.highfidelity.cells:' + entityID, // One winner for each entity
         });
@@ -69,7 +69,7 @@
             };
 
             self.teleportSound = SoundCache.getSound("https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/Audio/whoosh.wav");
-            // print(" portal destination is " + self.portalDestination);
+
         }
     }
 
@@ -81,13 +81,6 @@
             print("Teleporting to (" + data.location.x + ", " + data.location.y + ", " + data.location.z + ")");
 
             MyAvatar.position = data.location;
-
-            // if (data.hasOwnProperty('entryPoint') && data.hasOwnProperty('target')) {
-            //     this.lookAtTarget(data.entryPoint, data.target);
-            // }
-            // else{
-
-            // }
         }
 
     }
@@ -143,11 +136,11 @@
     }
 
     this.getTotalWait = function() {
-        return (Math.random() * 5000) * 2;
+        return (Math.random() * 5000) * 3;
     }
 
     this.move = function() {
-        if (self.iOwn===false) {
+        if (self.iOwn === false) {
             print('cell is not owned by me...')
             return;
         }
@@ -159,9 +152,8 @@
             y: Math.random() - 0.5,
             z: Math.random() - 0.5
         };
-        print("ROT magnitude is " + magnitudeAV + " and direction is " + directionAV.x);
+        // print("ROT magnitude is " + magnitudeAV + " and direction is " + directionAV.x);
         Entities.editEntity(self.entityId, {
-            // velocity: Vec3.multiply(magnitudeV, Vec3.normalize(directionV)),
             angularVelocity: Vec3.multiply(magnitudeAV, Vec3.normalize(directionAV))
 
         });
diff --git a/unpublishedScripts/DomainContent/CellScience/importCellScience.js b/unpublishedScripts/DomainContent/CellScience/importCellScience.js
index 4ae5e5de36..25323495d1 100644
--- a/unpublishedScripts/DomainContent/CellScience/importCellScience.js
+++ b/unpublishedScripts/DomainContent/CellScience/importCellScience.js
@@ -5,7 +5,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var version = 1055;
+var version = 1057;
 var cellLayout;
 var baseLocation = "https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/";
 
@@ -103,16 +103,16 @@ var scenes = [{
     instances: [{
         model: "Cell",
         dimensions: {
-            x: 550,
-            y: 620,
-            z: 550
+            x: 500,
+            y: 570,
+            z: 500
         },
         offset: {
             x: 0,
             y: 0,
             z: 0
         },
-        radius: 500,
+        radius: 450,
         number: 10,
         userData: JSON.stringify({
             entryPoint: locations.cellLayout[1],