183 Commits

Author SHA1 Message Date
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
433182ef7b [ue] Update example project to UE 5.2 2023-08-03 13:18:02 +02:00
Harald Csaszar
ea16621fb1 Merge branch '4.1' into 4.2-beta 2023-07-24 20:46:11 +02:00
Mario Zechner
b405686823 [godot] More C# build work. 2023-07-21 14:42:45 +02:00
Mario Zechner
e525c77d18 [godot] Rework v4 build scripts to support optionally support C#. 2023-07-19 17:53:01 +02:00
Harald Csaszar
102f3e044b Merge branch '4.1' into 4.2-beta 2023-06-27 15:17:23 +02:00
eCode
4876dba946 feat: add support for pixijs 2023-06-03 13:05:21 -03:00
Mario Zechner
329f5b404f Merge branch '4.1' into 4.2-beta
# Conflicts:
#	spine-cocos2dx/spine-cocos2dx/src/spine/SkeletonRenderer.cpp
2023-02-17 14:28:05 +01:00
Mario Zechner
96c0842021 [cpp] Backport of some 4.2 changes to enable Flutter runtime in 4.1 2023-02-17 14:25:41 +01:00
Mario Zechner
5081519366 Merge branch '4.1' into 4.2-beta 2023-01-24 20:51:35 +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
68a9096049 Merge branch '4.1' into 4.2-beta
# Conflicts:
#	.gitignore
#	spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp
#	spine-ts/package-lock.json
#	spine-ts/package.json
2022-12-27 11:48:02 +01:00
Mario Zechner
a3dc1fdb33 [ts] Phaser plugin scaffold.
# Conflicts:
#	.gitignore
2022-12-27 11:32:33 +01:00
Mario Zechner
8aa66061d9 Merge branch '4.1' into 4.2-beta
# Conflicts:
#	.gitignore
2022-11-29 09:48:51 +01:00
Mario Zechner
a7a2d844e1 [godot] Use our .clang-format. 2022-11-29 09:46:52 +01:00
Mario Zechner
b2842b5775 [flutter] Add spine-cpp copy to .gitignore 2022-08-15 10:18:40 +02:00
Mario Zechner
075ed81426 [flutter] Initial FFI plugin scafold + example. 2022-08-08 18:49:51 +02:00
Mario Zechner
68b59271bb [godot] Backport to 4.1 2022-07-18 10:27:42 +02:00
Mario Zechner
771c526915 Formatting pass. 2022-05-31 12:26:05 +02:00
badlogic
3f6bdb5b01 [cocos2dx] Update instructions for Windows example build. 2022-03-26 01:46:17 +01:00
Mario Zechner
06df4554a6 [cocos2dx] Fix Android example project, update README.md 2022-03-26 01:12:36 +01:00
Mario Zechner
22cc6cafb1 gitignore CMake output 2022-03-25 23:08:39 +01:00
Mario Zechner
a963642e47 [cocos2dx] Unify example to single project for both cocos2d-x v3 and v4 2022-03-25 21:57:30 +01:00
Mario Zechner
8761f44aa7 [cocos2d-objc] Fix example project for latest Xcode. 2022-03-25 14:34:32 +01:00
Mario Zechner
21ae33555a [libgdx] Add drag & drop support to skeleton viewer. Closes #2015 2022-01-23 22:02:55 +01:00
Mario Zechner
beea7c5b4d [monogame] Clean-up of .gitignore and runtimes.sh 2022-01-20 19:44:38 +01:00
Mario Zechner
5e57b86ce3 [monogame] Created new MonoGame solution and projects as replacement for spine-xna. See #1949. 2022-01-20 12:27:28 +01:00
Mario Zechner
81927051ff [ts] Port of sequence attachments, see #1956
SkeletonJson parsing of sequence timelines incomplete. Untested.
2021-10-13 01:14:58 +02:00
badlogic
d521339bfe Merge branch 'ts-modules' into 4.0 2021-09-06 22:39:52 +02:00
Harald Csaszar
dfa2513f3d [csharp][unity] Added spine-csharp .meta files to git. Required for UPM package. See #1676. 2021-09-06 17:39:58 +02:00
Mario Zechner
79f0abf765 [ts] Refactor module resolution, switch to esbuild 2021-08-25 19:30:46 +02:00
Mario Zechner
ca6b3d0bac [ts] Modularize spine-canvas, fixup rollup setup 2021-08-25 01:32:39 +02:00
Mario Zechner
8831c7d96e Add index.ts for core, scripts for dev and build. 2021-08-20 16:59:48 +02:00
Mario Zechner
474dae82a0 ES2015 modulification of spine-ts core. 2021-08-20 16:24:10 +02:00
badlogic
7cbb924d9d [cocos2dx] Minor fix-ups. 2021-07-01 11:27:56 +02:00
badlogic
30702a3bff [c][cpp] Fix AnimationState::clearNext() 2021-06-21 17:45:34 +02:00
badlogic
f70363b1a6 [solar2d] Closes #1749, check if removeSelf is available on draw group 2021-06-10 13:44:23 +02:00
Nathan Sweet
963da7561e [csharp] Code style update.
* `else` on same line as `if` brace.
* `var` only when the type is shown.
* Removed unnecessarily locals, eg `var events = this.events; var eventsItems = events.Items;`.
* Don't indent `case`.
* ExposedList for EventQueue just so iteration can use array indexing.
* EventQueue, inner members (struct/enum) after methods.
* No braces for single line `if/else/for`.
* Removed comments noting ref impl code, eg `// abc.setSize(xyz);`.
* Removed comments that didn't add to what the code shows, eg `// Pooling`.
* Removed comments not in ref impl about implementation details, eg `// nextTrackLast == -1 ...`.
* Removed commented code we are not using.
* Use local with list.Items when iterating.
2021-05-31 01:26:41 -04:00
badlogic
0fa20f151f Merge branch '3.8' into 3.9-beta 2019-10-29 17:29:06 +01:00
badlogic
55fde3217d [as3][starling] Removed FDT support, added Visual Studio Code support instead. See the updated READMEs for spine-as3 and spine-starling for more information on required software and how to run and compile the examples and SWCs. 2019-10-29 17:28:51 +01:00
Tomski
4005b4dee9 Support for Gradle building, installing, and jitpack (#1431) 2019-08-08 15:52:01 +02:00
badlogic
5f13f1b8e6 Exported all examples with 3.8.25-beta to include file format changes in .json and .skel files. 2019-06-19 16:56:47 +02:00
Harald Csaszar
4c9d80926c [unity] gitignore - minor update. 2019-06-17 18:10:43 +02:00
Harald Csaszar
ac1e12e268 [unity] Added a spine-unity tests subdir to .gitignore 2019-06-17 18:07:03 +02:00
Harald Csaszar
996dba9d45 [unity] Corrected .gitignore file for unity-csharp subdir, it still referenced the old directory structure. 2019-06-17 17:53:28 +02:00
badlogic
990ccc4606 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-11-15 15:58:42 +01:00
badlogic
c95af40579 Updated all exports, using PMA now where possible in all examples. Did not update UE4 and Unity assets, these need to be updated manually. 2018-11-15 10:58:30 +01:00
badlogic
72d6be6a21 [ts] Port of fix for tangents at position 0 in PathConstraint. See #1198. 2018-10-26 17:18:05 +02:00
badlogic
bb1bdd7046 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-10-26 17:12:08 +02:00