diff --git a/spine-as3/spine-as3-example/lib/spine-as3.swc b/spine-as3/spine-as3-example/lib/spine-as3.swc index 4785ad20e..ebb40784b 100644 Binary files a/spine-as3/spine-as3-example/lib/spine-as3.swc and b/spine-as3/spine-as3-example/lib/spine-as3.swc differ diff --git a/spine-as3/spine-as3/src/spine/animation/AnimationState.as b/spine-as3/spine-as3/src/spine/animation/AnimationState.as index f677ec27b..2560feda9 100644 --- a/spine-as3/spine-as3/src/spine/animation/AnimationState.as +++ b/spine-as3/spine-as3/src/spine/animation/AnimationState.as @@ -478,9 +478,9 @@ package spine.animation { if (last.loop) delay += duration * (1 + (int)(last.trackTime / duration)); else - delay += duration; + delay += Math.max(duration, last.trackTime); } else - delay = 0; + delay = last.trackTime; } } diff --git a/spine-starling/spine-starling-example/lib/spine-as3.swc b/spine-starling/spine-starling-example/lib/spine-as3.swc index 4785ad20e..ebb40784b 100644 Binary files a/spine-starling/spine-starling-example/lib/spine-as3.swc and b/spine-starling/spine-starling-example/lib/spine-as3.swc differ diff --git a/spine-starling/spine-starling-example/src/spine/examples/OwlExample.as b/spine-starling/spine-starling-example/src/spine/examples/OwlExample.as index 8012c34b6..5f9fe845a 100644 --- a/spine-starling/spine-starling-example/src/spine/examples/OwlExample.as +++ b/spine-starling/spine-starling-example/src/spine/examples/OwlExample.as @@ -52,7 +52,7 @@ package spine.examples { up = skeleton.state.setAnimationByName(4, "up", true); down = skeleton.state.setAnimationByName(5, "down", true); - left.alpha = right.alpha = up.alpha = down.alpha = 0; + left.alpha = right.alpha = up.alpha = down.alpha = 0; left.mixBlend = right.mixBlend = up.mixBlend = down.mixBlend = MixBlend.add; skeleton.state.timeScale = 0.5; diff --git a/spine-starling/spine-starling/lib/spine-as3.swc b/spine-starling/spine-starling/lib/spine-as3.swc index 4785ad20e..ebb40784b 100644 Binary files a/spine-starling/spine-starling/lib/spine-as3.swc and b/spine-starling/spine-starling/lib/spine-as3.swc differ