Merge branch 'master' of https://github.com/photonstorm/phaser

Author: photonstorm

src/gameobjects/pathfollower/PathFollower.js

@@ -23,6 +23,7 @@ var Vector2 = require('../../math/Vector2');
  * @property {boolean} [positionOnPath=false] - Whether to position the PathFollower on the Path using its path offset.
  * @property {boolean} [rotateToPath=false] - Should the PathFollower automatically rotate to point in the direction of the Path?
  * @property {number} [rotationOffset=0] - If the PathFollower is rotating to match the Path, this value is added to the rotation value. This allows you to rotate objects to a path but control the angle of the rotation as well.
+ * @property {number} [startAt=0] - Current start position of the path follow, between 0 and 1.
  */
 
 /**
@@ -245,6 +246,7 @@ var PathFollower = new Class({
         //  Override in case they've been specified in the config
         config.from = 0;
         config.to = 1;
+        config.startAt = startAt;
 
         //  Can also read extra values out of the config:
 

src/physics/arcade/StaticBody.js

@@ -788,10 +788,21 @@ var StaticBody = new Class({
     {
         var pos = this.position;
 
+        var x = pos.x + this.halfWidth;
+        var y = pos.y + this.halfHeight;
+
         if (this.debugShowBody)
         {
             graphic.lineStyle(1, this.debugBodyColor, 1);
-            graphic.strokeRect(pos.x, pos.y, this.width, this.height);
+            if (this.isCircle)
+            {
+                graphic.strokeCircle(x, y, this.width / 2);
+            }
+            else
+            {
+                graphic.strokeRect(pos.x, pos.y, this.width, this.height);
+            }
+
         }
     },
 

src/tweens/builders/NumberTweenBuilder.js

@@ -45,6 +45,7 @@ var NumberTweenBuilder = function (parent, config, defaults)
 
     var from = GetValue(config, 'from', 0);
     var to = GetValue(config, 'to', 1);
+    var current = GetValue(config, 'startAt', from);
 
     var targets = [ { value: from } ];
 
@@ -78,7 +79,7 @@ var NumberTweenBuilder = function (parent, config, defaults)
     );
 
     tweenData.start = from;
-    tweenData.current = from;
+    tweenData.current = current;
     tweenData.to = to;
 
     data.push(tweenData);

src/tweens/tween/Tween.js

@@ -1208,6 +1208,10 @@ var Tween = new Class({
                     tweenData.state = TWEEN_CONST.COMPLETE;
                     break;
                 }
+                
+                if (!tweenData.elapsed && tweenData.current) {
+                    tweenData.elapsed = tweenData.duration * tweenData.current;
+                }
 
                 var elapsed = tweenData.elapsed;
                 var duration = tweenData.duration;
@@ -1319,7 +1323,7 @@ var Tween = new Class({
 
                     tweenData.end = tweenData.getEndValue(tweenData.target, tweenData.key, tweenData.start);
 
-                    tweenData.current = tweenData.start;
+                    tweenData.current = tweenData.current || tweenData.start;
 
                     tweenData.target[tweenData.key] = tweenData.start;