Harald Csaszar
bc44c5b94d
Merge branch '4.1' into 4.2-beta
2023-09-12 21:27:22 +02:00
Harald Csaszar
19d627592d
[unity] Fixed mask material generation issuing incorrect warnings when only animation sets visible attachments. Applying initial animation before mask material generation. Closes #2363 .
2023-09-12 21:02:45 +02:00
Mario Zechner
4cc4f15f47
[haxe] Fix json parsing, rendering.
2023-09-12 17:44:06 +02:00
Mario Zechner
fafb585882
[haxe] Initial port complete. WIP.
2023-09-12 16:21:41 +02:00
Harald Csaszar
ed1bdc4a41
Merge branch '4.1' into 4.2-beta
2023-09-12 15:41:35 +02:00
Harald Csaszar
9d8c32b496
[unity] Fixed editor artifacts showing bones over Inspector window (Mac M1). Closes #2353 .
2023-09-12 15:40:04 +02:00
Harald Csaszar
1dad0098d5
Merge branch '4.1' into 4.2-beta
2023-09-11 21:52:34 +02:00
Harald Csaszar
defa80c78d
[unity] Fixed compile error on older Unity versions of RenderCombinedMesh. See commit ed75bff.
2023-09-11 21:12:56 +02:00
Harald Csaszar
ee3486ce5a
[unity] Minor: Fixed another formatting issue, not covered in inactive preprocessor code branch.
2023-09-11 20:43:25 +02:00
Harald Csaszar
e49453d774
[unity] Minor: formatting whitespace issue fixed of last commit.
2023-09-11 20:35:20 +02:00
Harald Csaszar
ed75bffc6f
[unity] Added RenderCombinedMesh sample component for combined outlines with SkeletonRenderSeparator or multiple atlas pages.
2023-09-11 20:31:21 +02:00
Mario Zechner
30311f2cd8
[haxe] More porting from 4.0 -> 4.1, WIP
2023-09-11 14:06:13 +02:00
Harald Csaszar
51b108f2e1
[unity] Fixed a logic error of loader asset creation from commit 76e8538. See #1890 .
2023-09-08 20:02:31 +02:00
Harald Csaszar
1f57fb2a9d
[unity] Fixed compile error in conditional version branch of commit 76e8538. See #1890 .
2023-09-08 19:35:05 +02:00
Harald Csaszar
e4721a8cf3
[unity] Minor: Formatting changes of last commit 76e8538. See #1890 .
2023-09-08 19:28:26 +02:00
Harald Csaszar
76e85387d1
[unity] Implemented first experimental preview package version of delayed on-demand loading of Atlas assets. See #1890 .
2023-09-08 19:22:08 +02:00
Mario Zechner
ec0ff67084
[haxe] Initial commit
2023-09-08 14:06:49 +02:00
Harald Csaszar
03b6a397d9
Merge branch '4.1' into 4.2-beta
2023-09-07 14:07:16 +02:00
Mario Zechner
4f33a2aae6
[phaser] Closes #2348 , fix visibility test
2023-09-07 13:37:40 +02:00
Harald Csaszar
a740fae009
[unity] Fixed compile error of previous commit 238818d on Unity 2017. See #2358 .
2023-09-07 13:28:56 +02:00
Harald Csaszar
238818dd13
[unity] Fixed ShaderGraph shaders not displayed at PartsRenderers on Unity 2023.1. Closes #2358 .
2023-09-07 13:14:04 +02:00
Mario Zechner
90db1108db
Merge branch '4.1' into 4.2-beta
2023-09-06 11:47:17 +02:00
Mario Zechner
aa0b9d57ca
Formatting
2023-09-06 11:47:07 +02:00
Mario Zechner
8c53a07c5d
Merge branch '4.1' into 4.2-beta
2023-09-06 11:07:25 +02:00
Mario Zechner
fed76c80c6
[c] Additional #2325 work, precalculate the space needed for property IDs in animations
2023-09-06 11:07:17 +02:00
Mario Zechner
8fb5d4f2b8
Merge branch '4.1' into 4.2-beta
2023-09-06 11:03:46 +02:00
Mario Zechner
066a152756
[c] Closes #2325 , avoid allocations when reading vertices from binary files.
2023-09-06 11:03:35 +02:00
Mario Zechner
29bbc026b5
[ts] Release 4.2.20
2023-09-05 22:46:12 +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
6b8170bc2a
[ts] Release 4.1.40
2023-09-05 22:44:56 +02:00
Mario Zechner
3acbc2ab7a
Formatting
2023-09-05 22:36:04 +02:00
Mario Zechner
7b98021228
[phaser] Update examples to Phaser 3.60.0
2023-09-05 22:35:30 +02:00
spayton
f80bc5e110
The new SpineGameObject should use the gameObject's scene ref, not the system scene ( #2357 )
2023-09-05 22:30:54 +02:00
Mario Zechner
33e9c24408
[ts] Release 4.2.20
2023-09-05 15:25:55 +02:00
Mario Zechner
23ca29b108
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 15:24:39 +02:00
Mario Zechner
31e346e84a
[ts] Release 4.1.39
2023-09-05 15:24:11 +02:00
Mario Zechner
2f33d326a8
[phaser] Closes #2356 , only instantiate a single SceneRenderer for the whole game.
2023-09-05 15:22:33 +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
3b66796bb7
Merge branch '4.1' into 4.2-beta
2023-09-04 10:56:38 +02:00
Mario Zechner
600e43de24
Formatting
2023-09-04 10:56:28 +02:00
Mario Zechner
3ef522896e
[ts] Release 4.2.19
2023-09-04 10:55:36 +02:00
Mario Zechner
42959e0e72
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-phaser/src/SpinePlugin.ts
# 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-04 10:54:21 +02:00
Mario Zechner
a64a81f96f
[phaser] Remove superfluous assignment.
2023-09-04 10:52:47 +02:00
Mario Zechner
603ef985da
[ts] Release 4.1.38
2023-09-04 10:51:12 +02:00
Mario Zechner
4af059f326
[phaser] Minor clean-up.
2023-09-04 10:49:38 +02:00
Mario Zechner
99f6aa5ced
[phaser] Backport of #2337
2023-09-04 10:47:27 +02:00
Phaser Editor 2D
4892bceb66
[Phaser] Adds Asset Pack support ( #2337 )
...
* [Phaser] Adds Asset Pack support.
In Phaser you can use an Asset Pack manifest json file for loading the assets.
This PR adds Asset Pack support to the SpinePlugin.
* [Phaser] Update SpinePlugin.ts. Fixes code indentation.
Fixes code indentation of the previous commit.
* [Phaser] Uses typescript interface for loader file configurations.
2023-09-04 10:43:00 +02:00
spayton
07c05431bf
split webgl blendmodes into separate destination color/alpha values ( #2347 )
2023-09-04 10:40:16 +02:00
Misaki Eymard
d041e9e39c
Changed variable animation -> animationComponent in SpineboyCppPawn.cpp ( #2344 )
2023-09-04 10:38:06 +02:00