2534 Commits

Author SHA1 Message Date
NathanSweet
c79dee0dc8 Fixed two color shader. 2016-12-01 14:36:55 +01:00
NathanSweet
e11cd56bac Fixed point attachment world rotation. 2016-12-01 14:36:47 +01:00
NathanSweet
e8296ebc52 Merge branch 'master' into 3.6-beta 2016-11-30 17:44:25 +01:00
pharan
fc33bf9e98 [unity] Updated examples to match recent fixes. 2016-11-30 18:51:37 +08:00
pharan
612ed2e3ae [unity] Fix ignored slot separators. Some optimizations. 2016-11-30 14:07:28 +08:00
NathanSweet
acb84e44d7 Merge remote-tracking branch 'origin/master' 2016-11-30 01:14:05 +01:00
NathanSweet
efd0b31723 Added PointAttachment. 2016-11-30 01:11:09 +01:00
NathanSweet
25eae31ae8 [libgdx] Less ugly test code. 2016-11-29 19:07:28 +01:00
badlogic
c43c71f067 Merge branch 'master' of https://github.com/esotericsoftware/spine-runtimes 2016-11-29 18:45:45 +01:00
badlogic
873ed16a53 [c] Added callback recursion issue to test suite 2016-11-29 18:45:36 +01:00
NathanSweet
b75a3ddecb Left some code commented out for easier AnimationState testing. 2016-11-29 18:15:42 +01:00
badlogic
6fe1e8fa68 [c] Fixed rotation timeline handling in AnimationState. Fixed main.cpp missing a break 3.5.35 2016-11-29 13:27:15 +01:00
NathanSweet
8e0972d732 Scale path spacing.
http://esotericsoftware.com/forum/Scaling-bone-messes-up-animation-order-7487?p=34659#p34659
2016-11-29 13:23:50 +01:00
badlogic
1e7a31747d [as3] Updated README.md to mention latest Flash runtime 2016-11-29 13:21:14 +01:00
badlogic
7c59ef2f09 [lua] Fix for rotation timelines in AnimationState 2016-11-29 13:18:55 +01:00
badlogic
6377618e3f [as3] Fix for rotation timelines in AnimationState 2016-11-29 13:16:11 +01:00
badlogic
3c254deb31 [ts] Fix for rotation timelines in AnimationState 2016-11-29 13:06:08 +01:00
NathanSweet
a24fea41c0 Merge branch 'master' into 3.6-beta 2016-11-28 19:25:30 +01:00
NathanSweet
abc75a50e8 Merge remote-tracking branch 'origin/master' 2016-11-28 19:25:17 +01:00
NathanSweet
15145fe709 [libgdx] Fixed Skeleton Viewer NPE when project fails to open. 2016-11-28 19:25:10 +01:00
John
c1353efdd3 [csharp] Better rotation direction reset.
Based on 6af978871b
2016-11-29 01:42:02 +08:00
NathanSweet
d19a4b22db Merge remote-tracking branch 'origin/master' 2016-11-28 18:10:51 +01:00
NathanSweet
6af978871b [libgdx] Better way to reset rotation direction on first frame. 2016-11-28 18:10:44 +01:00
NathanSweet
fdd66af5e0 [libgdx] Reset rotation direction for mixing out.
closes #779
2016-11-28 17:50:01 +01:00
badlogic
9c1b5b209a [csharp] Ported latest AnimationState changes 2016-11-28 16:46:14 +01:00
badlogic
54d7a79e23 Merge branch 'master' of https://github.com/esotericsoftware/spine-runtimes 2016-11-28 16:44:23 +01:00
badlogic
0d444eb5de [c] Ported latest AnimationState changes 2016-11-28 16:44:16 +01:00
badlogic
61c5c8f7a1 [lua] Ported latest AnimationState changes 2016-11-28 16:40:38 +01:00
NathanSweet
0d284dfc1a Merge remote-tracking branch 'origin/master' 2016-11-28 16:39:46 +01:00
NathanSweet
75b44deda0 [libgdx] Added test for two setAnimation calls with mixing. 2016-11-28 16:39:38 +01:00
badlogic
e2e6126592 Merge branch 'master' of https://github.com/esotericsoftware/spine-runtimes 2016-11-28 16:37:12 +01:00
badlogic
14d872b092 [as3] Ported latest AnimationState changes 2016-11-28 16:37:06 +01:00
badlogic
c604d93a5c [ts] Ported latest AnimationState changes 2016-11-28 16:32:02 +01:00
NathanSweet
143069bace Merge remote-tracking branch 'origin/master' 2016-11-28 16:28:49 +01:00
NathanSweet
7e4ce21951 [libgdx] Added tracking to AnimationState pool. 2016-11-28 16:28:16 +01:00
badlogic
4e0fdc022b [c] Another sigseg fix in AnimationState 2016-11-28 16:27:48 +01:00
badlogic
2e6d84aa25 Merge branch 'spine-c-unit-tests' 2016-11-28 16:20:58 +01:00
badlogic
e37416d935 [cocos2dx] Fixed up Visual Studio project for new spine-c location 2016-11-28 16:19:20 +01:00
badlogic
9960402e39 [cocos2dx][cocos2dobj] Fixed up cocos2d-x and cocos2d-objc xcode projects for new spine-c directory 2016-11-28 16:15:35 +01:00
badlogic
387b0afb80 [c] Added spine-c-tests (thanks @jpoag), fixed up CMake build 2016-11-28 16:00:46 +01:00
NathanSweet
9012326945 Merge remote-tracking branch 'origin/master' 2016-11-28 15:52:16 +01:00
NathanSweet
9eb18fa2eb Fixed keeping mixingFrom when calling setAnimation twice.
#761
2016-11-28 15:52:10 +01:00
NathanSweet
6a2b0f50de Renamed test events to 0 and 1, matching their indices, added a third test event. 2016-11-28 15:52:03 +01:00
NathanSweet
ae2b708ffc Fixed keeping mixingFrom when calling setAnimation twice.
#761
2016-11-28 15:50:28 +01:00
NathanSweet
e9a1a5d080 Added a third test event. 2016-11-28 15:48:51 +01:00
NathanSweet
19bb3ccf35 Renamed test events to 0 and 1, matching their indices. 2016-11-28 15:42:12 +01:00
badlogic
c7c6e28837 Merge branch 'master' of https://github.com/esotericsoftware/spine-runtimes 2016-11-28 15:08:26 +01:00
badlogic
f63e1625ab [c] Need to dispose mixingFrom explicitely in spAnimationState_disposeTracks, instead of disposeTrack. A mixingFrom entry may be smoked as part of disposing its parent before an event for the mixing from entry is processed in the event queue. 2016-11-28 15:08:17 +01:00
pharan
1aa8f56f9b [csharp] Fix SkeletonBinary/SkeletonJson for Unity-WSA. 2016-11-28 19:04:08 +08:00
pharan
da0578ae64 [unity] Cleanup disabled code. 2016-11-28 17:53:52 +08:00