Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration

Conflicts:
	js/helper-classes/RDGE/GLWorld.js
	js/helper-classes/RDGE/Materials/PulseMaterial.js
	js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
	js/helper-classes/RDGE/src/tools/rdge-compiled.js
	js/preloader/Preloader.js

1 files changed, 268 insertions, 57 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 62688825..fddfd170 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -10,10 +10,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     },
 
     _trackID:{
-        value:null,
-        writable:true,
         serializable:true,
-        enumerable:true
+        value:null
     },
 
     trackID:{
@@ -85,21 +83,116 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             }
         }
     },
-
-    _tweens:{
+    
+    _arrStyleTracks : {
+        serializable:true,
+        enumerable:true,
+        value: []
+    },
+    arrStyleTracks: {
+        serializable:true,
+        enumerable:true,
+        get: function() {
+                return this._arrStyleTracks;
+        },
+        set: function(newVal) {
+                this._arrStyleTracks = newVal;
+                this.needsDraw = true;
+        }
+    },
+    _styleTracksRepetition: {
+        serializable: true,
+        value: null
+    },
+    styleTracksRepetition : {
+        serializable: true,
+        get: function() {
+                return this._styleTracksRepetition;
+        },
+        set: function(newVal) {
+                this._styleTracksRepetition = newVal;
+                this.needsDraw = true;
+        }
+    },
+    
+    /* Position Property Tracks */
+    _arrPositionTracks : {
+        serializable:true,
+        enumerable:true,
+        value: []
+    },
+    arrPositionTracks: {
+        serializable:true,
+        enumerable:true,
+        get: function() {
+                return this._arrPositionTracks;
+        },
+        set: function(newVal) {
+                this._arrPositionTracks = newVal;
+                this.needsDraw = true;
+        }
+    },
+    _positionTracksRepetition: {
+        serializable: true,
+        value: null
+    },
+    positionTracksRepetition : {
+        serializable: true,
+        get: function() {
+                return this._positionTracksRepetition;
+        },
+        set: function(newVal) {
+                this._positionTracksRepetition = newVal;
+                this.needsDraw = true;
+        }
+    },
+    
+    
+    /* Transform Property Tracks */
+    _arrTransformTracks : {
         serializable:true,
         enumerable:true,
+        value: []
+    },
+    arrTransformTracks: {
+        serializable:true,
+        enumerable:true,
+        get: function() {
+                return this._arrTransformTracks;
+        },
+        set: function(newVal) {
+                this._arrTransformTracks = newVal;
+                this.needsDraw = true;
+        }
+    },
+    _transformTracksRepetition: {
+        serializable: true,
+        value: null
+    },
+    transformTracksRepetition : {
+        serializable: true,
+        get: function() {
+                return this._transformTracksRepetition;
+        },
+        set: function(newVal) {
+                this._transformTracksRepetition = newVal;
+                this.needsDraw = true;
+        }
+    },
+
+    _tweens:{
+        enumerable: false,
         value:[]
     },
 
     tweens:{
         serializable:true,
-        enumerable:true,
         get:function () {
-            return this._spans;
+            return this._tweens;
         },
         set:function (newVal) {
-            this._spans = newVal;
+            this._tweens = newVal;
+            this.needsDraw=true;
         }
     },
 
@@ -118,14 +211,51 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         }
     },
 
+    _trackDuration:{
+        serializable: true,
+        value:0
+    },
+
     trackDuration:{
+        serializable:true,
+        get:function () {
+            return this._trackDuration;
+        },
+        set:function (val) {
+            this._trackDuration = val;
+        }
+    },
+
+    _trackPosition:{
+        serializable:true,
         value:0
     },
 
-    currentKeyframeRule:{
+    trackPosition:{
+        serializable:true,
+        get:function () {
+            return this._trackPosition;
+        },
+        set:function (val) {
+            this._trackPosition = val;
+        }
+    },
+
+    _currentKeyframeRule:{
+        serializable: true,
         value:null
     },
 
+    currentKeyframeRule:{
+        serializable: true,
+        get:function(){
+            return this._currentKeyframeRule;
+        },
+        set:function(val){
+            this._currentKeyframeRule = val;
+        }
+    },
+
     nextKeyframe:{
         value:1
     },
@@ -134,14 +264,23 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         value:0
     },
 
-    isAnimated:{
-        value:false
+    _isTrackAnimated:{
+        serializable: true,
+        value:null
+    },
+
+    isTrackAnimated:{