776 Commits

Author SHA1 Message Date
badlogic
fc72709c48 Updated README.mds to point to the correct .zip link 2017-07-12 11:18:18 +02:00
badlogic
c06bd8f181 Merge branch '3.6' into 3.7-beta 2017-06-26 16:21:18 +02:00
badlogic
65d1f51acc [c][sfml] Added spVertexEffect, and some math utilities. Fixed unit tests. 2017-06-26 14:00:00 +02:00
NathanSweet
b0cf3abd71 Added event audio path field. 2017-06-25 02:07:34 +02:00
NathanSweet
447cce2f84 Merge branch '3.6' into 3.7-beta 2017-06-24 18:34:49 +02:00
NathanSweet
61e54a5771 [libgdx] Don't use DIP_MIX across tracks.
`DIP_MIX` finds the next entry which does NOT key the timeline property and mixes out the "dip fix" (which is where a timeline is fully applied because a subsequent timeline keys the same property). This handles the case of A->B->C->D where A, B, and C key the same property but D doesn't. A uses the dip fix, then when D mixes in, `DIP_MIX` causes A to mix out, affecting B and C. If D is in another track, it is applied concurrently with A, B, and C so should not cause A to mix out.
2017-06-24 03:06:50 +02:00
badlogic
4ca68009a1 Merge branch '3.6' into 3.7-beta 2017-06-22 20:35:38 +02:00
NathanSweet
1a92702456 Less odd control flow.
End result is the same.
2017-06-22 10:35:08 +02:00
NathanSweet
b8901a6966 Merge remote-tracking branch 'origin/3.6' into 3.7-beta 2017-06-21 21:26:15 +02:00
NathanSweet
3c1c829e97 Remove unused import. 2017-06-21 21:25:26 +02:00
NathanSweet
bd209b77d6 Merge remote-tracking branch 'origin/3.6' into 3.7-beta 2017-06-21 16:19:22 +02:00
NathanSweet
5138d703f3 Merge remote-tracking branch 'origin/3.6' into 3.6 2017-06-21 15:46:38 +02:00
NathanSweet
a8e1faf4dd [libgdx] Fixed mixing unweighted meshes that aren't keyed on frame zero.
closes #925
2017-06-21 15:46:33 +02:00
badlogic
252d03377b Merge branch '3.6' into 3.7-beta 2017-06-21 14:53:16 +02:00
badlogic
ddf38c0ce1 [libGDX] VertexEffect now also lets you modify UVs and light/dark color. 2017-06-21 14:35:55 +02:00
NathanSweet
f4cff6471f Merge remote-tracking branch 'origin/3.7-beta' into 3.7-beta 2017-06-21 09:11:26 +02:00
NathanSweet
2621a75e46 [libgdx] Added audio path to SkeletonData. 2017-06-21 09:11:18 +02:00
badlogic
c9de3116f0 [maven-release-plugin] prepare for next development iteration 2017-06-19 22:42:53 +02:00
badlogic
521f459764 [maven-release-plugin] prepare release spine-libgdx-3.6.34.0 2017-06-19 22:42:46 +02:00
NathanSweet
2ed0561322 Merge remote-tracking branch 'origin/3.6' into 3.6 2017-06-19 17:02:33 +02:00
NathanSweet
069e3e3236 Better atlas finding. 2017-06-19 17:02:24 +02:00
badlogic
9bd1153518 Updated examples and runtime demo code 2017-06-19 16:47:28 +02:00
NathanSweet
c5907b6714 [libgdx] Ignore clipping attachments with too few vertices.
Needed for editor, check not necessary for other runtimes.
2017-06-19 14:04:19 +02:00
NathanSweet
55b558064a Removed spineboy-old binary. 2017-06-17 18:00:02 +02:00
NathanSweet
8a78eb4cf5 [libgdx] Thread safety for acquiring next VertexAttachment ID. 2017-06-12 16:47:16 +02:00
NathanSweet
5540b47f21 Changed Timeline#apply to enum parameters, AnimationState special cases track 0 to apply setup pose before first key. 2017-06-12 02:48:58 +02:00
NathanSweet
a8577b78a7 Shift attachment IDs to reduce effort needed to compute DeformTimeline ID. 2017-06-10 18:28:16 +02:00
NathanSweet
45870ef028 Added vertex attachment IDs for DeformTimeline. 2017-06-10 18:21:15 +02:00
NathanSweet
464e9b3362 [libgdx] Removed sysouts.
Dang amateurs!
2017-06-02 00:09:59 +02:00
NathanSweet
ef6ccb84d3 [libgdx] Fixed deform timelines not mixing to/from setup pose. 2017-06-01 23:44:09 +02:00
NathanSweet
7e75c7c5b1 [libgdx] SkeletonViewer keeps loop state for tracks playing. 2017-06-01 23:43:30 +02:00
NathanSweet
1b4ac3ba8e [libgdx] SkeletonViewer clean up. 2017-06-01 21:14:49 +02:00
NathanSweet
088a870463 [libgdx] Return true from AnimationState#apply if any animation was applied.
Makes it easier to know when you don't need to call updateWorldTransform.
2017-06-01 21:14:34 +02:00
NathanSweet
787170fa46 [libgdx] Don't need an immediate mode renderer. 2017-06-01 16:48:04 +02:00
NathanSweet
ac72220dc0 [libgdx] Made Skin lookup object non-static.
closes #911
2017-05-28 23:15:58 +02:00
NathanSweet
b8da5a1d44 Clean up. 2017-05-27 17:54:24 +02:00
NathanSweet
42fa637508 [libgdx] Added vertex effects. 2017-05-27 17:43:18 +02:00
NathanSweet
d7c9feb0b5 [libgdx, c] Avoid relying on NaN behavior.
#903
2017-05-24 17:14:33 +02:00
NathanSweet
a69f9d579f Removed mixing from limit, dispose track entries ASAP.
#899
2017-05-24 03:32:36 +02:00
NathanSweet
1de5adf953 IK simplification.
Just when you thought it couldn't get any simpler.
2017-05-23 18:52:45 +02:00
NathanSweet
0f944b2baf Limit linked list by speeding up and removing old entries instead of snapping. 2017-05-18 02:37:05 +02:00
NathanSweet
be583ba96d [libgdx] Moved NaN fix when mixDuration is 0 to setTimelineData. 2017-05-17 15:23:42 +02:00
badlogic
6734145060 [libgdx] Fixed issue with mixDuration on dip mix entry being 0. Caused NaNs when applying mixing from 2017-05-17 13:53:57 +02:00
NathanSweet
2349356584 Fixed interruptAlpha NaN when there is no mixingFrom. 2017-05-17 02:12:19 +02:00
NathanSweet
6140ea31e9 AnimationState clean up. 2017-05-17 02:11:55 +02:00
NathanSweet
859dd76f78 Allow track entries to finish when timeScale is 0.
closes #806
2017-05-17 02:10:34 +02:00
NathanSweet
d7c4195bc7 Set limit to mixing from track entries. 2017-05-16 14:31:45 +02:00
NathanSweet
02660ddd0a Fixed dipping when mixing more than 2 animations that key the same property.
Fixes `a->b,a` where a and b key the same property.
2017-05-16 14:01:44 +02:00
NathanSweet
b882fb8c51 Support for multiple mixing without dipping.
The multiple mixing setting has been removed. Multiple mixing is always done and dipping is avoided for adjacent track entries.

This is pretty close to complete. Mixing `a -> b` where both key property `x` avoids dipping. If the mix is interrupted by `c`, the dipping is properly mixed out. However, if `c` *also* keys `x`, a dip is seen.

This is good test JSON data:
http://n4te.com/x/1948-6b1G.txt
The problem can be seen by doing `m1 -> m1-dup` then interrupting the mix with `m1`.

Related issues: #621, #815, #899, #900
2017-05-16 04:35:54 +02:00
NathanSweet
d94170b411 Formatting. 2017-05-07 08:43:35 +02:00