257 Commits

Author SHA1 Message Date
Mario Zechner
8aa66061d9 Merge branch '4.1' into 4.2-beta
# Conflicts:
#	.gitignore
2022-11-29 09:48:51 +01:00
Mario Zechner
0a14457f36 [godot] Apply light mask of sprite to mesh instances, closes #2197. 2022-11-29 09:47:45 +01:00
Mario Zechner
a7a2d844e1 [godot] Use our .clang-format. 2022-11-29 09:46:52 +01:00
Mario Zechner
4f03d02435 Merge branch '4.1' of https://github.com/esotericsoftware/spine-runtimes into 4.1 2022-11-29 09:32:30 +01:00
Mario Zechner
e545a11315 [godot] Update scenes with more default data. 2022-11-29 09:32:21 +01:00
Jordan Schidlowsky
e83b9c1714
fix incorrect ordering issue when applying custom materials to slot nodes (#2205) 2022-11-29 09:23:15 +01:00
Mario Zechner
459f88c5a2 Merge branch '4.1' into 4.2-beta 2022-11-29 09:10:51 +01:00
Mario Zechner
7c285d6a3a [godot] Enable address sanitizer in debug builds. 2022-11-29 09:08:57 +01:00
Mario Zechner
65bf27ba46 Merge branch '4.1' into 4.2-beta 2022-11-11 06:20:33 +01:00
Mario Zechner
726ad4ddbe [godot] Fix convert.py to release lock before renaming .json files. 2022-11-11 06:20:22 +01: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
1826d042ad [godot] Closes #2185, custom skins need to be referenced when set on a SpineSkeleton. 2022-10-28 10:39:05 +02:00
Mario Zechner
1121a1de61 [godot] Closes #2185, custom skins need to be referenced when set on a SpineSkeleton. 2022-10-28 10:38:45 +02:00
Mario Zechner
fb553165bc [godot] Fix up fetching renderer object in SpineSprite. 2022-09-27 10:27:05 +02:00
Mario Zechner
6705ad675f Merge branch '4.1' into 4.2-beta 2022-09-26 14:04:16 +02:00
Mario Zechner
7d02b417c1 [godot] Fix v4 example project. 2022-09-26 14:03:15 +02:00
Mario Zechner
6a2a1f8101 [godot] Only log if actual work happens. 2022-09-26 13:42:03 +02:00
Mario Zechner
158eb4e7fb [godot] Conversion script .json -> .spine-json for existing projects. 2022-09-26 13:38:39 +02:00
Mario Zechner
03a9a50c36 Merge branch '4.1' into 4.2-beta 2022-09-26 10:41:40 +02:00
Mario Zechner
a18fc31041 [godot] Use .spine-json extension instead of .json, see #2134 2022-09-26 10:41:26 +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
34534d0e90 [godot] Call computeWorldVertices before fetching region. See #2154 2022-09-15 08:09:48 +02:00
Mario Zechner
b658634785 Merge branch '4.1' into 4.2-beta 2022-09-13 10:31:41 +02:00
Mario Zechner
57b985a382 [godot] Closes #2136, chmod a+x Linux binaries. 2022-09-13 10:31:26 +02:00
Mario Zechner
899fd11825 [godot] Fix up HasRendererObject changes/removal. 2022-09-13 10:26:19 +02:00
Mario Zechner
14547392bc Merge branch '4.1' into 4.2-beta 2022-09-03 12:53:02 +02:00
Mario Zechner
933ccbba62 [godot] Fix compilation for latest 4.0 master commit. 2022-09-03 12:52:50 +02:00
Mario Zechner
0bfeff771e Formatting. 2022-09-03 12:29:40 +02:00
Mario Zechner
efda7ec38e Merge branch '4.1' into 4.2-beta
# Conflicts:
#	spine-godot/spine_godot/SpineEditorPlugin.cpp
2022-09-03 12:28:12 +02:00
Mario Zechner
9fcb5007ec [godot] Fix compilation error on latest 3.5 2022-09-03 12:25:37 +02:00
Mario Zechner
d4ef1b7a35 Formatting pass. 2022-08-29 13:48:49 +02:00
Mario Zechner
db03f8612d [godot] Related to #2134, validate .json and .skel files before import. 2022-08-17 20:39:35 +02:00
Mario Zechner
ba0e78e167 [godot] Related to #2134, validate .json and .skel files before import. 2022-08-17 20:39:11 +02:00
Mario Zechner
805cd777ae Merge branch '4.1' into 4.2-beta 2022-08-17 19:06:31 +02:00
Mario Zechner
465879f180 [godot] Closes #2132, errornous connect call. 2022-08-17 19:06:17 +02:00
Mario Zechner
b4d7bedc37 Merge branch '4.1' into 4.2-beta 2022-08-06 19:27:05 +02:00
Mario Zechner
62f0c6deca [godot] Fixes for latest Godot 4.0, closes #2133, fix setters. 2022-08-06 19:26:08 +02:00
Mario Zechner
ffe4ad8538 [godot] Fix compilation for 3.x, update to 3.5-stable 2022-08-06 18:59:27 +02:00
Mario Zechner
4a5176c2c7 Merge branch '4.1' 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-08-05 08:54:14 +02:00
Mario Zechner
4386cb8c8e
Update README.md 2022-08-03 07:14:08 +02:00
Mario Zechner
99f38f64bc Merge branch '4.1' into 4.2-beta 2022-07-29 14:58:18 +02:00
Mario Zechner
1c150203ab [godot] Fixes for latest 4.0 commits, automatically install MoltenVK on macOS via setup.sh 2022-07-29 14:57:56 +02:00
Mario Zechner
d7f5b2a798 Merge branch '4.1' into 4.2-beta 2022-07-26 10:06:26 +02:00
Mario Zechner
72c547bd01 [godot] Closes #2117, setting meshes of inactive slots invisible breaks draw order.
Since we clear the mesh instances, we can refrain from setting them invisible.
2022-07-26 10:06:05 +02:00
Mario Zechner
ec034a0654 [godot] Closes #2125, fix help menu 2022-07-25 16:15:26 +02:00
Mario Zechner
c0ec155716 [godot] Add SpineObjectWrapper docs. 2022-07-25 15:48:42 +02:00
Mario Zechner
3d86f958e7 [godot] Add SpineObjectWrapper docs. 2022-07-25 15:48:09 +02:00
Mario Zechner
5eb9667d38 Merge branch '4.1' into 4.2-beta 2022-07-25 15:21:49 +02:00