16 Commits

Author SHA1 Message Date
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
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
Karl Smeltzer
3b1366b04f
[godot] update parse_property signature (#2236) 2023-02-05 11:58:48 +01:00
Mario Zechner
f773ede890 [godot] Fix API change in Godot 4.0 2023-02-02 15:37:52 +01:00
badlogic
0b5621ccd4 [godot] Fix v3 Live++ patch, launch configs and tasks. 2023-01-24 16:52:33 +01:00
badlogic
35c4294a9c [godot] Fixes for latest Godot 4.0, VS Code settings, tasks, and launch configs. 2023-01-24 16:05:10 +01: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
9fcb5007ec [godot] Fix compilation error on latest 3.5 2022-09-03 12:25:37 +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
465879f180 [godot] Closes #2132, errornous connect call. 2022-08-17 19:06:17 +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
68b59271bb [godot] Backport to 4.1 2022-07-18 10:27:42 +02:00