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

4716 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Sweet
c25675f75e Disallow additive on track 0. 2017-10-30 14:15:27 +01:00
badlogic
0837774cfa Merge branch '3.6' into 3.7-beta 2017-10-30 14:14:05 +01:00
badlogic
e6c2b75101 [ts] More test refactoring. 2017-10-30 14:12:03 +01:00
badlogic
38756e22e2 Merge branch '3.6' into 3.7-beta 2017-10-30 14:10:04 +01:00
badlogic
470ae4a1f3 [ts] More test refactoring. 2017-10-30 14:09:56 +01:00
badlogic
bbfa376e95 Merge branch '3.6' into 3.7-beta 2017-10-30 14:06:50 +01:00
badlogic
de3acaf084 [ts] reworked example/tests 2017-10-30 14:06:41 +01:00
badlogic
78a1df5c8e [ts] Fixed DeformTimeline additive blend after last frame. 2017-10-30 14:05:12 +01:00
Nathan Sweet
70482336ac Always compute timeline data for track 0, which cannot be additive. 2017-10-30 14:02:39 +01:00
Nathan Sweet
070b3c98d8 Merge remote-tracking branch 'origin/3.7-beta' into 3.7-beta 2017-10-30 13:58:31 +01:00
Nathan Sweet
097bf986bb Fixed deform additive blend after last frame. 
#1030
 2017-10-30 13:58:23 +01:00
badlogic
30d65cfe4a [ts] Fixed up skins example. 2017-10-30 13:49:35 +01:00
badlogic
f750b3f708 [ts] Ported additive animation blending, see #1029. 2017-10-30 13:31:36 +01:00
badlogic
2d2344d32c Merge branch '3.7-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.7-beta 2017-10-30 10:11:54 +01:00
badlogic
581d67f490 Merge branch '3.6' into 3.7-beta 2017-10-30 10:11:26 +01:00
badlogic
ed24d3b33f [ue4] Updated to 4.18, fixed compilation error in RuntimeMEshComponentDetails.cpp, kept compatibility with older versions. 2017-10-30 10:11:07 +01:00
Stephen Gowen
87a18e22b8 wip 
Almost ready to implement file loading
 2017-10-29 20:54:08 -04:00
Stephen Gowen
c3e94bee82 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-29 15:57:13 -04:00
Nathan Sweet
a75e166cbb Merge remote-tracking branch 'origin/3.7-beta' into 3.7-beta 2017-10-28 20:26:57 +02:00
Nathan Sweet
72d18eefd4 Deform timeline additive 2017-10-28 20:14:08 +02:00
Nathan Sweet
5a4da17e7d Shear timeline additive, clean up. 2017-10-28 18:11:56 +02:00
Nathan Sweet
ecedff1ffa Can only use #1024 fix on track 0. 2017-10-28 18:11:41 +02:00
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