UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 22:34:53 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,318 Commits 17 Branches 33 Tags
Commit Graph

2318 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
badlogic
74f239e5b8 Merge branch 'spine-ts-3.5' into spine-3.5 2016-10-20 13:15:42 +02:00
badlogic
390d1e6cae Merge branch 'dev' into spine-ts-3.5 2016-10-20 13:14:45 +02:00
badlogic
360c1de38f Merge branch 'spine-lua-3.5' into spine-3.5 2016-10-20 13:14:19 +02:00
badlogic
03070b9604 Merge branch 'dev' into spine-lua-3.5 2016-10-20 13:13:43 +02:00
badlogic
7460418885 Merge branch 'spine-c-3.5' into spine-3.5 2016-10-20 13:13:19 +02:00
badlogic
6bc695effe Merge branch 'dev' into spine-c-3.5 2016-10-20 13:12:31 +02:00
badlogic
552db5823f Merge branch 'spine-3.5' into spine-as3-3.5 2016-10-20 13:11:57 +02:00
badlogic
c4b732e98d [corona] Updated Corona sample data 2016-10-20 13:10:50 +02:00
badlogic
1f669462b0 [lua][love] Finished porting 3.5 2016-10-20 13:07:13 +02:00
badlogic
5ad083b84f [lua] updated exports 2016-10-20 12:52:25 +02:00
NathanSweet
5994c65e51 Merge remote-tracking branch 'origin/dev' into dev 2016-10-19 22:43:50 +02:00
NathanSweet
e084f7c745 Removed crossfade "dip" fix. 
It worked by applying the mixing from timeline with full alpha, then mix the higher timeline. It wasn't good since it would blow away any pose from before the mixing from timeline.
 2016-10-19 22:43:41 +02:00
NathanSweet
5cd29e55df AnimationState, mixing from multiple animations. 
#621
 2016-10-19 22:36:04 +02:00
badlogic
7b093dad40 [lua] Added TransformMode enum 2016-10-19 15:21:55 +02:00
badlogic
7cd0cd5fde [lua] First pass on 3.5 update, only Skeleton:updateCache and updateWorldTransform missing 2016-10-19 15:21:10 +02:00
badlogic
389ad8f7f0 Merge branch 'dev' into spine-ts-3.5 2016-10-19 14:37:04 +02:00
badlogic
f5b2c87cbc Merge branch 'dev' into spine-c-3.5 2016-10-19 14:36:26 +02:00
badlogic
58f0eb5dfc Merge branch 'dev' into spine-as3-3.5 2016-10-19 14:35:48 +02:00
badlogic
ee9d202538 [c] Updated noRotationOrReflection math 2016-10-19 14:35:23 +02:00
badlogic
a19d8fbd16 [ts] Updated noRotationOrReflection math 2016-10-19 14:23:45 +02:00
badlogic
fdbe5fdbde [as3] Updated noRotationOrReflection math 2016-10-19 14:19:17 +02:00
badlogic
a5e05c3e06 Merge branch 'master' into dev 2016-10-19 13:11:31 +02:00
NathanSweet
f92e770bb1 noRotationOrReflection simplification. 2016-10-19 13:06:27 +02:00
badlogic
2e04c98b9e [c] Fixed binary loader 2016-10-19 12:54:47 +02:00
badlogic
fc373f9791 [c] Fixed yDown behaviour in Bone, fixed spSkeleton_updateCache. 2016-10-19 12:46:58 +02:00
badlogic
f41790af99 Merge branch 'master' of https://github.com/esotericsoftware/spine-runtimes 2016-10-19 12:01:07 +02:00
badlogic
69889d8a07 [c] Fixes compilation in VS201x 2016-10-19 12:00:59 +02:00
pharan
3bcf399227 [unity] Added some multi-editing support. 2016-10-19 09:04:10 +08:00
badlogic
5a6aa972ec [c] Ported 3.5 changes, bit broken in Skeleton#updateCache 2016-10-18 16:35:26 +02:00
badlogic
6f08b5650d [runtimes] Updated samples 2016-10-18 13:59:22 +02:00
badlogic
a80903ac14 [as3][starling] Updated spine-as3.swc 2016-10-17 16:55:58 +02:00
badlogic
8b327f3d54 [as3][starling] Updated to 3.5, path constraint may still have an issue, see stretchyman 2016-10-17 16:49:51 +02:00
badlogic
9197f6f0f7 [ts] Fixed bug in IkConstraint 2016-10-17 15:23:59 +02:00
badlogic
6629a7d332 [lua] Fixed type in SkeletonJson.lua 2016-10-17 14:20:36 +02:00
badlogic
71702a451a [ts] Updated spine-ts build 2016-10-17 14:16:30 +02:00
badlogic
ab226ab681 [runtimes] re-exported examples with Spine 3.5.03-beta 2016-10-17 14:08:00 +02:00
badlogic
bf5f0d808e [ts] Updated to 3.5, constraint order from export, applied bone attributes. Changes to Animation and AnimationState have not been ported yet 2016-10-17 13:48:12 +02:00
John
92236380c0 [unity] Fix backwards json check. 2016-10-17 18:50:57 +08:00
badlogic
02130d242e [runtimes] Updated examples to beta exports 2016-10-17 12:48:15 +02:00
NathanSweet
97756d6921 Added version placeholder for building JAR. 2016-10-17 11:27:36 +02:00
NathanSweet
257e72de11 Added version placeholder for building JAR. 2016-10-17 11:24:13 +02:00
NathanSweet
92f91bae58 Simplified noRotationOrReflection. 2016-10-16 12:48:32 +02:00
NathanSweet
3a3f0cc2f4 Whitespace. 2016-10-16 00:32:34 +02:00
NathanSweet
583dbee7ad Merge branch 'master' into dev 2016-10-16 00:31:10 +02:00
NathanSweet
4a8d02a144 Cleaned up contribution comments. 2016-10-16 00:25:08 +02:00
NathanSweet
0df3eea08b Added some missing license header comments. 2016-10-16 00:19:26 +02:00
NathanSweet
b42f1b9b94 Removed mystery question mark. 2016-10-16 00:07:32 +02:00
pharan
2f0d80f0dc [unity] Fixed stray character. 2016-10-16 06:03:42 +08:00
NathanSweet
15015a12e0 Merge branch 'master' into dev 
# Conflicts:
#	spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/AnimationStateTest.java
#	spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/BoneData.java
 2016-10-15 23:50:01 +02:00
NathanSweet
3bfe462534 Fixed local rotation when inherit rotation is disabled. 2016-10-15 23:47:33 +02:00