UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-25 22:23:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,892 Commits 19 Branches 33 Tags
Commit Graph

94 Commits

Author SHA1 Message Date
Mario Zechner
f68f5437d9 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
 2024-01-16 12:20:32 +01:00
Mario Zechner
068a2bb6d0 [godot] Closes #2447, expose bone and sprite in SpineBoneNode 2024-01-12 13:10:57 +01:00
Mario Zechner
8878437c38 Merge branch '4.1' into 4.2-beta 
# Conflicts:
#	spine-ts/index.html
#	spine-ts/spine-player/src/PlayerEditor.ts
 2023-12-08 01:04:14 +01:00
Mario Zechner
38fa8800f3 [godot] Fix for 4.0/4.1, different API. 2023-12-06 17:29:17 +01:00
Mario Zechner
0d282215bc [godot] Fix compilation error with 4.2-stable 2023-12-06 17:16:47 +01:00
Harald Csaszar
bba61a9a09 Merge branch '4.1' into 4.2-beta 2023-11-21 14:35:50 +01:00
Mario Zechner
54706aeea7 [godot] Closes #2421, fix check whether mesh indices changed in between frames. 2023-11-17 19:30:16 +01:00
Harald Csaszar
9999ea82ca Merge branch '4.1' into 4.2-beta 2023-10-06 18:47:28 +02:00
Mario Zechner
f5caeacf0c [godot] Fix compilation errors with 3.5.3, fix const correctness. 2023-10-06 11:15:21 +02:00
Mario Zechner
5f6b637d53 [godot] Make SpineAtlasResource::clear_native_data const. 2023-10-06 10:50:15 +02:00
Mario Zechner
b3e8821966 [godot] Fix const assignments in SpineAtlasResource::copy_from() 2023-10-05 20:51:50 +02:00
Mario Zechner
e8e0c29aa7 Merge branch '4.1' into 4.2-beta 2023-10-05 15:47:07 +02:00
Mario Zechner
b70aa0c9fb [godot] Closes #2387, reimport of skeleton and atlas files is reflect by referencing objects. 2023-10-05 15:46:58 +02:00
Mario Zechner
5c0bb6e36b [godot] Fix error message when deleting a mix in a skeleton data asset. 2023-10-05 13:18:14 +02:00
Mario Zechner
961a865343 Merge branch '4.1' into 4.2-beta 2023-09-22 15:41:57 +02:00
Mario Zechner
57388824ca [godot] Closes #2372, fix UTF-8 texture atlas loading. 2023-09-22 15:41:36 +02:00
Mario Zechner
fb11c02be8 [godot] Closes #2373 
The spine-godot renderer made assumptions about index data that didn't hold in case of clipping.
 2023-09-22 14:42:05 +02:00
Mario Zechner
fa1fb09cb2 [godot] Closes #2381, regression in SpineSlot::get_bone() 2023-09-22 11:15:25 +02:00
badlogic
c99535ed85 Merge branch '4.1' into 4.2-beta 2023-09-21 18:33:05 +02:00
badlogic
d9b640254a [godot] Improve debug renderer. 2023-09-20 14:43:58 +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
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
Harald Csaszar
2bb2a12feb Merge branch '4.1' into 4.2-beta 2023-07-17 17:02:02 +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
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
Mario Zechner
2826a3610e Merge branch '4.1' into 4.2-beta 2023-02-13 07:42:27 +01:00
Mario Zechner
d9fff16b5f [godot] Closes #2243, custom resource types returned incorrect values from get_resource_type(). 2023-02-13 07:42:06 +01:00
Mario Zechner
7a861dc605 [godot] Preparation work for mesh-based rendering. 2023-02-13 06:49:56 +01:00
Mario Zechner
f573beb721 Merge branch '4.1' into 4.2-beta 2023-02-10 23:20:07 +01:00
Mario Zechner
7ef8ca40f4 [godot] Closes #2239, debug rendering of root bone. 2023-02-10 23:19:57 +01:00
Mario Zechner
467295a782 Merge branch '4.1' into 4.2-beta 2023-02-10 23:02:52 +01:00
Mario Zechner
bc2a1af417 [godot] Closes #2242, register SpineMesh2D. 2023-02-10 23:02:42 +01:00
Mario Zechner
f2bfb50b54 Merge branch '4.1' into 4.2-beta 2023-02-08 13:01:23 +01:00
Mario Zechner
634028495f [godot] Closes #2238, C# binding generator dislikes type mismatch in gettter/setter pairs. 2023-02-08 13:01:13 +01:00