132 Commits

Author SHA1 Message Date
Mario Zechner
68a9096049 Merge branch '4.1' into 4.2-beta
# Conflicts:
#	.gitignore
#	spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp
#	spine-ts/package-lock.json
#	spine-ts/package.json
2022-12-27 11:48:02 +01:00
Mario Zechner
9ece84dc85 [phaser] Loading and caching of skeleton data, atlas, textures, creation of skeletons, animation state in game object.
# Conflicts:
#	spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp
#	spine-flutter/src/spine_flutter.cpp
2022-12-27 11:42:56 +01:00
Mario Zechner
577a36a2c5 Merge branch '4.1' into 4.2-beta 2022-12-05 13:31:41 +01:00
Mario Zechner
a3e84eef16 [sfml] Remove test.cpp 2022-12-05 13:31:29 +01:00
Mario Zechner
4525be9e42 Merge branch '4.1' into 4.2-beta 2022-12-05 13:30:26 +01:00
Mario Zechner
6e4c9517bc [sfml] Added testbed
# Conflicts:
#	CMakeLists.txt
#	spine-sfml/cpp/CMakeLists.txt
2022-12-05 13:30:05 +01: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
2ff97a3fe5 [sfml] Fix rendering code for new renderer object API. 2022-10-14 12:09:49 +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
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
Mario Zechner
8ffde33fa9 Formatting. 2022-09-09 19:36:50 +02:00
Mario Zechner
1a676c14fc [cpp][cocos2dx][sfml][sdl] Fix up runtimes according to renderer object system changes. 2022-09-09 10:40:34 +02:00
Mario Zechner
c31ea7c6fd [sfml] Use x86_64 on macOS for SFML as they don't ship ARM binaries. 2022-07-22 14:33:57 +02:00
Mario Zechner
514469f45b [sfml] Force x86_64 on macOS, SFML doesn't ship ARM64 binaries yet. 2022-07-11 11:11:41 +02:00
Mario Zechner
53f69d0f48 [cpp] Removed VertexEffect, see #2076 2022-05-30 14:02:09 +02:00
Mario Zechner
1a1b551e8b [runtimes] Re-exported examples with 4.1.23-beta, populated runtime examples. 2022-03-25 13:40:03 +01:00
Mario Zechner
a725dcd292 [c] Fix sequences for meshes, sanitizer warnings 2022-03-22 12:51:42 +01:00
Mario Zechner
e5698e265a Merge branch '4.0' into 4.1-beta 2022-03-01 13:57:08 +01:00
Mario Zechner
594bf66074 [sfml] Update to SFML 2.5.1 2022-03-01 13:10:44 +01:00
Mario Zechner
1976a3e6ca [cpp] Fix sequence timeline not setting renderer object correctly., formatting 2021-12-22 15:30:21 +01:00
Mario Zechner
9ac6f3dcc7 [cpp] Support sequence (timelines) in SkeletonJson 2021-12-17 16:41:40 +01:00
Mario Zechner
1ac6c6bd35 [cpp] Initial port of sequences
Loaders require modifications, timeline needs to be added.
2021-11-17 15:32:35 +01:00
Mario Zechner
a79f3395ce [c][cpp] Add dragon assets to SFML example. 2021-11-15 16:08:52 +01:00
Mario Zechner
e87757ef57 Update version strings to 4.1(.xx) 2021-10-14 00:47:13 +02:00
badlogic
a0f1ed1b9b [runtimes] Fixed and updated example exports with 4.1.04-beta
- Fixed SkeletonBinary.ts
- Updated dragon example to use sequences
2021-10-13 17:52:34 +02:00
Nathan Sweet
96a998b82d Spine Runtimes License Agreement update (September 24, 2021). 2021-09-24 18:18:19 -10:00
Mario Zechner
c41cc94008 [runtime] Revert changes to owl-pro.spine
Conversion to 4.0.31 and export breaks additive blending even more.
2021-09-14 00:44:00 +02:00
Mario Zechner
67c0d39eab [runtimes] Fixed owl example project, export and runtime scripts
The owl example project was not keying the control bone, leading to incorrect additive blending. The export.sh and runtimes.sh script in example/export did not account for the folder structure change in spine-ts.
2021-09-14 00:02:04 +02:00
badlogic
e842e67d19 [c][cpp] CMake clean-up, update to C++11. 2021-07-01 11:04:12 +02:00
badlogic
87658c7d31 [c][cpp] Spotless formatter 2021-07-01 10:40:18 +02:00
Mario Zechner
de697385fc [runtimes] Fix up README.md files using correct editor version. 2021-06-14 15:31:17 +02:00
Mario Zechner
857b2b64d8 [cpp] port of constraint application oder, see #1896 2021-06-07 16:45:14 +02:00
Mario Zechner
4715608108 [c][cpp] Fix remaining 4.0 porting bugs, apply formatter. 2021-06-07 16:13:25 +02:00
Mario Zechner
a71d73928d [c] Fix frame and curve array initialization in timelines, add debugging methods. 2021-05-31 15:58:18 +02:00
badlogic
8798b48e39 [c] Remove SPINE_SHORT_NAMES and C++ struct constructors. 2021-03-18 11:07:16 +01:00
badlogic
653c06a6b8 [cpp] 4.0 port, half done. 2021-03-02 16:54:14 +01:00
badlogic
688d855006 [runtimes] Updated examples with Editor version 4.0.58-beta. 2021-03-01 10:05:26 +01:00
badlogic
ee3f088e6c Merge branch '3.8' into 4.0-beta 2020-10-23 11:26:34 +02:00
badlogic
d37854e12d [sfml] Fixes #1786, sfml-cpp example must keep debug extension alive. 2020-10-21 14:16:14 +02:00
Nathan Sweet
98a6c8f696 Exported examples with export.sh 4.0.05-beta and ran runtimes.sh. 2020-10-10 16:22:40 -07:00
badlogic
c7a210a391 Merge branch '3.8' into 4.0-beta 2020-08-26 16:07:00 +02:00
badlogic
b4548b9166 [c][cpp] Closes #1742, incorrect rotation value applied for 2 bone IK. 2020-08-26 16:06:41 +02:00
badlogic
934bec56b7 Merge branch '3.8' into 3.9-beta 2019-12-20 12:27:35 +01:00
badlogic
b67bf992a0 Single bone IK fix and license header update. Closes #1580, closes #1581. 2019-12-20 12:20:46 +01:00
badlogic
bb003b6636 Merge branch '3.8' into 3.9-beta 2019-10-25 15:06:52 +02:00