5943 Commits

Author SHA1 Message Date
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
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
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
badlogic
9943a44cc4 [as3] Port AnimationState deform mixing while attachment timelines mix out. See #1653. 2020-04-18 16:41:32 +02:00
badlogic
6bda0c236b [cpp] Port AnimationState deform mixing while attachment timelines mix out. See #1653. 2020-04-17 12:06:36 +02:00
badlogic
7732838d6f [c] Port AnimationState deform mixing while attachment timelines mix out. 2020-04-15 15:24:05 +02:00
badlogic
ccbcf77cdc [ts] Remove LAST calculation. Additional fix for #1653. 2020-04-15 14:49:52 +02:00
Harald Csaszar
6c6c25d5d5 [csharp] Port of commit 30801657: Fixed attachments not being reset when an entry is mixed out. Removed LAST computation. 2020-04-14 20:02:54 +02:00
Nathan Sweet
30801657dd [libgdx] Fixed attachments not being reset when an entry is mixed out. Removed LAST computation.
Slot#attachmentState is sufficient to fix up attachments set by animations that are mixing out.

Email: FMfcgxwHMjqkvnPzdPlrGkTpBkGqpwXr
2020-04-14 18:33:01 +02:00
Nathan Sweet
02ecbae91c [libgdx] SkeletonViewer, look harder for atlas using common Unity suffixes. 2020-04-14 18:33:01 +02:00
badlogic
673b6754aa [ts] Port AnimationState deform mixing while attachment timelines mix out. See #1653. 2020-04-14 16:57:18 +02:00
badlogic
f0ab1da1b7 Merge branch '3.8' into 3.9-beta 2020-04-13 11:20:42 +02:00
badlogic
d7c2fecf97 Merge branch '3.8' of https://github.com/esotericsoftware/spine-runtimes into 3.8 2020-04-13 11:20:01 +02:00
badlogic
62cdef33f0 [cpp] Fix memory leak in SkeletonBounds. Closes #1623. 2020-04-13 11:19:54 +02:00
Jan Niklas Hasse
c0f101969d
[c] Ignore unused result from fread (#1644)
src/spine/extension.c:95:2: warning: ignoring return value of ‘fread’, declared with attribute warn_unused_result [-Wunused-result]
   95 |  fread(data, 1, *length, file);
      |  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2020-04-13 11:05:42 +02:00
badlogic
5a03a640ca Merge branch '3.8' into 3.9-beta 2020-04-13 10:55:24 +02:00
badlogic
b44154e2b7 [lua] Fix track enumeration. Closes #1635. 2020-04-13 10:55:12 +02:00
badlogic
22c29b61a2 Merge branch '3.8' into 3.9-beta 2020-04-13 10:48:56 +02:00
badlogic
0e6f293389 [as3] Fixes incorrect parsing of curves in SkeletonJson. Closes #1639. 2020-04-13 10:48:28 +02:00
badlogic
56e5e31790 Merge branch '3.8' into 3.9-beta 2020-04-13 10:34:55 +02:00
badlogic
1e5aaeaa8b [lua] Fix transform constraint parsing. Closes #1647. 2020-04-13 10:34:42 +02:00
badlogic
d885ae45a2 Merge branch '3.8' into 3.9-beta 2020-04-13 10:29:36 +02:00
badlogic
e066356da0 [as3][starling] Fix JSON parsing error when parsing path timelines. Closes #1625. 2020-04-13 10:29:25 +02:00