709 Commits

Author SHA1 Message Date
Harald Csaszar
954ab69bce Merge branch '4.1' into 4.2-beta 2023-04-06 13:30:38 +02:00
Mario Zechner
da68e66e9c [c][cpp] Formatting. 2023-04-06 13:26:25 +02:00
Mario Zechner
1fb89b6e89 [c][cpp] Port of commit e04e7b5. Adjusted fix for IK constraint NaN when parent has zero scale. 2023-04-06 13:25:13 +02:00
Mario Zechner
2b5bedd543 [c][cpp] Fixed IK constraint NaN when a parent bone has zero scale. 2023-04-05 15:50:28 +02:00
Mario Zechner
6f63f76600 [c] Fixed IK constraint NaN when a parent bone has zero scale. 2023-04-05 15:30:10 +02:00
Mario Zechner
de52f2a9e3 [c] Formatting. 2023-04-05 15:06:03 +02:00
Mario Zechner
5f0cb66cad Merge branch '4.1' into 4.2-beta 2023-03-15 10:56:05 +01:00
Mario Zechner
7a5c6995ef [c] Closes #2264, initialize atlas page defaults properly. 2023-03-15 10:55:53 +01:00
Mario Zechner
f85928c03a [c] Closes #2263, fix dark alpha component in JSON parser. 2023-03-15 10:49:34 +01:00
Mario Zechner
4a66ced952 Merge branch '4.1' into 4.2-beta 2023-02-27 13:44:34 +01:00
Mario Zechner
15f9e39b14 Formatting. 2023-02-27 13:44:19 +01:00
Mario Zechner
b0b1fe011e [c] Closes #2258, check for empty skins in JSON parser 2023-02-27 13:43:22 +01:00
Mario Zechner
a5fc30cbf2 Merge branch '4.1' into 4.2-beta 2023-02-20 12:57:34 +01:00
Mario Zechner
de808262bb [c] Closes #2253, incorrect parsing of stepped curves in SkeletonJson. 2023-02-20 12:57:23 +01:00
Mario Zechner
1891d00025 Merge branch '4.1' into 4.2-beta 2023-01-16 14:00:14 +01:00
Mario Zechner
83945e17dc Apply formatter. 2023-01-16 14:00:01 +01:00
Mario Zechner
19b1ea703c [c] Closes #2224, incorrect position calculation in path constraint 2023-01-16 13:55:31 +01:00
Mario Zechner
84f5a31026 Merge branch '4.1' into 4.2-beta 2022-12-27 12:10:10 +01:00
Mario Zechner
59dbba3e31 [c] Closes #2216, assign alpha if not given. 2022-12-27 11:50:38 +01:00
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