3942 Commits

Author SHA1 Message Date
badlogic
814dcf302b Merge branch '3.6' into 3.7-beta 2018-02-08 16:29:13 +01:00
badlogic
a0340f82f5 Merge branch '3.6' of https://github.com/esotericsoftware/spine-runtimes into 3.6 2018-02-08 14:40:21 +01:00
badlogic
7a10d04e61 [starling] Closes #1078, breaking change. If a skeleton requires two color tinting, you have to enable it manually via SKeletonSprite.twoColorTint = true. Skeletons with two color tinting enabled use TwoColorMeshStyle, which has a different vertex layout and shader compared to the default layout and shaders used by Starling and the spine-starling runtime. This will break your batch and add additional draw calls, use with care. 2018-02-08 14:39:51 +01:00
John
f5d62bf88a
[unity] Fix <none> item for [SpineSlot] attribute. 2018-02-08 21:32:09 +08:00
badlogic
d27a9a3d87 [starling] Remove allocations in TwoColorEffect. Closes #1078 2018-02-08 14:02:13 +01:00
badlogic
200bb7765d Updated .gitignore to exclude new dependency directories.g 2018-02-08 13:19:14 +01:00
badlogic
28df2f8944 Merge branch '3.6' into 3.7-beta 2018-02-06 15:16:55 +01:00
badlogic
39c63887c0 Merge branch '3.6' of https://github.com/esotericsoftware/spine-runtimes into 3.6 2018-02-06 15:16:44 +01:00
badlogic
eecde9e871 [cocos2d-x] Closes #1075, added SkeletonRenderer:setSlotsRange and SkeletonRenderer::createWithSkeleton. Allows rendering parts of a single skeleton, mixed with other nodes. See SkeletonRendererSeparator.cpp for an example. 2018-02-06 15:16:23 +01:00
badlogic
6f6db39f64 [cpp] Added spine.h 2018-02-06 14:13:40 +01:00
badlogic
2137dddf3b [sfml] Added cpp backend, refactored build. 2018-02-05 13:52:37 +01:00
badlogic
7180f17af2 [cpp] All Spine objects derrive from SpineObject so we can override new/delete, which in turn calls SpineExtension allocation methods (not implemented yet). Refactored SpineExtension, removing use of macros, introducing use of templated static methods for more comfort. Rewired all allocation code throughout the runtime. See #1046. 2018-02-01 17:40:55 +01:00
pharan
cf7447628b [unity] Use IHasSkeletonDataAsset interface. 2018-02-01 13:04:27 +08:00
pharan
4c7a6b6501 [unity] Use explicit primitive type instead of var. 2018-02-01 13:03:29 +08:00
pharan
1d5b62c2fd [unity] Skip SkeletonUtility follow post-local phase if bones are not constrained. 2018-01-31 19:32:34 +08:00
pharan
9e89e37c54 [unity] Disabled HingeChain2D code. 2018-01-31 19:27:34 +08:00
pharan
b7b839063b [unity] Fix unconstrained SkeletonUtility following one frame behind. 2018-01-31 19:27:07 +08:00
pharan
c584de7c26 [unity] Make Skeleton Material preview 2D. 2018-01-31 19:19:54 +08:00
badlogic
5d63fabcce Merge branch 'NoctisGames-3.6' into 3.7-beta 2018-01-29 15:59:16 +01:00
badlogic
54e99f1454 [lua] Ported additive blending, see #1060, see #1029 2018-01-29 15:37:13 +01:00
Stephen Gowen
2228c98508 Merge remote-tracking branch 'EsotericSoftware/3.6' into 3.6 2018-01-24 18:00:16 -05:00
badlogic
713f43a247 Merge branch '3.6' into 3.7-beta 2018-01-24 14:30:47 +01:00
badlogic
16d799002d [as3] Fixed sorting of path constraint attachments. Closes #1069. 2018-01-24 14:29:40 +01:00
badlogic
6a556de014 [as3] Ported additive blending. See #1029, #1060 2018-01-23 15:45:33 +01:00
badlogic
b7e712d3ca [sfml] Added owl sample. 2018-01-23 14:16:42 +01:00
badlogic
a9deff2d2f [c] Fixed binary skeleton parsing. 2018-01-23 14:03:18 +01:00
badlogic
c24990a1c4 Merge branch '3.6' into 3.7-beta 2018-01-22 16:13:22 +01:00
badlogic
fe9ae97747 [ts][threejs] Fixed bug in core AssetManager when loading multi-page atlases. Rewrote THREE.JS renderer to support multi-page atlases. Fixed clipping in THREE.JS backend. Closes #1066, closes #677. 2018-01-22 16:11:42 +01:00
badlogic
2987e2ae69 [maven-release-plugin] prepare for next development iteration 2018-01-22 12:16:16 +01:00
badlogic
fc02cbba07 [maven-release-plugin] prepare release spine-libgdx-3.6.51.1 spine-libgdx-3.6.51.1 2018-01-22 12:16:10 +01:00
badlogic
53a7c311ae Merge branch '3.6' into 3.7-beta 2018-01-22 12:06:34 +01:00
pharan
b1bfd3e8f9 [unity] Updated examples. 2018-01-21 05:53:02 +08:00
pharan
ac4f339ba2 Merge branch '3.7-beta' of https://github.com/EsotericSoftware/spine-runtimes into 3.7-beta 2018-01-21 05:44:22 +08:00
pharan
cc65d4aeea Merge branch '3.6' of https://github.com/EsotericSoftware/spine-runtimes into 3.7-beta 2018-01-21 05:44:15 +08:00
badlogic
da6b46b7ac Merge branch '3.7-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.7-beta 2018-01-19 13:44:20 +01:00
badlogic
90e1a5ca5a Updated owl. 2018-01-19 13:15:31 +01:00
pharan
b4c8deb283 [csharp] Animation and AnimationState 3.7 2018-01-19 05:34:20 +08:00
pharan
83778a76c1 [csharp] Add audioPath to EventData and SkeletonData 2018-01-19 02:47:44 +08:00
Stephen Gowen
945db25c6f Merge remote-tracking branch 'EsotericSoftware/3.6' into 3.6 2018-01-18 11:13:35 -05:00
badlogic
18eec077e4 Updated owl to key blink animation properly. 2018-01-18 15:52:09 +01:00
badlogic
9aaf57959d [ts] Updated build. 2018-01-18 15:29:49 +01:00
badlogic
b547280eb9 Updated samples, added owl. 2018-01-18 15:18:31 +01:00
badlogic
c94bec6e4e [c] Ported additive blending, including attachment and draw order timeline fixes. See #1029, #1060 2018-01-18 14:59:26 +01:00
pharan
da3f84b38c [unity] Use IHasRendererObject 2018-01-18 00:47:08 +08:00
pharan
d97c80df7d [unity] Some cleanup. 2018-01-18 00:41:42 +08:00
pharan
217215cbd7 [unity] Remove superfluous constructor. (Fix for 2018.1b) 2018-01-18 00:41:24 +08:00
pharan
4e3cf15acb [unity] Use IHasRendererObject. 2018-01-18 00:40:42 +08:00
pharan
f6a98b0f43 [csharp] IHasRendererObject 2018-01-18 00:39:21 +08:00
pharan
aa32c1aefd [csharp] Line endings. 2018-01-18 00:38:32 +08:00
Stephen Gowen
162cbeec72 Porting over recent change from AnimationState.c to AnimationState.cpp 2018-01-16 09:50:31 -05:00