7183 Commits

Author SHA1 Message Date
Mario Zechner
991b0a73fa [godot] Merge SpineAnimationStateDataResource and SpineSkeletonDataResource, test new SpineCollisionShapeProxy 2022-04-08 17:49:31 +02:00
Mario Zechner
da3b8db72a Merge branch '4.1-beta' into 4.2-beta 2022-04-07 09:03:16 +02:00
Mario Zechner
ef5e8946d5 Merge branch '4.0' into 4.1-beta
# Conflicts:
#	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-04-07 09:03:05 +02:00
Mario Zechner
7dc0073ab9 [ts] Release 4.0.27 2022-04-07 09:02:34 +02:00
Mario Zechner
a4f6442293 Merge branch '4.1-beta' into 4.2-beta 2022-04-07 08:59:37 +02:00
Mario Zechner
930a154c4b Merge branch '4.0' into 4.1-beta 2022-04-07 08:59:23 +02:00
Mario Zechner
9d7da553bb [ts][player] Don't dispose loading screen, if loading screen is disabled. Closes #2055. 2022-04-07 08:56:22 +02:00
Mario Zechner
5bc6082ee5 Merge branch '4.1-beta' into 4.2-beta
# Conflicts:
#	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-04-07 08:31:21 +02:00
Mario Zechner
3b57b39c47 Merge branch '4.0' into 4.1-beta 2022-04-07 08:30:38 +02:00
Mario Zechner
4ec3290b98 [cpp] Fixed JSON parsing of PathConstraint spacing mode, closes #2065. 2022-04-07 08:30:23 +02:00
Mario Zechner
8afbf76fb9 [ts] Release 4.1.16 2022-04-07 06:08:17 +02:00
Mario Zechner
55b7e5c155 Merge branch '4.1-beta' of https://github.com/esotericsoftware/spine-runtimes into 4.1-beta 2022-04-07 06:07:12 +02:00
Mario Zechner
d43ff5f899 Merge branch '4.0' into 4.1-beta
# Conflicts:
#	spine-csharp/src/Attachments/IHasTextureRegion.cs.meta
#	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-04-07 06:07:02 +02:00
Mario Zechner
ffba08cce7 [ts] Release 4.0.26 2022-04-07 06:05:14 +02:00
Mario Zechner
91cf922a6c [godot] Clean-up SpineCollisionShapeProxy. Needs more work. 2022-04-07 06:03:02 +02:00
Terrasse
01a36f81c3
[ts] Fixed bug of reading Unicode from binary data (#2051) 2022-04-07 05:50:42 +02:00
Harald Csaszar
8a77d776f2 Merge branch '4.0' into 4.1-beta 2022-04-06 18:24:23 +02:00
Harald Csaszar
3372ce0ba8 [unity] Timeline: Fixed compile errors on Unity 2018.4. Closes #2062. 2022-04-06 18:21:01 +02:00
Harald Csaszar
1121112c1d [unity] Minor: Removed leftover .meta file. 2022-04-06 12:41:46 +02:00
Mario Zechner
31a3dd684b [godot] Fix runtimes.sh for new Godot example layout. 2022-04-06 11:50:23 +02:00
Mario Zechner
b01acf49fd [godot] Refactor example file layout. 2022-04-06 11:49:16 +02:00
Mario Zechner
25e55b4009 [godot] More clean-up. 2022-04-06 11:34:03 +02:00
Mario Zechner
cea5adfe1b [godot] Clean-up SpineTimline, SpineConstants. 2022-04-06 11:19:04 +02:00
Mario Zechner
773173d589 [godot] Clean-up SpineAnimation, add simple unit test scene and script. 2022-04-06 10:40:04 +02:00
Harald Csaszar
70a318da7c [unity] Added missing TextureRegion.meta file. Closes #2060. 2022-04-06 10:16:18 +02:00
Mario Zechner
dd163d9a81 [godot] Clean-up register_types. 2022-04-06 10:14:47 +02:00
Mario Zechner
a194648f3a [godot] Clean-up GodotSpineExtension. 2022-04-06 10:14:08 +02:00
Mario Zechner
8b892dc58a [godot] Add spine-godot to formatting script. 2022-04-06 10:04:17 +02:00
Mario Zechner
e0e3bb9f93 [cpp] Fix SkeltonBinary not detecting a mismatch of atlas and skeleton data. 2022-04-05 18:28:57 +02:00
Mario Zechner
2ddf551a5e [godot| Use skeleton data resource for mix-and-match 2022-04-05 18:18:45 +02:00
Mario Zechner
f684e7ce8f [godot] Fix examples/export/runtimes.sh for Godot. 2022-04-05 18:07:23 +02:00
Mario Zechner
bd3de3bddd [godot] Recreate missing SpineSkeletonFileResource.h/.cpp 2022-04-05 18:00:34 +02:00
Mario Zechner
9d31b83105 [godot] Add support for binary skeleton files, clean-up import and resource saving/loading infrastructure. 2022-04-05 15:21:38 +02:00
Mario Zechner
e9e4a3af65 [godot] Clean-up SpineRuntimeEditorPlugin and type registration. 2022-04-05 13:08:22 +02:00
Mario Zechner
b760bb7606 [godot] Remove SpineSpriteAnimateDialog, clean-up SpineAnimationStateDataResource, rename SpineSprite.manual_update -> update_all 2022-04-05 12:58:48 +02:00
Mario Zechner
7f92b6893b [godot] Clean-up
* Remove forced -O2 flag
* Remove "external functions" from SpineSprite
* Add preview_animation property to SpineSprite. When set, the sprite will playback the selected animation in the editor.
* Fix mix-and-match script
2022-04-05 10:11:35 +02:00
Mario Zechner
7ed0d41cf6 [godot] Add mix-and-match example 2022-04-04 16:31:46 +02:00
Mario Zechner
b267c8ebc4 Merge branch 'spine-godot' into 4.2-beta 2022-04-04 15:02:15 +02:00
Mario Zechner
53c58351ae Merge branch '4.1-beta' into 4.2-beta
# Conflicts:
#	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-04-04 15:01:45 +02:00
Mario Zechner
c4d657757d [godot] Minor clean-up 2022-04-04 14:57:37 +02:00
Mario Zechner
437f88922d [godot] Fix examples/export/runtime.sh for godot, fix MeshAttachment, fix Godot example 2022-04-04 14:38:04 +02:00
Harald Csaszar
53ae86a025 [unity] Example component compile error on 2017.2. Closes #2056. 2022-04-04 14:33:30 +02:00
Mario Zechner
85227351ee [godot] Setup script cleans up. 2022-04-04 13:44:29 +02:00
Mario Zechner
1a51078c19 [godot] Get rid of symlink 2022-04-04 13:41:56 +02:00
Mario Zechner
b409fcb067 [godot] Fix gitignore again. 2022-04-04 12:23:00 +02:00
Mario Zechner
7f4ee229f5 [godot] Fix git ignore. 2022-04-04 12:22:47 +02:00
Mario Zechner
c276b4dfdd [godot] Git ignore spine_godot and godot checkout, update to Godot 3.4.4 2022-04-04 11:54:06 +02:00
Mario Zechner
d9e1d05e1b Merge branch '4.1-beta' into spine-godot
# Conflicts:
#	.gitignore
#	formatters/build.gradle
2022-04-04 11:47:55 +02:00
Harald Csaszar
f51baa7184 Merge branch '4.0' into 4.1-beta 2022-03-29 15:26:20 +02:00
Harald Csaszar
4792522de0 [unity] Fixed Spine URP shaders package using non UPM include paths in common shaders. Closes #2050. 2022-03-29 15:13:20 +02:00