3143 Commits

Author SHA1 Message Date
John
cab5f21175 [unity] Allow negative Animator state speed (#889) 2017-05-20 10:25:12 +08:00
pharan
5c50435ed2 Merge branch '3.6-beta' of https://github.com/EsotericSoftware/spine-runtimes into 3.6-beta 2017-05-20 10:18:09 +08:00
pharan
69a0644445 [unity] Add editor undo support for SkeletonRenderSeparator. 2017-05-20 10:17:49 +08:00
pharan
0bdd3d52e3 [unity] Updated Mix and Match API, examples, and old sample scripts. 2017-05-20 10:17:14 +08:00
pharan
439c8e8e22 [unity] SkeletonBakingWindow and various editor fixes. 2017-05-20 10:13:45 +08:00
pharan
7570c69aa2 [unity] Removed leftover debug. 2017-05-20 10:09:08 +08:00
badlogic
38588b8895 [lua] Ported animation state changes. 2017-05-19 12:28:06 +02:00
pharan
05acfcf19a [unity] Updated CHANGELOG.md (fix formatting) 2017-05-19 09:33:05 +08:00
pharan
52d04b866e [unity] Updated CHANGELOG.md 2017-05-19 09:28:16 +08:00
pharan
2c0391687b Merge branch '3.6-beta' of https://github.com/EsotericSoftware/spine-runtimes into 3.6-beta 2017-05-19 08:46:15 +08:00
pharan
d1a2b3125f [unity] Added skinField param to [SpineAttachment] attribute. 2017-05-19 08:45:55 +08:00
pharan
3fe876adcd [unity] Fix SpineAttributes not seeing sibling fields in arrays and serialized structs/classes. 2017-05-19 08:45:44 +08:00
pharan
f9c04584c3 [unity] Skin.Clear() 2017-05-19 08:42:09 +08:00
badlogic
5a36abf813 [c] Fixed tracking of realloc in unit test suite 2017-05-18 13:42:54 +02:00
badlogic
e324c05bfa [c] Ported latest anim state changes. 2017-05-18 13:10:07 +02:00
badlogic
8335ea6af7 [as3] Ported latest anim state change 2017-05-18 10:29:49 +02:00
badlogic
e4ff874172 [ts] Ported latest anim state change 2017-05-18 10:28:19 +02:00
pharan
6756f01557 [unity] Fix tintBlack data applied in wrong order. 2017-05-18 11:18:07 +08:00
pharan
4872bf0f6a [unity] Add Rigidbody button for SkeletonUtilityBoneInspector. 2017-05-18 10:58:21 +08:00
John
bee2ea99a0 [unity] Update CHANGELOG.md 2017-05-18 09:58:14 +08:00
pharan
c0fe346610 [unity] Renamed shader filenames to match Unity standard. 2017-05-18 09:55:14 +08:00
pharan
9adfbd1594 [unity] Moved some unused classes. Keeping the files until 3.7 to keep unitypackage upgrades painless. 2017-05-18 09:54:41 +08:00
pharan
2cb188e568 [unity] Some editor fixes. 2017-05-18 09:52:13 +08:00
pharan
5d78359b7c [csharp] Limit linked list by speeding up, see 0f944b2baf 2017-05-18 09:11:42 +08:00
pharan
f5c8a36391 [unity] Additional Skin extensions. 2017-05-18 09:10:15 +08:00
pharan
3c1894a7d5 [unity] More editor improvements. 2017-05-18 09:09:28 +08:00
NathanSweet
277f96d50f Merge remote-tracking branch 'origin/3.6-beta' into 3.6-beta 2017-05-18 02:40:43 +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
pharan
eacb73c913 [csharp] Ported animation state changes, see https://github.com/EsotericSoftware/spine-runtimes/issues/904 2017-05-18 07:17:41 +08:00
badlogic
18ebc9b447 [as3][ts] Moved mix duration fix to setTimelineData so we evaluate the boolean expression less. 2017-05-17 15:31:10 +02:00
badlogic
308261fceb Merge branch '3.6-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.6-beta 2017-05-17 15:28:49 +02:00
badlogic
03e08dc74f [as3] Ported animation state changes, see #904 2017-05-17 15:27:57 +02:00
NathanSweet
be583ba96d [libgdx] Moved NaN fix when mixDuration is 0 to setTimelineData. 2017-05-17 15:23:42 +02:00
badlogic
21e05ea1b0 [ts] Updated artifacts 2017-05-17 13:56:20 +02:00
badlogic
5b262648ca [ts] Fixed issue with mixDuration on dip mix entry being 0. Caused NaNs when applying mixing from 2017-05-17 13:54:43 +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
badlogic
b9b2d81c65 [ts] Ported animation state changes, see #904 2017-05-17 11:54:56 +02:00
badlogic
1af2089157 [cocos2dx] Fixed tinting and cascaded colors. Closes #902, closes #901 2017-05-17 11:03:34 +02:00
pharan
a43bdc4361 [unity] More SkeletonDebugWindow, improved inspectors and icons for SpineAttributeDrawers! 2017-05-17 15:50:09 +08:00
NathanSweet
fd8ed4d175 Merge remote-tracking branch 'origin/3.6-beta' into 3.6-beta 2017-05-17 02:12:56 +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
Nathan Sweet
0d3f495819 Update README.md 2017-05-17 01:18:56 +02:00
Nathan Sweet
4dbd39ec48 Update README.md 2017-05-17 01:17:09 +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
pharan
742ffe5497 [unity] Make SkeletonDebug an EditorWindow. 2017-05-16 06:03:05 +08:00
pharan
7d8c2a8771 [unity] Minor formatting changes. 2017-05-15 12:49:23 +08:00