446 Commits

Author SHA1 Message Date
badlogic
a2b80fe761 Merge branch '4.1' of https://github.com/esotericsoftware/spine-runtimes into 4.1 2023-09-21 18:32:52 +02:00
badlogic
70e169d5c4 [godot] Added C# example project with ports of the GDScript example scenes. 2023-09-21 18:32:41 +02:00
Mario Zechner
ae87c777d2 [godot] Fix VulkanSDK version for now. 2023-09-20 16:11:48 +02:00
badlogic
6d4b04cda3 [godot] Fix Windows dev builds. 2023-09-20 15:36:09 +02:00
badlogic
88e231a27a [godot] Disable Live++ patching in setup.sh 2023-09-20 15:04:14 +02:00
badlogic
d9b640254a [godot] Improve debug renderer. 2023-09-20 14:43:58 +02:00
Mario Zechner
4f69cdd6af [godot] Fixes #2371, crash on window resize
This is due to a Godot 4.1.1 bug in combination with the latest MoltenVK release. See https://github.com/godotengine/godot/pull/81219#issuecomment-1706609032. We are hardcoding the SDK version for now, until the fix has been merged and released in Godot 4.1.x.
2023-09-20 14:14:40 +02:00
Mario Zechner
db914b023f 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-phaser/package.json
#	spine-ts/spine-pixi/package.json
#	spine-ts/spine-player/package.json
#	spine-ts/spine-threejs/package.json
#	spine-ts/spine-webgl/package.json
2023-09-05 22:45:21 +02:00
Mario Zechner
3acbc2ab7a Formatting 2023-09-05 22:36:04 +02:00
Mario Zechner
d60d6e58f8 Merge branch '4.1' into 4.2-beta 2023-09-04 11:00:02 +02:00
Jordan Schidlowsky
96e25be436
Squashed commit of the following: (#2332)
commit 646078160b26979bc32093035602b7de12d9406b
Author: Jordan Schidlowsky <jordanschidlowsky@gmail.com>
Date:   Mon Aug 7 15:34:37 2023 -0600

    revert SCsub

commit 6f388c3d4ce86944b3801fbd418bfc8a1dfe4e02
Author: Jordan Schidlowsky <jordanschidlowsky@gmail.com>
Date:   Fri Aug 4 13:11:56 2023 -0600

    rename

commit 20eeeb5743a6687c189f61a91f14fcfcd179d0d8
Author: Jordan Schidlowsky <jordanschidlowsky@gmail.com>
Date:   Fri Aug 4 13:11:11 2023 -0600

    fix

commit 6ef0c3d0698c851349f1cd5b44e06296cfc90011
Merge: 26c02da4a 94d043b56
Author: Jordan Schidlowsky <jordanschidlowsky@gmail.com>
Date:   Fri Aug 4 13:09:54 2023 -0600

    Merge branch '4.1' into feature4.1/godot-performance-improvements

commit 26c02da4af1f7d518bbdc8c63a6c42f864b781b0
Merge: 0ce2ab656 002276351
Author: Jordan Schidlowsky <jordanschidlowsky@gmail.com>
Date:   Thu Aug 3 15:57:49 2023 -0600

    Merge remote-tracking branch 'upstream/4.1' into feature4.1/godot-performance-improvements

commit 0ce2ab656364fde29063b8b8ccee36dd7f4583fd
Author: Jordan Schidlowsky <jordanschidlowsky@gmail.com>
Date:   Thu Aug 3 12:11:51 2023 -0600

    Performance improvement using SNAME, caches for find_bone find_slot, temporary string buffer support.

commit 8082dfcef08cd5fab0c6247410c9177f0d6aa3bd
Author: Jordan Schidlowsky <jordanschidlowsky@gmail.com>
Date:   Tue Jun 6 06:10:07 2023 -0600

    Support audio path in SpineEventData

commit bf864c7ff1e03bb8c8826b6766d09958d0ee36e0
Merge: da5b318ee 0a14457f3
Author: Jason Knight <jason@winterpixel.com>
Date:   Tue Nov 29 14:01:17 2022 -0600

    Merge branch 'upstream-4.1' into winterpixel-main

commit da5b318eea0881f2cc9656fcf09a355fe7b05392
Author: Jordan Schidlowsky <jordanschidlowsky@gmail.com>
Date:   Fri Nov 25 14:02:09 2022 -0600

    fix incorrect ordering issue when applying custom materials to slot nodes

commit 000d22c5a8b160846c7742f181d9c7c6d816dd2a
Merge: 718643afc 8c3533835
Author: Brian Semrau <brian@winterpixel.com>
Date:   Thu Nov 24 16:02:30 2022 -0500

    Merge remote-tracking branch 'upstream/4.1' into winterpixel-main

commit 718643afc14b5f049961a4ec7b34ba9e8a3c6533
Merge: 2b743bd1d d8396435d
Author: Brian Semrau <brian@winterpixel.com>
Date:   Tue Oct 25 16:03:10 2022 -0400

    Merge remote-tracking branch 'upstream/4.1' into winterpixel-main

commit 2b743bd1dfa63f72169a36f2c43e43a2e2038f26
Author: Jordan Schidlowsky <jordanschidlowsky@gmail.com>
Date:   Thu Oct 13 12:37:04 2022 -0600

    Adding .o to ignore

commit 6ad70aaf162b7423c935b2baaff11c8bfbf2120b
Author: Brian Semrau <brian@winterpixel.com>
Date:   Wed Oct 12 13:59:32 2022 -0400

    Allow building by just adding to a modules folder
2023-09-04 10:58:43 +02:00
Mario Zechner
38aa1b0d61 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-phaser/package.json
#	spine-ts/spine-pixi/package.json
#	spine-ts/spine-player/package.json
#	spine-ts/spine-threejs/package.json
#	spine-ts/spine-webgl/package.json
2023-08-06 03:10:04 +02:00
Mario Zechner
a08f5116bc [godot] FIx Windows C# build, last attempt. 2023-08-03 13:54:42 +02:00
Harald Csaszar
cc6c428e32 Merge branch '4.1' into 4.2-beta 2023-08-02 18:24:01 +02:00
Mario Zechner
baa12f9c4f [godot] Invoke build_assemblies.py via python directly instead of relying on hash bang for GH action on Windows. 2023-07-31 13:31:42 +02:00
Mario Zechner
74b7882efa Merge branch '4.1' into 4.2-beta 2023-07-31 13:29:29 +02:00
Mario Zechner
4047f1ba07 Updated license headers. 2023-07-31 13:29:16 +02:00
Mario Zechner
1170d6c07b Merge branch '4.1' into 4.2-beta 2023-07-31 13:28:45 +02:00
Mario Zechner
61835faa78 [godot] Fix runtime license header. 2023-07-31 13:04:22 +02:00
Mario Zechner
3c40309c46 [godot] Fix v4 template build script with C# support. 2023-07-31 11:25:19 +02:00
Nathan Sweet
4658ba2189 Merge branch '4.1' into 4.2-beta 2023-07-28 13:58:35 -04:00
Mario Zechner
0e16aafcf7 [godot] Run glue generator in headless mode. 2023-07-25 11:25:20 +02:00
Harald Csaszar
ea16621fb1 Merge branch '4.1' into 4.2-beta 2023-07-24 20:46:11 +02:00
Mario Zechner
80f5973623 [godot] Fix Linux C# build. 2023-07-24 12:39:55 +02:00
Mario Zechner
b405686823 [godot] More C# build work. 2023-07-21 14:42:45 +02:00
Mario Zechner
157b9383b0 [godot] Fix macOS build, add assemblies to .app. 2023-07-19 18:21:37 +02:00
Mario Zechner
e525c77d18 [godot] Rework v4 build scripts to support optionally support C#. 2023-07-19 17:53:01 +02:00
Mario Zechner
bdb9e130bc [godot] Add mono flag to 4.x build. 2023-07-19 11:56:34 +02:00
Harald Csaszar
2bb2a12feb Merge branch '4.1' into 4.2-beta 2023-07-17 17:02:02 +02:00
Mario Zechner
5308ddb04b [godot] Add build/pack-template.sh to zip up the template files for development. 2023-07-14 15:11:16 +02:00
Mario Zechner
15b61f3101 [godot] Fix compilation error in SpineSprite, add 4.1 GitHub workflow. 2023-07-14 13:46:20 +02:00
Harald Csaszar
f87e507cbd Merge branch '4.1' into 4.2-beta 2023-06-09 19:16:10 +02:00
Jordan Schidlowsky
9be78dbd20
Support audio path in SpineEventData (#2303) 2023-06-07 13:52:43 +02:00
Harald Csaszar
08b56ea1ca Merge branch '4.1' into 4.2-beta 2023-05-02 17:21:44 +02:00
Luke Ingram
d3004bfbf7 [godot] Updates scripts to handle spaces in file paths (#2244). 2023-04-25 13:35:06 -04:00
badlogic
27f758458b Merge branch '4.1' of https://github.com/esotericsoftware/spine-runtimes into 4.1 2023-03-16 13:41:19 +01:00
Mario Zechner
8818e9f338 Merge branch '4.1' into 4.2-beta 2023-03-03 13:39:26 +01:00
Mario Zechner
5f9f684408 [godot] Register signal handlers before queuing animations. 2023-03-03 12:06:37 +01:00
Mario Zechner
0590c0e989 Merge branch '4.1' into 4.2-beta 2023-03-02 16:56:58 +01:00
Mario Zechner
4ea0205a27 [godot] Fix up v4 examples. 2023-03-02 11:48:39 +01:00
Mario Zechner
fd08e48125 [godot] Update README.md. 2023-03-02 09:36:52 +01:00
Mario Zechner
983220d3bc [godot] Fix refactoring compilation errors. 2023-02-17 16:50:20 +01:00
Mario Zechner
e5a481770d Merge branch '4.1' into 4.2-beta
# Conflicts:
#	spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp
2023-02-17 11:27:28 +01:00
Mario Zechner
55b6f43d9b [godot] Added mesh based renderer, slower than cavvas_item_add_triangle_array due to no batching. 2023-02-17 11:17:15 +01:00
Mario Zechner
b1426e3b04 Merge branch '4.1' into 4.2-beta 2023-02-16 13:51:18 +01:00
Mario Zechner
b80b57b380 [godot] FIx 4.0 compilation errors. 2023-02-16 13:51:00 +01:00
badlogic
89412eeada Merge branch '4.1' into 4.2-beta 2023-02-14 15:38:07 +01:00
badlogic
1aed9a2aa4 [godot] Fix 3.5 compilation after renderer reworking. 2023-02-14 15:37:21 +01:00
badlogic
fe8f51810a Merge branch '4.1' into 4.2-beta 2023-02-14 13:44:36 +01:00
Mario Zechner
2751d76426 [godot] Closes #2245, adds mesh based rendering for Godot 4.0, improving performance 100x fold. 2023-02-13 14:55:33 +01:00