Merge branch 'refs/heads/NINJA-master' into TimelineUber

Conflicts:
	js/panels/Timeline/DragDrop.js
	js/panels/Timeline/Keyframe.reel/Keyframe.js
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
	js/panels/Timeline/Span.reel/Span.js
	js/panels/Timeline/Style.reel/Style.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
	js/panels/Timeline/Track.reel/Track.html
	js/panels/Timeline/Track.reel/Track.js
	js/panels/Timeline/Track.reel/css/Track.css
	js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
	js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
	js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
	js/panels/Timeline/Tween.reel/Tween.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

33 files changed, 12613 insertions, 12580 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/MeshManager.js b/js/helper-classes/RDGE/src/core/script/MeshManager.js
index 768b7213..4ff95cc4 100755
--- a/js/helper-classes/RDGE/src/core/script/MeshManager.js
+++ b/js/helper-classes/RDGE/src/core/script/MeshManager.js
@@ -1,247 +1,248 @@
-/* <copyright>

-Copyright (c) 2012, Motorola Mobility, Inc

-All Rights Reserved.

-BSD License.

-

-Redistribution and use in source and binary forms, with or without

-modification, are permitted provided that the following conditions are met:

-

-  - Redistributions of source code must retain the above copyright notice,

-    this list of conditions and the following disclaimer.

-  - Redistributions in binary form must reproduce the above copyright

-    notice, this list of conditions and the following disclaimer in the

-    documentation and/or other materials provided with the distribution.

-  - Neither the name of Motorola Mobility nor the names of its contributors

-    may be used to endorse or promote products derived from this software

-    without specific prior written permission.

-

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE

-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

-POSSIBILITY OF SUCH DAMAGE.

-</copyright> */

-

-// RDGE namespaces

-var RDGE = RDGE || {};

-

-RDGE.Model = function (name, mesh) {

-    this.name = name;

-    this.mesh = mesh;

-    this.camera = null;

-};

-

-/*

- *      Maintains a list of meshes to allow instancing of data

- */

-RDGE.MeshManager = function () {

-    this.contentUrl                                     = "assets_web/mesh/";

-    this.modelMap                                       = {};

-    this.readyList                                      = [];           // meshes that have data ready

-    this.meshesLoading                          = true;         // indicates that no meshes have loaded or that they are still loading

-    this.postMeshLoadCallbackList       = [];

-    this.tempSphere                                     = null;

-    this.requestCounter                         = 0;

-};

-

-/*

- * Pass the scene meshNode stump, loads temp object while real mesh is downloading

- */

-RDGE.MeshManager.prototype.loadMesh = function (meshStump, tempMesh) {

-    // if it exists already, return the mesh requested

-    if ( this.modelMap[meshStump.name] !== undefined )

-        return this.modelMap[meshStump.name];

-

-    meshStump.ready = false;

-    meshStump.addr = this.contentUrl + meshStump.name + "_mesh.json";

-    meshStump.ctxID = RDGE.globals.engine.getContext().renderer.id;

-

-        // sets a temp mesh up in place of the final mesh to load

-    if (!tempMesh) {

-        if (this.tempSphere == null) {

-            this.tempSphere = RDGE.renderUtils.makeSphere(RDGE.globals.engine.getContext().renderer.ctx, 25, 5, 5);

-        }

-

-        tempMesh = this.tempSphere;

-    }

-

-        // add the temp mesh to the map of loaded meshes

-    this.modelMap[meshStump.name] = tempMesh;

-    

-    // update the request counter - we now have one more mesh to load

-    this.requestCounter++;

-

-    RDGE.requestMesh(meshStump);

-

-    return null;

-};

-

-/*

- * Deletes the passed mesh from the manager as well as all renderers

- */

-RDGE.MeshManager.prototype.deleteMesh = function (name) {

-        var model = this.modelMap[name];

-        

-    if (model) {

-        RDGE.globals.engine.ctxMan.forEach(function (context) {

-                        context.renderer.deletePrimitive(model.primitive);

-                });

+/* <copyright>
+Copyright (c) 2012, Motorola Mobility LLC.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+</copyright> */
+
+// RDGE namespaces
+var RDGE = RDGE || {};
+
+RDGE.Model = function (name, mesh) {
+    this.name = name;
+    this.mesh = mesh;
+    this.camera = null;
+};
+
+/*
+ *  Maintains a list of meshes to allow instancing of data
+ */
+RDGE.MeshManager = function () {
+    this.contentUrl                 = "assets_web/mesh/";
+    this.modelMap                   = {};
+    this.readyList                  = [];       // meshes that have data ready
+    this.meshesLoading              = true;     // indicates that no meshes have loaded or that they are still loading
+    this.postMeshLoadCallbackList   = [];
+    this.tempSphere                 = null;
+    this.requestCounter             = 0;
+};
+
+/*
+ * Pass the scene meshNode stump, loads temp object while real mesh is downloading
+ */
+RDGE.MeshManager.prototype.loadMesh = function (meshStump, tempMesh) {
+    // if it exists already, return the mesh requested
+    if ( this.modelMap[meshStump.name] !== undefined )
+        return this.modelMap[meshStump.name];
+
+    meshStump.ready = false;
+    meshStump.addr = this.contentUrl + meshStump.name + "_mesh.json";
+    meshStump.ctxID = RDGE.globals.engine.getContext().renderer.id;
+
+    // sets a temp mesh up in place of the final mesh to load
+    if (!tempMesh) {
+        if (this.tempSphere == null) {
+            this.tempSphere = RDGE.renderUtils.makeSphere(RDGE.globals.engine.getContext().renderer.ctx, 25, 5, 5);
+        }
+
+        tempMesh = this.tempSphere;
+    }
+
+    // add the temp mesh to the map of loaded meshes
+    this.modelMap[meshStump.name] = tempMesh;
+
+    // update the request counter - we now have one more mesh to load
+    this.requestCounter++;
+
+    RDGE.requestMesh(meshStump);
+
+    return null;
+};
+
+/*
+ * Deletes the passed mesh from the manager as well as all renderers
+ */
+RDGE.MeshManager.prototype.deleteMesh = function (name) {
+    var model = this.modelMap[name];
+
+    if (model) {
+        RDGE.globals.engine.ctxMan.forEach(function (context) {
+            context.renderer.deletePrimitive(model.primitive);