8514 Commits

Author SHA1 Message Date
Mario Zechner
4e7c4a9159 Merge branch '4.1' into 4.2-beta 2023-09-14 13:13:02 +02:00
Mario Zechner
b5c5fb6bde Formatting. 2023-09-14 13:12:53 +02:00
Mario Zechner
f2f1a8ce46 [haxe] Fix SkeletonSprite.advanceTime to use the actual delta time. 2023-09-14 12:26:34 +02:00
Mario Zechner
8f8bf06610 [haxe] License headers. 2023-09-14 11:33:15 +02:00
Mario Zechner
02220279bb [haxe] Remove superfluous OpenFL imports. 2023-09-14 11:23:09 +02:00
Mario Zechner
c400a80718 Merge branch '4.1' into 4.2-beta 2023-09-14 00:11:37 +02:00
Mario Zechner
fd62fee92a [haxe] Make SequenceExample compile. 2023-09-14 00:11:27 +02:00
Mario Zechner
1aa727bf43 [haxe] Fix parsing binary deform timelines, sequences. 2023-09-13 23:53:25 +02:00
Mario Zechner
322c2a24a5 [haxe] Fix parsing binary deform timelines, sequences. 2023-09-13 23:45:31 +02:00
Mario Zechner
a4000104c6 [ts] Release 4.2.21 2023-09-13 22:44:21 +02:00
Mario Zechner
b33c6c58cc 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-13 22:29:16 +02:00
Mario Zechner
ed326999af [ts] Release 4.1.41 2023-09-13 22:28:17 +02:00
Mario Zechner
a397b8fe3f [webgl] Fix blend modes, see #2025, #2347 2023-09-13 22:26:27 +02:00
Mario Zechner
d5326a9823 Revert "split webgl blendmodes into separate destination color/alpha values (#2347)"
This reverts commit 07c05431bf8754415736052046123a97ab475d2c.

# Conflicts:
#	spine-ts/spine-webgl/src/SkeletonRenderer.ts
2023-09-13 19:43:45 +02:00
Mario Zechner
9eab06f3ba [haxe] Fix texture atlas loading, sequence example. 2023-09-13 19:35:30 +02:00
Harald Csaszar
0d1948a821 Merge branch '4.1' into 4.2-beta 2023-09-13 17:47:06 +02:00
Harald Csaszar
ee502d854b [unity] Fixed RenderCombinedMesh incorrect index offsets. See commit ed75bff. 2023-09-13 17:44:37 +02:00
Mario Zechner
806ec03e0d [haxe] Fix binary asset loading, make Skeleton.getBounds() easier to use. 2023-09-13 17:36:52 +02:00
Harald Csaszar
74615a5177 [unity] Timeline extension package: Added static EditorEvent callback for editor scripts to react to animation events outside play-mode. 2023-09-13 16:25:42 +02:00
Mario Zechner
fdfc4642ad [haxe] minimal scene framework, fixes for Haxe C++, clean-up of API 2023-09-13 15:36:03 +02:00
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