UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-11 09:38:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,894 Commits 17 Branches 33 Tags
Commit Graph

4894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
badlogic
893b9a8a93 Merge branch '3.6' into 3.7-beta 2017-10-28 16:23:36 +02:00
badlogic
3006353c8c [c] Fix handling of SP_MIX_POSE_CURRENT_LAYERED, closes #1028. 2017-10-28 16:23:27 +02:00
Nathan Sweet
eb44a67240 Additive for translate and scale timelines 2017-10-28 15:33:19 +02:00
badlogic
aba0348d06 Merge branch '3.6' into 3.7-beta 2017-10-28 09:46:52 +02:00
badlogic
ed2594deca [csharp] Fix not returning to setup pose when multiple mixing from entries end at same time. See #1027 2017-10-28 09:44:21 +02:00
badlogic
a8c5282653 [c] Fix not returning to setup pose when multiple mixing from entries end at same time. See #1027 2017-10-28 09:43:26 +02:00
badlogic
bb23c5e25c [lua] Fix not returning to setup pose when multiple mixing from entries end at same time. See #1027 2017-10-28 09:41:28 +02:00
badlogic
77c990c75e [as3] Fix not returning to setup pose when multiple mixing from entries end at same time. See #1027 2017-10-28 09:40:17 +02:00
badlogic
5b410bf2ba [ts] Fix not returning to setup pose when multiple mixing from entries end at same time. See #1013 2017-10-28 09:37:28 +02:00
Nathan Sweet
882f49f5a9 Fix not returning to setup pose when multiple mixing from entries end at same time 
#1024
 2017-10-28 00:20:33 +02:00
Nathan Sweet
0414803ee1 Fix not returning to setup pose when multiple mixing from entries end at same time 
#1024
 2017-10-28 00:18:20 +02:00
Nathan Sweet
980352a7ce Removed bad fix for #1024 2017-10-28 00:08:47 +02:00
Nathan Sweet
1514b4acbb Removed bad fix for #1024 2017-10-28 00:05:56 +02:00
Nathan Sweet
0d4ce16fc3 MSAA for Skeleton Viewer. 
WCGW
 2017-10-27 21:02:36 +02:00
Stephen Gowen
6916003d13 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-27 14:33:46 -04:00
NathanSweet
b52fe0b771 Merge remote-tracking branch 'origin/3.7-beta' into 3.7-beta 
# Conflicts:
#	spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
 2017-10-27 11:04:11 +02:00
badlogic
e53a295dff Merge branch '3.6' into 3.7-beta 2017-10-27 10:45:43 +02:00
badlogic
93d34666b0 Fixed typo in README.md 2017-10-27 10:45:29 +02:00
NathanSweet
bda035e836 Added additive mixing, still a WIP. 2017-10-27 00:23:41 +02:00
Stephen Gowen
d6215acf17 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-25 16:25:33 -04:00
John
b502aa3c23 [unity] Handle null preview texture in editor. 2017-10-25 20:30:23 +08:00
Stephen Gowen
873b4d397f wip 2017-10-24 20:54:27 -04:00
Stephen Gowen
8ef11955a7 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-24 17:56:29 -04:00
John
7c29b9573a [unity] Fix SkeletonGraphic shader alpha. 2017-10-24 18:29:01 +08:00
Stephen Gowen
10c2ae1514 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-23 12:55:34 -04:00
John
1f704aec5e [csharp] Don't use the dip fix if mixing is complete. 
Based on: 28fd5aff09
See https://github.com/EsotericSoftware/spine-runtimes/issues/1024
 2017-10-24 00:41:35 +08:00
NathanSweet
28fd5aff09 [libgdx] Don't use the dip fix if mixing is complete. 
closes #1024
 2017-10-23 18:30:46 +02:00
NathanSweet
472392190f [libgdx] Documented track entry timeline mix types. 
#1024
 2017-10-23 18:15:49 +02:00
NathanSweet
1ae9fb955b [libgdx] Documented track entry timeline mix types. 2017-10-23 18:02:06 +02:00
Stephen Gowen
d7a569d47d wip 2017-10-22 21:08:29 -04:00
NathanSweet
406a8fba13 [libgdx] Fixed off by 1 errors. 2017-10-21 21:48:04 +02:00
Stephen Gowen
9129d64100 wip 2017-10-21 11:34:38 -04:00
Stephen Gowen
7b585cde41 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-20 18:04:01 -04:00
NathanSweet
3b3527ffc7 Merge branch '3.6' into 3.7-beta 2017-10-20 22:13:07 +02:00
NathanSweet
751c99ad2d Merge remote-tracking branch 'origin/3.6' into 3.6 2017-10-20 22:00:29 +02:00
NathanSweet
1e7f7026ab [libgdx] Fixed off by 1 errors. 2017-10-20 22:00:16 +02:00
NathanSweet
77b38c2ed1 [libgdx] Javadocs. 2017-10-20 22:00:08 +02:00
Stephen Gowen
f2b9e49d81 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-20 15:00:51 -04:00
pharan
92a5faba58 [unity] Use UnityObjectViewPos in Sprite shader. 2017-10-20 17:30:53 +08:00
pharan
652506df0c [unity] Handle playModeStateChanged API change (2017.2). 2017-10-20 17:30:07 +08:00
pharan
6659902457 [unity] Add rotation param to RegionAttachment creation. 2017-10-20 17:29:33 +08:00
badlogic
e7f21bfa29 Merge branch '3.6' into 3.7-beta 2017-10-20 11:19:48 +02:00
badlogic
299fa5dc8f [c] Fix PathConstraint length spacing for zero length bones. See #1023. 2017-10-20 11:18:52 +02:00
badlogic
52a300eeae [lua] Fix PathConstraint length spacing for zero length bones. See #1023. 2017-10-20 11:16:44 +02:00
badlogic
cbb37a6096 [as3] Fix PathConstraint length spacing for zero length bones. See #1023. 2017-10-20 11:12:58 +02:00
badlogic
bcc7da56d2 [ts] Fix PathConstraint length spacing for zero length bones. See #1023. 2017-10-20 11:09:42 +02:00
John
bdb97a023f [unity] Fix UI TintBlack shader. 2017-10-20 16:51:10 +08:00
Stephen Gowen
30dc2c08c6 Wip 2017-10-19 15:36:38 -04:00
Stephen Gowen
1b89b06b77 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-19 10:22:52 -04:00
NathanSweet
ef798dafe3 Merge branch '3.6' into 3.7-beta 2017-10-19 16:21:19 +02:00