pharan
|
265d9413d3
|
Merge branch 'master' into 3.6-beta
Conflicts:
spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs
spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs
spine-unity/Assets/spine-unity/SkeletonAnimator.cs
|
2017-06-14 19:46:14 +08:00 |
|
badlogic
|
060c846f75
|
Merge branch '3.6-timeline-animation-changes-c' into 3.6-beta
|
2017-06-14 13:03:21 +02:00 |
|
badlogic
|
1772e32a6c
|
[c] Ported changes to Animation/Timeline.
|
2017-06-14 13:02:59 +02:00 |
|
John
|
5e0ff3694d
|
[csharp] Cleanup VertexAttachment id threadsafety
|
2017-06-14 04:11:38 +08:00 |
|
pharan
|
61a5058a5c
|
[csharp] Thread safety for acquiring next VertexAttachment ID. 8a78eb4cf5
|
2017-06-13 08:52:37 +08:00 |
|
pharan
|
7481a05931
|
[unity] Update calls to Timeline/Animation.Apply. And other cleanup.
|
2017-06-13 08:51:53 +08:00 |
|
pharan
|
44a44aa6c6
|
[csharp] Changed Timeline.Apply. Animation, AnimationState handle setup pose before first key.
|
2017-06-13 08:49:29 +08:00 |
|
badlogic
|
4735f3e118
|
[c] Preparation work for animation/timeline changes.
|
2017-06-13 00:53:00 +02:00 |
|
badlogic
|
fda2e90ce2
|
Added new enums
|
2017-06-13 00:52:03 +02:00 |
|
badlogic
|
ba409c8f3b
|
[as3] Ported VertexAttachment id and Timeline/Animation#apply changes
|
2017-06-12 17:27:14 +02:00 |
|
badlogic
|
a797534476
|
Merge branch '3.6-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.6-beta
|
2017-06-12 17:00:16 +02:00 |
|
badlogic
|
f158e9e996
|
[ts] Ported VertexAttachment id and Timeline/Animation#apply changes
|
2017-06-12 17:00:10 +02:00 |
|
NathanSweet
|
8a78eb4cf5
|
[libgdx] Thread safety for acquiring next VertexAttachment ID.
|
2017-06-12 16:47:16 +02:00 |
|
NathanSweet
|
ef6f181267
|
Merge remote-tracking branch 'origin/3.6-beta' into 3.6-beta
|
2017-06-12 02:49:03 +02:00 |
|
NathanSweet
|
5540b47f21
|
Changed Timeline#apply to enum parameters, AnimationState special cases track 0 to apply setup pose before first key.
|
2017-06-12 02:48:58 +02:00 |
|
Mohammad S. Babaei
|
d4d2165b25
|
[ue4] make the plugin build on UE 4.16.x (#922)
|
2017-06-11 21:33:14 +02:00 |
|
pharan
|
27d5f8df6a
|
Merge branch '3.6-beta' of https://github.com/EsotericSoftware/spine-runtimes into 3.6-beta
|
2017-06-11 08:22:39 +08:00 |
|
pharan
|
14e718d0d3
|
[unity] Add vertex effect callback.
|
2017-06-11 08:22:10 +08:00 |
|
pharan
|
9cd0167a03
|
[unity] Allow SkeletonGraphic runtime atlas.
|
2017-06-11 08:20:15 +08:00 |
|
John
|
bf7a8db0eb
|
[unity] Allow SkeletonGraphic runtime atlas.
|
2017-06-11 08:10:16 +08:00 |
|
John
|
45bdf87dac
|
[csharp] readonly VertexAttachment.id
|
2017-06-11 02:37:03 +08:00 |
|
pharan
|
14d031cb78
|
[csharp] Added shifted vertex attachment IDs for DeformTimeline.
|
2017-06-11 00:38:38 +08:00 |
|
NathanSweet
|
a8577b78a7
|
Shift attachment IDs to reduce effort needed to compute DeformTimeline ID.
|
2017-06-10 18:28:16 +02:00 |
|
NathanSweet
|
c4268d4bfe
|
Merge remote-tracking branch 'origin/3.6-beta' into 3.6-beta
|
2017-06-10 18:21:47 +02:00 |
|
NathanSweet
|
45870ef028
|
Added vertex attachment IDs for DeformTimeline.
|
2017-06-10 18:21:15 +02:00 |
|
pharan
|
354ef48a64
|
[csharp] Fix IkConstraint fix port. 73cb6299de
|
2017-06-10 06:50:29 +08:00 |
|
pharan
|
714f010006
|
[csharp] Minor changes to Attachments for 3.6
|
2017-06-10 06:41:20 +08:00 |
|
John
|
0554c5bb97
|
[unity] SkeletonAnimator log errors.
|
2017-06-10 02:27:24 +08:00 |
|
John
|
dd0f489eae
|
[unity] Ignore non-Spine dummy AnimationClips.
|
2017-06-10 02:02:41 +08:00 |
|
John
|
9cc2fa6a2b
|
[unity] Handle obsolete DotCap call.
|
2017-06-08 01:09:01 +08:00 |
|
pharan
|
e0a398bfc5
|
[unity] Handle skinless SkeletonGraphic.
|
2017-06-07 08:09:45 +08:00 |
|
pharan
|
b2c0034dbf
|
[unity] SlotBlendModes module.
|
2017-06-07 08:09:24 +08:00 |
|
John
|
ef408344be
|
[unity] SpineAttributeDrawers menu item methods.
|
2017-06-07 08:00:24 +08:00 |
|
badlogic
|
54cb4dfa02
|
[ts] Closes #914, loading of PathAttachment lengths in SkeletonJson was incorrect
|
2017-06-04 11:47:15 +02:00 |
|
badlogic
|
fcf9d3bb35
|
[lua] Fixed deform timelines not mixing from/to setup pose. #920
|
2017-06-04 11:07:04 +02:00 |
|
badlogic
|
57eab37e11
|
[as3] Fixed deform timelines not mixing from/to setup pose. #920
|
2017-06-04 11:06:22 +02:00 |
|
badlogic
|
63459d8531
|
[c] Fixed deform timelines not mixing from/to setup pose. #920
|
2017-06-04 11:05:07 +02:00 |
|
badlogic
|
2b5058f020
|
[ts] Fixed deform timelines not mixing from/to setup pose. #920
|
2017-06-04 11:03:13 +02:00 |
|
badlogic
|
3e8f3be0e4
|
[lua] AnimationState#apply returns boolean indicating if any timeline was applied. #919
|
2017-06-04 11:01:04 +02:00 |
|
badlogic
|
061d0d26b2
|
[c] AnimationState#apply returns boolean indicating if any timeline was applied. #919
|
2017-06-04 10:59:02 +02:00 |
|
badlogic
|
b14b5d805d
|
Updated CHANGELOG
|
2017-06-04 10:56:01 +02:00 |
|
badlogic
|
0eaf8fcfa0
|
[as3] AnimationState#apply returns boolean indicating if any timeline was applied. #919
|
2017-06-04 10:55:35 +02:00 |
|
badlogic
|
b5e08f59e1
|
[ts] AnimationState#apply returns boolean indicating if any timeline was applied. #919
|
2017-06-04 10:53:09 +02:00 |
|
John
|
3c194a5c9d
|
[csharp] Fixed deform timelines not mixing to/from setup pose.
ef6ccb84d3
|
2017-06-02 21:59:45 +08:00 |
|
John
|
8fa441e284
|
[csharp] Return true from AnimationState#apply if any animation was applied.
|
2017-06-02 21:59:00 +08:00 |
|
NathanSweet
|
464e9b3362
|
[libgdx] Removed sysouts.
Dang amateurs!
|
2017-06-02 00:09:59 +02:00 |
|
NathanSweet
|
ef6ccb84d3
|
[libgdx] Fixed deform timelines not mixing to/from setup pose.
|
2017-06-01 23:44:09 +02:00 |
|
NathanSweet
|
7e75c7c5b1
|
[libgdx] SkeletonViewer keeps loop state for tracks playing.
|
2017-06-01 23:43:30 +02:00 |
|
NathanSweet
|
3b6b0f52e2
|
Merge remote-tracking branch 'origin/3.6-beta' into 3.6-beta
|
2017-06-01 21:15:00 +02:00 |
|
NathanSweet
|
1b4ac3ba8e
|
[libgdx] SkeletonViewer clean up.
|
2017-06-01 21:14:49 +02:00 |
|