5963 Commits

Author SHA1 Message Date
badlogic
3bdd39a409 Merge branch '3.8' into 3.9-beta 2020-06-03 13:17:58 +02:00
badlogic
ebd0bea6ed [c] Initialize timeline local var for additive blending case. Closes #1688. 2020-06-03 13:17:39 +02:00
Harald Csaszar
05d8b248b0 [unity] Fixed Mecanim state not updated when referenced clip's Loop Time changes. Also fixes Override controllers which never used the override clips' loop parameter but the original one. Closes #1649. 2020-05-29 16:20:37 +02:00
Harald Csaszar
bc559625f2 [unity] SkeletonGraphic now supports multiple atlas textures via additional CanvasRenderer GameObjects. Closes #1592. SkeletonGraphic now also supports SkeletonRenderSeparator functionality. Closes #1254. See SkeletonRenderSeparator.unity scene for a usage example. 2020-05-25 20:22:04 +02:00
Harald Csaszar
69f78b03e1 Merge branch '3.8' into 3.9-beta 2020-05-20 16:48:55 +02:00
badlogic
b53bccf627 [as3] Port of additional fix for #1668. 2020-05-20 16:25:42 +02:00
badlogic
9e7ff6ad2c Merge branch '3.8' of https://github.com/esotericsoftware/spine-runtimes into 3.8 2020-05-20 16:21:16 +02:00
badlogic
b39d1a881f [lua] Port of additional fix for #1668. 2020-05-20 16:21:11 +02:00
Harald Csaszar
0357dd5ffa [csharp] Port of commit d7203ee. Improved fix for TransformMode.noRotationOrReflection with skeleton scale. See #1668. 2020-05-20 16:19:27 +02:00
badlogic
f3a9c0a535 [c][cpp] Port of additional fix for #1668. 2020-05-20 16:18:23 +02:00
badlogic
4c2788a558 [ts] Port of additional fix for #1668. 2020-05-20 16:13:43 +02:00
Nathan Sweet
75aba023c3 [libgdx] Allow ClippingAttachment endSlot to be null, @Null annotations on fields, improved javadocs, removed extraneous parenthesis. 2020-05-20 13:28:43 +02:00
Nathan Sweet
d7203eec1a Improved fix for TransformMode.noRotationOrReflection with skeleton scale.
#1668
http://esotericsoftware.com/forum/WebGL-ScaleX-Question-13983
2020-05-20 12:36:35 +02:00
Harald Csaszar
6a9403511d [unity] Added documentation section to GetRepackedSkin methods mentioning the requirement for Destroy() call on output textures and materials. Added to example scene component code as well. Closes #1681. 2020-05-18 17:21:58 +02:00
Harald Csaszar
b1e4c8f2b7 [unity] Fixed SkeletonMecanim throwing exception at non-Spine clip. Closes #1675. 2020-05-14 17:50:45 +02:00
Harald Csaszar
3e93e2daf1 [unity] Fixed ghost-movement of Ragdoll components: They did not update the RagdollParent transform. Activate correct behaviour by disabling the inspector property Old Ragdoll Behaviour which was introduced to automatically be backwards-compatible. Closes #1670. 3.8.95 2020-05-07 15:10:20 +02:00
badlogic
0bcd19ef55 Merge branch '3.8' into 3.9-beta 2020-05-06 19:47:25 +02:00
badlogic
6a317a1e3f [runtimes] Port of fix for TransformMode.noRotationOrReflection applying skeleton scale twice. See #1668. 2020-05-06 19:47:08 +02:00
badlogic
45ef51bc89 Merge branch '3.9-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.9-beta 2020-05-06 19:36:06 +02:00
Harald Csaszar
c73f8c1f42 [csharp] Ported automated test set 'AnimationStateTests' to csharp and Unity. 2020-05-06 16:03:04 +02:00
Nathan Sweet
03d5155d6b [libgdx] Fixed AnimationStateTests 24 (setAnimation during AnimationStateListener). 2020-05-05 20:03:42 +02:00
Nathan Sweet
79d2dbfa5f Merge branch '3.8' into 3.9-beta 2020-05-05 15:34:13 +02:00
Nathan Sweet
94e6e41518 Added AnimationState setNext and clearNext.
http://esotericsoftware.com/forum/Keep-track-of-added-animations-13896
2020-05-05 15:34:07 +02:00
Harald Csaszar
00173b4c60 [csharp] Port of commit de203d5: Fixed TransformMode.noRotationOrReflection applying skeleton scale twice. See #1668. 2020-05-05 15:16:47 +02:00
Nathan Sweet
de203d5715 Fixed TransformMode.noRotationOrReflection applying skeleton scale twice.
This transform mode inherits scale from the parent, which will have skeleton scale, so should not have it applied again.

closes #1668
2020-05-05 14:44:22 +02:00
Nathan Sweet
742d11f65f [libgdx] SkeletonViewer, try to disable reflective access warning. 2020-05-02 17:42:18 +02:00
Nathan Sweet
e649ef05b7 Added AnimationState listener tests for looping and queuing a second animation. 2020-05-01 20:48:35 +02:00
Nathan Sweet
6b1e87e6bc Merge branch '3.8' into 3.9-beta 2020-05-01 13:28:06 +02:00
Harald Csaszar
d499dba7c4 [unity] Unity SpriteAtlas support: Upon build to platform, the internally generated sprite atlas texture is used instead of the png file generated for the editor (to reduce additional memory usage). This completes Unity SpriteAtlas support, together with previous commit d35550d. Closes #940. 2020-04-29 20:44:24 +02:00
Harald Csaszar
22c5144bde [unity] Fixed a build error (build to platform only) in 'Spine Examples' after package.json structures and asmdef files have been added. 2020-04-29 20:27:38 +02:00
Harald Csaszar
d35550d4f4 [unity] Now supporting Unity's SpriteAtlas as atlas provider (instead of .atlas.txt and .png files) alongside a skeleton data file. Accessible via a new tool window "Window - Spine - SpriteAtlas Import". 2020-04-29 19:39:32 +02:00
Harald Csaszar
96bb3630f2 [unity] Fixed a bug where _STRAIGHT_ALPHA_INPUT shader keyword was not set when default import settings are applied automatically (bool parameter was set, but the keyword would only be added when the Inspector is active). 2020-04-29 19:37:04 +02:00
Harald Csaszar
37d569414d [csharp] Minor cleanup: removed unused variable, added null tests to legacy SpriteAttacher class. 2020-04-29 16:08:29 +02:00
Harald Csaszar
a0c0db0f5a [csharp] Fixed ColorTimeline and TwoColorTimeline result colors not being clamped. Closes #1664. 2020-04-24 16:56:53 +02:00
Nathan Sweet
dea3e3594c Moved @Null for method return values to the same line. 2020-04-22 21:17:40 +02:00
Harald Csaszar
201f0bd7d5 [unity] Fixed an out of bounds access in SkeletonMecanim when multiple interruptions occur. Closes #1661. 2020-04-22 16:36:01 +02:00
Nathan Sweet
afab54aaa1 Javadocs. 2020-04-22 15:36:41 +02:00
badlogic
fa422fb1ce Merge branch '3.9-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.9-beta 2020-04-22 13:55:29 +02:00
Nathan Sweet
3f3098902b [libgdx] SkeletonViewer, even more sophisticated atlas file search. 2020-04-21 17:34:50 +02:00
Nathan Sweet
077afcea09 [libgdx] Fixed curve values not being scaled when loading data. Added SkeletonLoader. Javadocs. 2020-04-21 17:34:11 +02:00
badlogic
df6b4004f4 Merge branch '3.9-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.9-beta 2020-04-21 10:27:44 +02:00
Nathan Sweet
45767d0e3d [libgdx] Cleaned up simple tests. 2020-04-21 10:04:53 +02:00
Nathan Sweet
b0aa2f7447 [libgdx] Skeleton hash is now a long in the binary format. 2020-04-21 10:04:53 +02:00
badlogic
ca68a72520 Merge branch '3.8' into 3.9-beta 2020-04-20 18:01:10 +02:00
badlogic
993e59f6bd [lua] Port AnimationState deform mixing while attachment timelines mix out. See #1653. 2020-04-20 18:01:01 +02:00
badlogic
dd77657755 Merge branch '3.8' into 3.9-beta 2020-04-20 15:52:17 +02:00
badlogic
049adf7e2b [cocos2dx] Apply node Z to debug node. Closes #1655. 2020-04-20 15:51:57 +02:00
Nathan Sweet
b0407a850c Merge branch '3.8' into 3.9-beta 2020-04-19 16:46:41 +02:00
Nathan Sweet
30e7812d1f [libgdx] SkeletonViewer, even better handling of atlas file look up. 2020-04-19 16:40:59 +02:00
Nathan Sweet
1896102d70 Merge branch '3.8' into 3.9-beta
# Conflicts:
#	spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
2020-04-19 15:33:59 +02:00