UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.6' into 3.7-beta

Browse Source
This commit is contained in:
badlogic 2017-12-11 14:00:48 +01:00
commit 53c3645209
2 changed files with 573 additions and 540 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-cocos2dx/src/spine/SkeletonAnimation.h
View File

@ -61,7 +61,7 @@ public:
return SkeletonAnimation::createWithJsonFile(skeletonJsonFile, atlas, scale); return SkeletonAnimation::createWithJsonFile(skeletonJsonFile, atlas, scale);
} }
// Use createWithJsonFile instead // Use createWithJsonFile instead
CC_DEPRECATED_ATTRIBUTE static SkeletonAnimation* createWithile (const std::string& skeletonJsonFile, const std::string& atlasFile, float scale = 1) CC_DEPRECATED_ATTRIBUTE static SkeletonAnimation* createWithFile (const std::string& skeletonJsonFile, const std::string& atlasFile, float scale = 1)
{ {
return SkeletonAnimation::createWithJsonFile(skeletonJsonFile, atlasFile, scale); return SkeletonAnimation::createWithJsonFile(skeletonJsonFile, atlasFile, scale);
} }

1027
spine-unity/Assets/spine-unity/Asset Types/Editor/SkeletonDataAssetInspector.cs
View File

File diff suppressed because it is too large Load Diff