3361 Commits

Author SHA1 Message Date
badlogic
4b2d233807 Merge branch '3.6' into 3.7-beta 2017-07-04 11:21:51 +02:00
badlogic
15011e81b7 [ue4] Added simple C++ example 2017-07-04 11:21:12 +02:00
badlogic
4a246d53e2 Merge branch '3.6' into 3.7-beta 2017-07-04 10:44:15 +02:00
badlogic
807c4d27bd [lua] Ported fix for DeformTimeline, see #932 2017-07-04 10:43:59 +02:00
badlogic
6137da3eb2 Merge branch '3.6' into 3.7-beta 2017-07-04 10:33:27 +02:00
badlogic
8b14b18fda [c] Ported fix for DeformTimeline, see #932 2017-07-04 10:33:16 +02:00
John
263c6278e2 [unity] BoundingBoxFollower also uses active skin. 2017-07-04 08:57:38 +08:00
John
dac38e5843 [unity] Allow overwrite initialize + logs. 2017-07-03 17:15:13 +08:00
pharan
f1aa76570f [unity] Updated shaders to Unity 5.6. 2017-06-29 17:14:55 +08:00
pharan
216441ac4a [unity] Cleanup line endings. 2017-06-29 17:14:27 +08:00
pharan
a3e4bdd3d8 Merge branch '3.6' into 3.7-beta 2017-06-28 22:44:36 +08:00
John
c9c360fa88 [unity] Fix SkeletonAnimator inspector property. 2017-06-28 22:22:36 +08:00
John
7ef8c6f9b0 [unity] AddBoundingBoxAsComponent options. 2017-06-28 18:10:55 +08:00
John
afd8272dc6 [unity] Fix ragdoll2D parts being kinematic. 2017-06-28 18:09:15 +08:00
John
220b5b5282 [unity] Don't process icons in play mode. 2017-06-28 16:05:23 +08:00
John
7f367dd496 [unity] Don't process icons in play mode. 2017-06-28 16:03:23 +08:00
badlogic
2567339fa6 [as3] Ported fix for DeformTimeline, see #932 2017-06-27 16:32:51 +02:00
badlogic
59dc784cb2 [ts] Ported fix for DeformTimeline, see #932 2017-06-27 16:25:30 +02:00
badlogic
35830069a6 Merge branch '3.6' into 3.7-beta 2017-06-27 16:15:38 +02:00
badlogic
c6fefe8fa0 [c][lua][as3][ts] Don't use DIP_MIX across tracks. Closes #931 2017-06-27 16:15:23 +02:00
badlogic
13bfb1bd0f Merge branch '3.6' into 3.7-beta 2017-06-27 15:47:37 +02:00
badlogic
fdee465333 [lua][love][corona] Added vertex effect support. See #898 2017-06-27 15:46:44 +02:00
badlogic
1b495bbe72 Merge branch '3.6' into 3.7-beta 2017-06-27 14:34:27 +02:00
badlogic
943b4f98a7 [as3][starling] Added VertexEffect and implementations plus support for Starling. See #898 2017-06-27 14:25:02 +02:00
John
7361358121 [unity] AttachmentTools handle Points and Clipping 2017-06-27 15:36:18 +08:00
badlogic
346b5a273c Fixed typo in spine-ts README.md 2017-06-26 17:31:50 +02:00
badlogic
b5f79f80c3 [xna][monogame] Added support for vertex effects, see #898 2017-06-26 17:28:34 +02:00
badlogic
c06bd8f181 Merge branch '3.6' into 3.7-beta 2017-06-26 16:21:18 +02:00
badlogic
0abefacf23 [cocos2d-objc] Added vertex effects support. See #898 2017-06-26 15:19:14 +02:00
badlogic
798f7c584f Merge branch '3.6' of https://github.com/esotericsoftware/spine-runtimes into 3.6 2017-06-26 15:01:04 +02:00
badlogic
7488383b15 [cocos2dx] Added support for vertex effects. See #898 2017-06-26 15:00:59 +02:00
John
4323329b1f [unity] Reallow manual SkeletonDataAsset setup. 2017-06-26 20:18:15 +08:00
badlogic
65d1f51acc [c][sfml] Added spVertexEffect, and some math utilities. Fixed unit tests. 2017-06-26 14:00:00 +02:00
pharan
635ef9ca97 [unity] Fix and update examples. 2017-06-26 15:34:55 +08:00
badlogic
fc06686080 Merged origin 3.6 with local 3.6 manually. 2017-06-26 09:08:53 +02:00
pharan
5a984d9f06 Merge branch '3.6' into 3.7-beta 2017-06-26 14:22:13 +08:00
pharan
83d45b5492 [tk2d] Allow Spine.AtlasAsset fallback for TK2D in inspector. 2017-06-26 14:16:14 +08:00
pharan
f62e2e12b8 [unity] Shorten BoneFollower.SetBone string API. 2017-06-26 14:14:04 +08:00
pharan
02d1bfc465 [unity] Fix SkeletonGraphic.OverrideTexture. 2017-06-26 14:13:16 +08:00
NathanSweet
b0cf3abd71 Added event audio path field. 2017-06-25 02:07:34 +02:00
NathanSweet
447cce2f84 Merge branch '3.6' into 3.7-beta 2017-06-24 18:34:49 +02:00
John
4139546b87 [csharp] Don't use DIP_MIX across tracks.
based on 61e54a5771
2017-06-24 12:44:38 +08:00
NathanSweet
61e54a5771 [libgdx] Don't use DIP_MIX across tracks.
`DIP_MIX` finds the next entry which does NOT key the timeline property and mixes out the "dip fix" (which is where a timeline is fully applied because a subsequent timeline keys the same property). This handles the case of A->B->C->D where A, B, and C key the same property but D doesn't. A uses the dip fix, then when D mixes in, `DIP_MIX` causes A to mix out, affecting B and C. If D is in another track, it is applied concurrently with A, B, and C so should not cause A to mix out.
2017-06-24 03:06:50 +02:00
badlogic
db68d1d8b4 Merge branch '3.6' into 3.7-beta 2017-06-22 20:47:19 +02:00
badlogic
114447bdeb Merged TS SkeletonClipping fix in the wrong direction... 2017-06-22 20:47:09 +02:00
badlogic
dff2891e00 Merge branch '3.6' into 3.7-beta 2017-06-22 20:46:04 +02:00
badlogic
c614de0946 [c] Initializing bone transforms to identity on creation. Closes #924. 2017-06-22 20:44:14 +02:00
badlogic
4ca68009a1 Merge branch '3.6' into 3.7-beta 2017-06-22 20:35:38 +02:00
badlogic
29b9955905 [ts] SkeletonClipping had an indexing bug when applying dark tint color to clipped triangles. Closes #926 2017-06-22 20:34:57 +02:00
NathanSweet
3c01f212d6 Merge remote-tracking branch 'origin/3.6' into 3.6 2017-06-22 10:35:16 +02:00