640 Commits

Author SHA1 Message Date
Harald Csaszar
603c024791 Merge branch '4.1' into 4.2-beta 2022-11-30 18:41:39 +01:00
Luke Ingram
38ae6f886c [c][cpp][ts] Port of 4bad9ec25e3281361a6599509881397711722e58 2022-11-30 13:34:20 -04:00
Mario Zechner
a57f1b85b6 Formatting 2022-10-28 10:41:13 +02:00
Mario Zechner
42bce02619 Merge branch '4.1' into 4.2-beta 2022-10-28 10:40:54 +02:00
Mario Zechner
3493de7fe8 Formatting 2022-10-28 10:40:38 +02:00
Mario Zechner
95487552dc Merge branch '4.1' into 4.2-beta 2022-10-07 12:24:17 +02:00
Mario Zechner
88515ec1a9 [c][cpp] Check if slot attachment is NULL when applying sequence timeline. 2022-10-07 12:24:07 +02:00
Mario Zechner
ecd0aca61c [c] Add spTrackEntry_resetRotationDirections(), update CHANGELOG, fix warnings. 2022-10-06 16:59:00 +02:00
Mario Zechner
98c10437c5 [c] Port of commit 3ea4f66. AnimationState, fixed rotation mix when direction changes. See #2158. 2022-10-06 16:48:46 +02:00
Mario Zechner
6705ad675f Merge branch '4.1' into 4.2-beta 2022-09-26 14:04:16 +02:00
Mario Zechner
ec0ea45149 [c] Fix formatting. 2022-09-26 14:03:59 +02:00
Mario Zechner
6ec946708b Merge branch '4.1' into 4.2-beta 2022-09-26 10:04:07 +02:00
Mario Zechner
ef7eb1cb07 [c] Closes #2157, missing break in deform timeline apply. 2022-09-26 10:03:57 +02:00
Mario Zechner
dac3983b62 Merge branch '4.1' into 4.2-beta 2022-09-21 13:19:55 +02:00
Mario Zechner
aeacf6e502 [c] Closes #2156, incorrect timeline type check. 2022-09-21 13:19:44 +02:00
Mario Zechner
c590944a51 Merge branch '4.1' into 4.2-beta
# Conflicts:
#	spine-cocos2dx/README.md
#	spine-godot/spine_godot/SpineSprite.cpp
#	spine-sdl/src/spine-sdl-cpp.cpp
#	spine-sfml/cpp/src/spine/spine-sfml.cpp
2022-09-15 08:39:43 +02:00
Mario Zechner
669af9f6bb Formatting. 2022-09-15 08:37:55 +02:00
Mario Zechner
531e256d6d [c][cpp][sfml] Fixes #2154 2022-09-15 07:58:12 +02:00
Harald Csaszar
0a9ca59f6e Merge branch '4.1' into 4.2-beta 2022-09-14 17:30:13 +02:00
Nathan Sweet
d0002bcbab [c] Formatting. 2022-09-14 10:28:42 -04:00
Mario Zechner
926612b104 [c] Fix compiler warning/error on MSVC 2019 v16.11.18 2022-09-14 10:52:53 +02:00
Mario Zechner
a50aedd71c [c] Fix compiler warning/error on MSVC 2019 v16.11.18 2022-09-14 10:51:41 +02:00
Mario Zechner
316c114855 Formatting. 2022-09-13 10:00:54 +02:00
Mario Zechner
52376a0a24 [c] Port of #2150 2022-09-12 12:43:42 +02:00
Mario Zechner
0827d88b7b [cpp] Port of #2150 2022-09-12 12:34:42 +02:00
Mario Zechner
a64b79b498 [c] Closes #2149, use timeline type instead property ids.ds 2022-09-12 10:03:00 +02:00
Mario Zechner
2b69bb2af5 [sdl] Fix up texture loader in C implementation. 2022-08-02 10:45:32 +02:00
Mario Zechner
110e11d540 [c] Closes #2123, spTransformConstraintTimeline_setFrame assigned mixY to the wrong entry. 2022-07-22 10:01:45 +02:00
Mario Zechner
4bba3f1822 Merge branch '4.0' into 4.1 2022-07-18 14:10:10 +02:00
Daniel Collins
3cdfb25a48
[c] Fixed JSON parsing of PathConstraint spacing mode (#2065). (#2115)
See 4ec3290b987230a0b71d67c34269ba50f4e5e57f
2022-07-18 14:07:14 +02:00
Mario Zechner
ca75d3605e [c][cpp] Port of 4efd63f89cb995cbe4f30358d268a9d0eaf0c9be and 81baef0b5bb181376d15b0208697db8dabce095e 2022-06-20 15:39:33 +02:00
Mario Zechner
771c526915 Formatting pass. 2022-05-31 12:26:05 +02:00
Mario Zechner
9762da09cd [c] Removed VertexEffect, see #2076 2022-05-30 13:57:10 +02:00
Harald Csaszar
f26b12821e Merge branch '4.0' into 4.1-beta 2022-05-24 16:37:15 +02:00
Sergey Kazantsev
1880447f0b
[spine-c] Add initialization of mixRotate to transform constraint(SkeletonJson) (#2083) 2022-05-21 01:34:08 +02:00
Mario Zechner
8761f44aa7 [cocos2d-objc] Fix example project for latest Xcode. 2022-03-25 14:34:32 +01:00
Mario Zechner
2022713bd2 [c][cpp] Formatter pass. 2022-03-25 13:31:58 +01:00
Mario Zechner
ba1de97f04 [c] Return error if skeleton version doesn't match runtime version. See #1998 2022-03-22 13:37:08 +01:00
Mario Zechner
a725dcd292 [c] Fix sequences for meshes, sanitizer warnings 2022-03-22 12:51:42 +01:00
Mario Zechner
b33e66e1d2 Merge branch '4.0' into 4.1-beta 2022-03-11 18:07:46 +01:00
Mario Zechner
f4a92fbfae [c] Fixes #2041, adds sanitizer support via Cmake flag SPINE_SANITIZER=TRUE 2022-03-11 18:07:30 +01:00
Mario Zechner
9319029763 [c] Sequence support in SkeletonBinary and SkeletonJson. 2022-02-10 16:00:53 +01:00
Mario Zechner
0d237b1529 [c] Port sequence timeline loading to SkeletonBinary
Deform timeline parsing not working.
2022-02-04 13:21:44 +01:00
Mario Zechner
ffb9e75b09 [c][cpp] Port of shortestRotation, see #2027 2022-02-02 12:02:43 +01:00
Mario Zechner
504f52a5a7 Merge branch '4.0' into 4.1-beta
# Conflicts:
#	spine-as3/spine-as3/src/spine/animation/ScaleTimeline.as
#	spine-as3/spine-as3/src/spine/animation/ScaleXTimeline.as
#	spine-as3/spine-as3/src/spine/animation/ScaleYTimeline.as
#	spine-lua/spine-lua/Animation.lua
#	spine-ts/package-lock.json
#	spine-ts/package.json
#	spine-ts/spine-canvas/package.json
#	spine-ts/spine-core/package.json
#	spine-ts/spine-player/package.json
#	spine-ts/spine-threejs/package.json
#	spine-ts/spine-webgl/package.json
2022-01-27 18:42:14 +01:00
Mario Zechner
c8fe2c884b [c] Ported scale mixing fix, see #2028. 2022-01-26 20:36:10 +01:00
Mario Zechner
d7bb172c95 Fix fomatting script, apply formatting. 2022-01-20 19:49:10 +01:00
Mario Zechner
6ccf584466 Merge branch '4.0' into 4.1-beta 2022-01-19 11:31:28 +01:00
Mario Zechner
bf260a43ec [c] Fixes #2017, use REALLOC macro instead of realloc. 2022-01-19 11:31:03 +01:00
Mario Zechner
5a541597cc [c] Fix compilation errors due to new type hierarchy. 2022-01-12 09:05:34 +01:00