Tweens added to a Timeline use that for the timescale

Author: photonstorm

v3/src/tween/timeline/Timeline.js

@@ -10,6 +10,8 @@ var Timeline = new Class({
     {
         this.manager = manager;
 
+        this.isTimeline = true;
+
         //  An array of Tween objects, each containing a unique property and target being tweened.
         this.data = [];
 

v3/src/tween/tween/Tween.js

@@ -5,12 +5,12 @@ var Tween = new Class({
 
     initialize:
 
-    function Tween (manager, data)
+    function Tween (parent, data)
     {
-        this.manager = manager;
+        this.parent = parent;
 
-        //  If the Tween is part of a timeline this tells us which one
-        this.timeline = null;
+        //  Is the parent of this Tween a Timeline?
+        this.parentIsTimeline = parent.hasOwnProperty('isTimeline');
 
         //  An array of TweenData objects, each containing a unique property and target being tweened.
         this.data = data;

v3/src/tween/tween/components/Init.js

@@ -24,10 +24,8 @@ var Init = function ()
     this.progress = 0;
     this.totalProgress = 0;
 
-    // console.log('Tween duration', this.duration, 'totalDuration', this.totalDuration);
-
     //  You can't have a paused Tween if it's part of a Timeline
-    if (this.paused && !this.timeline)
+    if (this.paused && !this.parentIsTimeline)
     {
         this.state = TWEEN_CONST.PAUSED;
 

v3/src/tween/tween/components/Play.js

@@ -7,7 +7,7 @@ var Play = function (resetFromTimeline)
         return;
     }
 
-    if (this.timeline)
+    if (this.parentIsTimeline)
     {
         this.resetTweenData(resetFromTimeline);
 
@@ -26,7 +26,7 @@ var Play = function (resetFromTimeline)
     {
         this.paused = false;
 
-        this.manager.makeActive(this);
+        this.parent.makeActive(this);
 
         return;
     }

v3/src/tween/tween/components/Update.js

@@ -12,7 +12,7 @@ var Update = function (timestamp, delta)
 
     if (this.useFrames)
     {
-        delta = 1 * this.manager.timeScale;
+        delta = 1 * this.parent.timeScale;
     }
 
     delta *= this.timeScale;