UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-06 23:34:53 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,720 Commits 17 Branches 33 Tags
Commit Graph

3720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
badlogic
e8fa57e3aa Merge branch '3.6' into 3.7-beta 2017-12-14 11:03:22 +01:00
DemiDroL
33cd0a6a75 Dereferencing of the null pointer 'boneMap' fix (#1048) 2017-12-14 11:02:48 +01: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
Greg Rynkowski
97dd5ab8df Fix typo in the SkeletonAnimation::createWithFile (#1045) 2017-12-07 15:47:32 +01: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
badlogic
f40efe6066 Revert "fix warnings (#1034)" 
This reverts commit 5948e5a62f0d9fb5a526c200dc70a81d286b1e38.
 2017-12-06 15:35:02 +01:00
Guto Maia
1132594797 fix comment: CPP comment not allowed in C90 (#1042) 2017-11-29 10:42:28 +01:00
pharan
57fb0ee0be [unity] Update some shader things. 2017-11-25 15:18:35 +08:00
pharan
a0cf9badb9 [unity] Extra SkeletonDataAssetInspector info. 2017-11-25 15:17:47 +08:00
pharan
164678163d [unity] Allow TextField fallback for attributes. 2017-11-25 15:14:28 +08:00
John
ad55ab9736
[unity] Handle SkeletonAnimator edit mode pose. 2017-11-23 14:09:33 +08:00
John
ed8f238524
[csharp] Removed bad fix for #1024 
based on 1514b4acbb (diff-2e690293d0fea3104ddda07be1d1e5c9)
 2017-11-22 18:07:20 +08:00
minggo
5948e5a62f fix warnings (#1034) 2017-11-21 11:17:39 +01:00
John
017b65198f
[unity] Fix some OnValidate behavior. 2017-11-20 08:26:27 +08:00
badlogic
08451f2a8d [ts][webgl] Exposing the renderers in SceneRenderer. 2017-11-17 15:40:39 +01:00
badlogic
12162b7fee Merge branch '3.6' into 3.7-beta 2017-11-17 14:55:28 +01:00
badlogic
246c5310d4 [ts][webgl] SceneRenderer method to draw textures with manually set UVs. 2017-11-17 14:39:53 +01:00
badlogic
14e9425b91 Merged 3.6 into 3.7-beta. 2017-11-17 10:59:12 +01:00
badlogic
99b975f405 Merge branch '3.6' of https://github.com/esotericsoftware/spine-runtimes into 3.6 2017-11-17 10:57:49 +01:00
badlogic
49137a58ea [ts] Added AssetManager.loadTextureAtlas. Will automatically resolve and load any images the atlas references. AssetManager.get(atlasName) will then return an instance of spine.TextureAtlas. 2017-11-17 10:57:44 +01:00
John
54c20904fd
[unity] Fix editor Drag-and-Drop tooltip. 2017-11-14 04:37:56 +08:00
badlogic
98261fa480 Merge branch '3.6' into 3.7-beta 2017-11-13 14:06:34 +01:00
badlogic
adb11a221a Merge branch '3.6' of https://github.com/esotericsoftware/spine-runtimes into 3.6 2017-11-13 14:06:18 +01:00
badlogic
fe26844e3e [ue4] Forgot to commit new queue control functions. Closes #1038 2017-11-13 14:06:11 +01:00
badlogic
ac588a6caf Merge branch '3.7-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.7-beta 2017-11-10 11:27:54 +01:00
badlogic
e267ae325f Merge branch '3.6' into 3.7-beta 2017-11-10 11:27:45 +01:00
badlogic
4850cb7a05 Merge branch '3.6' of https://github.com/esotericsoftware/spine-runtimes into 3.6 2017-11-10 11:27:30 +01:00
badlogic
843159b6c3 [cocos2dx] Updated Android.mk. Closes #1036 2017-11-10 11:27:23 +01:00
badlogic
6e887a0d3d Merge branch '3.7-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.7-beta 2017-11-10 11:13:58 +01:00
badlogic
064a8b1377 Merge branch '3.6' into 3.7-beta 2017-11-10 11:13:50 +01:00
badlogic
33a00182ff [ue4] Need to temporarily disable queue draining of animation state when setting or adding new animations. Closes #1037 2017-11-10 11:13:33 +01:00
Nathan Sweet
9ff80dfe72 Merge remote-tracking branch 'origin/3.7-beta' into 3.7-beta 2017-11-02 19:14:27 +01:00
Nathan Sweet
e390d9c1c9 Merge branch '3.6' into 3.7-beta 2017-11-02 19:14:12 +01:00
badlogic
cce86c1e33 Merge branch '3.6' into 3.7-beta 2017-11-02 11:36:03 +01:00
badlogic
361378b275 [c] Error in color parsing, off-by-one resulting in invalid memory access. Closes #1031. Thanks @minggo for the adress sanitizer hint. 2017-11-02 11:20:57 +01:00
badlogic
095fe71ff8 [cocos2dx] Updated to cocos2d-x 3.16. 2017-11-02 10:51:26 +01:00
badlogic
f045d22183 [ts] Added animation blending test. 2017-11-02 10:41:49 +01:00
John
06a18da27b
[unity] Fix Repacking caching. 2017-10-31 21:07:09 +08:00
badlogic
ee7411f2ec [ts] Disallow additive on track 0, fix scale timeline. 2017-10-30 14:23:09 +01:00
badlogic
70924a9942 Merge branch '3.7-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.7-beta 2017-10-30 14:20:45 +01:00
Nathan Sweet
e7c9066b49 Merge remote-tracking branch 'origin/3.7-beta' into 3.7-beta 2017-10-30 14:16:01 +01:00
Nathan Sweet
5c78859151 Fixed scale timeline. 
closes #1030
 2017-10-30 14:15:43 +01:00
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