浏览代码

Merge branch '3.6' into 3.7-beta

badlogic 8 年之前
父节点
当前提交
8ad5ea0c46

二进制
spine-as3/spine-as3-example/lib/spine-as3.swc


+ 1 - 1
spine-as3/spine-as3/src/spine/Bone.as

@@ -192,7 +192,7 @@ package spine {
 					this.b = za * lb + zb * ld;
 					this.c = zc * la + zd * lc;
 					this.d = zc * lb + zd * ld;
-					if (this.data.transformMode != TransformMode.noScaleOrReflection ? pa * pd - pb * pc < 0 : skeleton.flipX != skeleton.flipY) {
+					if (this.data.transformMode != TransformMode.noScaleOrReflection ? pa * pd - pb * pc < 0 : this.skeleton.flipX != this.skeleton.flipY) {
 						this.b = -this.b;
 						this.d = -this.d;
 					}

+ 2 - 0
spine-as3/spine-as3/src/spine/Vertex.as

@@ -39,5 +39,7 @@ package spine {
 		public var v : Number;
 		public var light : Color = new spine.Color(0, 0, 0);
 		public var dark : Color = new spine.Color(0, 0, 0);
+		
+		function Vertex() { }
 	}
 }

二进制
spine-starling/spine-starling-example/lib/spine-as3.swc


二进制
spine-starling/spine-starling/lib/spine-as3.swc