2341 Commits

Author SHA1 Message Date
badlogic
969ae94f9d [ts] Finished porting new AnimationState, works as intended 2016-10-25 11:26:14 +02:00
NathanSweet
3d9ee5a743 Removed some locals when used <= 2 times. 2016-10-25 02:11:22 +02:00
NathanSweet
d3b9f89a1e Added TrackEntry listener test. 2016-10-25 01:58:59 +02:00
NathanSweet
1c801a45fc Merge remote-tracking branch 'origin/dev' into dev 2016-10-25 01:51:29 +02:00
NathanSweet
6a191c5093 Fixed listener copy/paste errors. 2016-10-25 01:51:26 +02:00
NathanSweet
bcc48327a2 Removed locals with single access.
Don't even remember why those two methods were added.
2016-10-25 01:51:11 +02:00
badlogic
42bb22d3c0 [ts] Fixes to demos, rotation special cases are a bit wonky still :D 2016-10-24 17:04:03 +02:00
badlogic
a4fcc0cdbf [ts] And another fix for args... 2016-10-24 15:14:09 +02:00
badlogic
aa5282b398 [ts] Fixed setAnimation naming for string/ref arguments 2016-10-24 15:13:14 +02:00
badlogic
787af5c8f8 [ts] Port of new AnimationState, needs testing 2016-10-24 13:32:58 +02:00
NathanSweet
eb0876818f Javadoc 2016-10-23 01:55:06 +02:00
NathanSweet
63cef27a42 Javadocs. 2016-10-22 21:53:31 +02:00
NathanSweet
bfe0a54a4e Skeleton Viewer UI improvements. 2016-10-22 21:53:25 +02:00
NathanSweet
21d63cd228 Fixed TranslateTime mixing. 2016-10-21 21:04:49 +02:00
NathanSweet
375e4f6941 Merge remote-tracking branch 'origin/dev' into dev 2016-10-21 19:40:09 +02:00
NathanSweet
255a8c086e All timelines now support setupPose and mixingOut parameters. 2016-10-21 19:40:05 +02:00
badlogic
05551e9b16 [ts] Closes #738, remove trailing whitespace 2016-10-20 14:48:13 +02:00
badlogic
f5aba88921 Merge branch 'master' into dev 2016-10-20 14:40:02 +02:00
badlogic
6eb86fd3a1 [lua] Closes #739, forgot math_min/max assignemnts 2016-10-20 14:38:13 +02:00
badlogic
e93e9e77c4 [lua] Closes #739, bug in Skeleton:getBounds, need to nil check attachment 2016-10-20 14:37:24 +02:00
badlogic
992d5178bc Merge branch 'master' into dev 2016-10-20 14:33:33 +02:00
badlogic
315e2eef40 [lua] Closes #729, error in texture atlas parser 2016-10-20 14:33:21 +02:00
NathanSweet
397c8fd8f8 Documented updateCacheReset. 2016-10-20 14:28:06 +02:00
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