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 |
|
pharan
|
ec36a1d6ec
|
[unity] SkeletonTint does black point tinting through a material property.
|
2016-11-28 17:53:19 +08:00 |
|
pharan
|
ee1028bb13
|
[unity] Sprite Shaders updated.
|
2016-11-28 17:52:07 +08:00 |
|
NathanSweet
|
38d925d1a7
|
JSON and binary loading for two color tinting.
|
2016-11-28 03:29:49 +01:00 |
|
NathanSweet
|
626a734940
|
Allow blend func to be bypassed.
|
2016-11-28 01:52:54 +01:00 |
|
NathanSweet
|
10b5318921
|
Fixed blending when using two color tinting.
|
2016-11-28 01:46:46 +01:00 |
|
NathanSweet
|
77099330ad
|
Refactored skeleton renderer, added two color tint polygon renderer.
|
2016-11-28 00:41:41 +01:00 |
|
NathanSweet
|
e595bc6e4b
|
Don't use dark color's alpha.
|
2016-11-27 20:26:54 +01:00 |
|
NathanSweet
|
9f69e85574
|
Added dark color to slot, TwoColorTimeline.
|
2016-11-27 17:21:52 +01:00 |
|
NathanSweet
|
938db42016
|
Refactored attachments to fill an array rather than store vertices for rendering.
|
2016-11-27 02:19:50 +01:00 |
|
NathanSweet
|
66b5f49f2e
|
Merge branch 'master' into dev
|
2016-11-26 23:51:56 +01:00 |
|
pharan
|
9c21942482
|
[unity] Updated examples, modules and editors.
|
2016-11-26 03:05:23 +08:00 |
|
badlogic
|
900001098b
|
[c] Fixed leak in AnimationState, wasn't disposing mixing from entries when entire state is disposed. Confirmed that disposing of mixing froms is done properly if anim state is allowed to update until the mixing from is done.
|
2016-11-25 16:02:49 +01:00 |
|
badlogic
|
98e49a7e11
|
[c] Fixed more leaks.
|
2016-11-24 16:48:32 +01:00 |
|
badlogic
|
f44cbaa044
|
[c] Added spAnimationState_disposeStatics to appease memory leak detectors.
|
2016-11-24 15:29:45 +01:00 |
|
badlogic
|
76137540ba
|
[c] Another memcpy error
|
2016-11-24 15:08:53 +01:00 |
|
badlogic
|
7fc9d1a26a
|
[c] fixed bug in spAnimationState_addPropertyID, didn't keep track of #properties. Closes #774
|
2016-11-24 15:01:23 +01:00 |
|
badlogic
|
a0f0e2ee1f
|
[c] Fixed memory leak in spTrackEntry_dispose, closes #770
|
2016-11-24 13:41:25 +01:00 |
|