3727 Commits

Author SHA1 Message Date
Stephen Gowen
90f0ccd967 Merge remote-tracking branch 'EsotericSoftware/3.6' into 3.6 2018-01-02 09:52:30 -05:00
badlogic
1c04803b59 Merge branch '3.6' of https://github.com/esotericsoftware/spine-runtimes into 3.6 2018-01-02 14:00:28 +01:00
badlogic
f4a5911dea Fixed bug in TrackEntry#setTimelineData, closes #1055. 2018-01-02 14:00:20 +01:00
Stephen Gowen
419d035636 Merge remote-tracking branch 'EsotericSoftware/3.6' into 3.6 2017-12-22 09:21:24 -05:00
John
9a65761814
[unity] Fix auto-assigning BoneFollower bone. 2017-12-22 14:16:39 +08:00
John
5be75c9f6d
[unity] Handle invalid SkeletonAnimation property behavior. 2017-12-21 07:40:22 +08:00
John
613b098b53
[unity] Handle animation not found. 2017-12-21 07:11:24 +08:00
Stephen Gowen
9205dbcfcd Merge remote-tracking branch 'EsotericSoftware/3.6' into 3.6 2017-12-20 13:04:00 -05:00
John
45c67ee4bc
[unity] SlotTintBlackFollower sample separate assembly 2017-12-20 07:16:37 +08:00
John
bc6a2ea129
[unity] Slot GetColor GetColorTintBlack extensions 2017-12-20 07:15:34 +08:00
John
46df0cd9b9
[unity] SpriteAttacher separate assembly 2017-12-20 07:10:32 +08:00
Stephen Gowen
d4fb19186b Merge remote-tracking branch 'EsotericSoftware/3.6' into 3.6 2017-12-15 09:56:58 -05:00
pharan
ab4fcb48ec [unity] GetRepackedSkin NullReferenceException. 2017-12-15 09:45:05 +08:00
pharan
d7eff92375 [unity] Updated docs. 2017-12-15 09:43:43 +08:00
pharan
ad8964380e [unity] ISkeletonDataAssetComponent 2017-12-15 09:43:16 +08:00
pharan
21d56f4b98 [unity] Move asset inspector scripts to the main Editor folder. 2017-12-15 09:41:59 +08:00
pharan
b06dc2134d [unity] Fix method name typo. 2017-12-15 09:40:34 +08:00
pharan
baa6ed3e60 [unity] Fix clipper skipping non-rendered slot. 2017-12-15 09:39:40 +08:00
Stephen Gowen
c39f4547f7 Bringing over recent changes to spine-c 2017-12-14 11:29:33 -05:00
Stephen Gowen
2f46aea6ba Merge remote-tracking branch 'EsotericSoftware/3.6' into 3.6 2017-12-14 11:27:23 -05:00
DemiDroL
33cd0a6a75 Dereferencing of the null pointer 'boneMap' fix (#1048) 2017-12-14 11:02:48 +01:00
Stephen Gowen
d403db2754 Forgot to move the namespace braces. 2017-12-13 12:08:23 -05:00
Stephen Gowen
64fd7c2886 Moving Braces to Same Line 2017-12-12 10:51:11 -05:00
Stephen Gowen
0764543bf5 Merge remote-tracking branch 'EsotericSoftware/3.6' into 3.6 2017-12-10 12:30:24 -05:00
John
4048e6b7f5
[unity] Cleanup SkeletonDataAssetInspector 2017-12-11 00:37:12 +08:00
John
1dda8f5890
[unity] Cleanup SkeletonDataAssetInspector.
Thanks to Mitch Thompson for the original featured version.
2017-12-11 00:34:58 +08:00
Stephen Gowen
c7ae6d23b1 Fixing a bug in Pool class. 2017-12-09 15:09:36 -05:00
Stephen Gowen
89ad68c27a Failed to build on Ubuntu until I added these cstring includes.
Xcode and Visual Studio are building fine though!
2017-12-08 16:20:21 -05:00
Stephen Gowen
dfd5409922 Improving Time Elapsed logic 2017-12-08 14:51:24 -05:00
Stephen Gowen
e24b061c61 Yay, now the C++ Runtime passes all the same tests as the C Runtime! 2017-12-08 14:15:30 -05:00
Stephen Gowen
c1995586aa README tweaks 2017-12-07 14:22:33 -05:00
Stephen Gowen
37abe9609d Whoops, didn't mean to make changes in spine-c 2017-12-07 14:14:13 -05:00
Stephen Gowen
db7166590e Merge remote-tracking branch 'EsotericSoftware/3.6' into 3.6 2017-12-07 14:06:36 -05:00
Stephen Gowen
a0ad9d8c57 Okay, got copying and relative paths set up 2017-12-07 14:06:13 -05:00
Stephen Gowen
ec7ed94525 Got Unit Tests working, but I don't have the fixtures quite configured correctly. 2017-12-07 13:54:41 -05:00
Greg Rynkowski
97dd5ab8df Fix typo in the SkeletonAnimation::createWithFile (#1045) 2017-12-07 15:47:32 +01:00
Stephen Gowen
1e6d8b793a Wip unit tests 2017-12-07 03:23:40 -05:00
Stephen Gowen
a6f0c88994 Wip unit tests, trying to simply port the C ones to CPP, can it be that simple? 2017-12-06 20:11:10 -05:00
Stephen Gowen
7d3526f3db Merge remote-tracking branch 'EsotericSoftware/3.6' into 3.6 2017-12-06 19:00:45 -05:00
Stephen Gowen
7b32f02e2c Done. 2017-12-06 19:00:42 -05:00
John
6eb3f1dbd7
[unity] Handle SkeletonData inspector play-pause.
Fixes https://github.com/EsotericSoftware/spine-runtimes/issues/996
2017-12-07 07:05:35 +08:00
Stephen Gowen
e20382a304 Now I understand the origin of this deform2 and awkward memset function, haha 2017-12-06 17:30:48 -05:00
Stephen Gowen
01ef0152b8 Merge remote-tracking branch 'EsotericSoftware/3.6' into 3.6 2017-12-06 17:24:32 -05:00
badlogic
f40efe6066 Revert "fix warnings (#1034)"
This reverts commit 5948e5a62f0d9fb5a526c200dc70a81d286b1e38.
2017-12-06 15:35:02 +01:00
Stephen Gowen
52e04508f6 Almost Done! 2017-12-05 17:44:30 -05:00
Stephen Gowen
517c48a2d5 So close! 2017-12-04 17:37:31 -05:00
Stephen Gowen
be2dfc7ff4 wip 2017-12-03 21:32:44 -05:00
Stephen Gowen
0b28d385db NEW macro calls CALLOC macro 2017-12-03 19:49:05 -05:00
Stephen Gowen
1f415cec9f Forgot some setError calls and cleanup 2017-12-03 16:40:04 -05:00
Stephen Gowen
2b2b34db00 Okay, SkeletonBinary is done. 2017-12-03 16:16:02 -05:00