2483 Commits

Author SHA1 Message Date
NathanSweet
19bb3ccf35 Renamed test events to 0 and 1, matching their indices. 2016-11-28 15:42:12 +01: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
badlogic
a0484cc63d [c] Fixed memcpy bugs, closes #771 2016-11-24 13:36:50 +01:00
badlogic
721cbf0260 [as3] Ported AnimationState changes 2016-11-24 13:28:50 +01:00
badlogic
7637fdbefd [as3] Updated FDT projects to use player 23 2016-11-24 13:22:26 +01:00
badlogic
c0908f19ed [lua] Ported AnimationState changes 2016-11-24 13:01:14 +01:00
badlogic
aca4060fad [lua] Ported AnimationState changes 2016-11-24 13:00:46 +01:00
badlogic
a7fe570148 [ts] Ported AnimationState changes 2016-11-24 12:48:45 +01:00
badlogic
a73c5084b5 [c] Ported AnimationState changes 2016-11-24 12:38:03 +01:00
pharan
be13e57bbc Merge branch 'master' of https://github.com/EsotericSoftware/spine-runtimes 2016-11-24 02:43:27 +08:00
pharan
abb1b013a5 [csharp] AnimationState fixes. 2016-11-24 02:42:37 +08:00
NathanSweet
020f557004 [libgdx] Fixed losing mixingFrom when calling setAnimation twice.
closes #761
2016-11-23 16:58:53 +01:00
NathanSweet
6d7217d44c [libgdx] Fixed AnimationStateTests.
It now takes one extra frame for a track to be cleared when trackEnd is reached.
2016-11-23 16:52:17 +01:00
NathanSweet
e3d916e9e3 Merge remote-tracking branch 'origin/master' 2016-11-23 16:38:30 +01:00
NathanSweet
deca6bb92f [libgdx] Reset to setup pose when trackEnd is reached. 2016-11-23 16:37:08 +01:00
pharan
25c2ca7b1b [csharp] UpdateMixingFrom fixes. 2016-11-23 22:11:47 +08:00
NathanSweet
d66df0775b Merge remote-tracking branch 'origin/master' 2016-11-23 13:38:54 +01:00
NathanSweet
99ca32dabb [libgdx] Only remove mixingFrom entries from the end of the list.
http://esotericsoftware.com/forum/3-5-Mixing-carries-over-multiple-animations-7430?p=34364#p34364
2016-11-23 13:38:44 +01:00
badlogic
56c6780fa8 [c] Closes #768, fallthrough in event queue passed wrong event type 2016-11-23 11:31:03 +01:00
NathanSweet
40cbe8620d [libgdx] During mix, use timeScale from the most current animation. 2016-11-22 17:49:49 +01:00
badlogic
04e4d1f40d [c] Fixed memory leak in AnimationState.c 2016-11-22 14:18:11 +01:00
badlogic
37b6fe3c11 [c] Fixed bug in AttachmentTimeline, wrong order of trinary operator expressions 2016-11-22 13:52:19 +01:00
badlogic
2e252783a7 [lua] Fixed bug in AnimationState, indexing of timelines was incorrect. Fixed but in AttachmentTimeline, called wrong setAttachment 2016-11-21 13:53:03 +01:00
NathanSweet
65982c7eca Merge remote-tracking branch 'origin/master' 2016-11-20 15:20:52 +01:00
NathanSweet
e7d25dc2cb [libgdx] Reset rotation direction when changing TrackEntry alpha. 2016-11-20 15:08:01 +01:00
pharan
5779d0e09a [unity] Simplified Sprite shader GUI. 2016-11-19 09:19:01 +08:00
pharan
a4ee7e3b4d [unity] Description for baking now that it's hidden. 2016-11-19 08:15:46 +08:00
pharan
78855cdb70 [unity] Fix SkeletonUtility and BoundingBox functionality. 2016-11-19 08:14:33 +08:00
pharan
4dc462e7a8 [unity] Fix backwards conditional. Some cleanup. 2016-11-19 06:39:40 +08:00
pharan
ece4e93118 [csharp] Fix and cleanup a few typos. 2016-11-19 06:35:00 +08:00
NathanSweet
dced060658 Merge remote-tracking branch 'origin/master' 2016-11-18 13:05:14 +01:00
NathanSweet
979d8072bc [libgdx] Default to 30 FPS. 2016-11-18 13:05:08 +01:00
pharan
175d60438a Merge branch 'master' of https://github.com/EsotericSoftware/spine-runtimes 2016-11-18 16:53:07 +08:00
pharan
18e1f9a976 [unity] ToddRivers Sprite Shader 2016-11-18 16:52:07 +08:00
badlogic
2888ece970 [lua] Closes 760, passed wrong type to setAttachment 2016-11-18 09:49:54 +01:00
pharan
752516e00f [unity] SkeletonRagdoll fix for 3.5 AnimationState 2016-11-18 06:10:50 +08:00