diff --git a/.gitignore b/.gitignore index 26b842c88..bcdfa6c93 100644 --- a/.gitignore +++ b/.gitignore @@ -48,9 +48,7 @@ spine-unity/*.sln *.pidb Assembly-*.csproj Assembly-*.pidb -spine-unity4 -spine-unity3 -spine-unity4-tk2d +spine-unity-test* spine-corona/spine-lua/ !spine-corona/spine-lua/Place spine-lua here.txt diff --git a/spine-unity/Assets/Plugins.meta b/spine-unity/Assets/Plugins.meta index 4e038029f..faaec97cb 100644 --- a/spine-unity/Assets/Plugins.meta +++ b/spine-unity/Assets/Plugins.meta @@ -1,2 +1,5 @@ fileFormatVersion: 2 guid: 89dad76e10ea944ee9f29109535294be +folderAsset: yes +DefaultImporter: + userData: diff --git a/spine-unity/Assets/Plugins/Editor.meta b/spine-unity/Assets/Plugins/Editor.meta index 7e1e98c44..3b9044a9e 100644 --- a/spine-unity/Assets/Plugins/Editor.meta +++ b/spine-unity/Assets/Plugins/Editor.meta @@ -1,2 +1,5 @@ fileFormatVersion: 2 guid: 65ba3309ea8c447678ade95f3fa398da +folderAsset: yes +DefaultImporter: + userData: diff --git a/spine-unity/Assets/Plugins/Editor/Spine.meta b/spine-unity/Assets/Plugins/Editor/Spine.meta index 4ab6e3357..e082f50db 100644 --- a/spine-unity/Assets/Plugins/Editor/Spine.meta +++ b/spine-unity/Assets/Plugins/Editor/Spine.meta @@ -1,2 +1,5 @@ fileFormatVersion: 2 guid: 3ac78ae082927411cba77d73efde27d4 +folderAsset: yes +DefaultImporter: + userData: diff --git a/spine-unity/Assets/Plugins/Editor/Spine/AtlasAssetInspector.cs.meta b/spine-unity/Assets/Plugins/Editor/Spine/AtlasAssetInspector.cs.meta index 3cfa801af..898e53399 100644 --- a/spine-unity/Assets/Plugins/Editor/Spine/AtlasAssetInspector.cs.meta +++ b/spine-unity/Assets/Plugins/Editor/Spine/AtlasAssetInspector.cs.meta @@ -5,3 +5,4 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} + userData: diff --git a/spine-unity/Assets/Plugins/Editor/Spine/Menus.cs.meta b/spine-unity/Assets/Plugins/Editor/Spine/Menus.cs.meta index 22ca2a8c0..ab58e94aa 100644 --- a/spine-unity/Assets/Plugins/Editor/Spine/Menus.cs.meta +++ b/spine-unity/Assets/Plugins/Editor/Spine/Menus.cs.meta @@ -5,3 +5,4 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} + userData: diff --git a/spine-unity/Assets/Plugins/Editor/Spine/SkeletonComponentInspector.cs.meta b/spine-unity/Assets/Plugins/Editor/Spine/SkeletonComponentInspector.cs.meta index 054df3e06..1d38c4c42 100644 --- a/spine-unity/Assets/Plugins/Editor/Spine/SkeletonComponentInspector.cs.meta +++ b/spine-unity/Assets/Plugins/Editor/Spine/SkeletonComponentInspector.cs.meta @@ -5,3 +5,4 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} + userData: diff --git a/spine-unity/Assets/Plugins/Editor/Spine/SkeletonDataAssetInspector.cs.meta b/spine-unity/Assets/Plugins/Editor/Spine/SkeletonDataAssetInspector.cs.meta index 28721a69b..fba64b6e3 100644 --- a/spine-unity/Assets/Plugins/Editor/Spine/SkeletonDataAssetInspector.cs.meta +++ b/spine-unity/Assets/Plugins/Editor/Spine/SkeletonDataAssetInspector.cs.meta @@ -5,3 +5,4 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} + userData: diff --git a/spine-unity/Assets/Plugins/Spine.meta b/spine-unity/Assets/Plugins/Spine.meta index 1cf97fd10..abc05621a 100644 --- a/spine-unity/Assets/Plugins/Spine.meta +++ b/spine-unity/Assets/Plugins/Spine.meta @@ -1,2 +1,5 @@ fileFormatVersion: 2 guid: c6674329008ae4c65a7b7e8f1b2a6523 +folderAsset: yes +DefaultImporter: + userData: diff --git a/spine-unity/Assets/Plugins/Spine/AtlasAsset.cs.meta b/spine-unity/Assets/Plugins/Spine/AtlasAsset.cs.meta index d9d83b0fa..8cd9bc105 100644 --- a/spine-unity/Assets/Plugins/Spine/AtlasAsset.cs.meta +++ b/spine-unity/Assets/Plugins/Spine/AtlasAsset.cs.meta @@ -5,3 +5,4 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} + userData: diff --git a/spine-unity/Assets/Plugins/Spine/SkeletonComponent.cs b/spine-unity/Assets/Plugins/Spine/SkeletonComponent.cs index 6572fb8d6..ef52e6396 100644 --- a/spine-unity/Assets/Plugins/Spine/SkeletonComponent.cs +++ b/spine-unity/Assets/Plugins/Spine/SkeletonComponent.cs @@ -172,8 +172,11 @@ public class SkeletonComponent : MonoBehaviour { } public virtual void OnDisable () { - if (Application.isEditor) - Clear(); +#region Unity Editor +#if UNITY_EDITOR + Clear(); +#endif +#endregion } public virtual void Reset () { diff --git a/spine-unity/Assets/Plugins/Spine/SkeletonComponent.cs.meta b/spine-unity/Assets/Plugins/Spine/SkeletonComponent.cs.meta index 521498e33..255c3fe77 100644 --- a/spine-unity/Assets/Plugins/Spine/SkeletonComponent.cs.meta +++ b/spine-unity/Assets/Plugins/Spine/SkeletonComponent.cs.meta @@ -5,3 +5,4 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} + userData: diff --git a/spine-unity/Assets/Plugins/Spine/SkeletonDataAsset.cs.meta b/spine-unity/Assets/Plugins/Spine/SkeletonDataAsset.cs.meta index 3e2c4a140..db4f247d4 100644 --- a/spine-unity/Assets/Plugins/Spine/SkeletonDataAsset.cs.meta +++ b/spine-unity/Assets/Plugins/Spine/SkeletonDataAsset.cs.meta @@ -5,3 +5,4 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} + userData: diff --git a/spine-unity/Assets/Plugins/Spine/spine-csharp.meta b/spine-unity/Assets/Plugins/Spine/spine-csharp.meta index 86f8e1a90..e07643c44 100644 --- a/spine-unity/Assets/Plugins/Spine/spine-csharp.meta +++ b/spine-unity/Assets/Plugins/Spine/spine-csharp.meta @@ -1,2 +1,5 @@ fileFormatVersion: 2 guid: 1b62d1da83172ed4f9bfc9077b196f79 +folderAsset: yes +DefaultImporter: + userData: diff --git a/spine-unity/Assets/Shaders.meta b/spine-unity/Assets/Shaders.meta index c62ca6925..11f324b09 100644 --- a/spine-unity/Assets/Shaders.meta +++ b/spine-unity/Assets/Shaders.meta @@ -1,2 +1,5 @@ fileFormatVersion: 2 guid: b41395738f68d4fbba8311d333db62b1 +folderAsset: yes +DefaultImporter: + userData: diff --git a/spine-unity/Assets/Shaders/Skeleton.shader.meta b/spine-unity/Assets/Shaders/Skeleton.shader.meta index cf8d89ac9..753129e68 100644 --- a/spine-unity/Assets/Shaders/Skeleton.shader.meta +++ b/spine-unity/Assets/Shaders/Skeleton.shader.meta @@ -1,2 +1,5 @@ fileFormatVersion: 2 guid: 1e8a610c9e01c3648bac42585e5fc676 +ShaderImporter: + defaultTextures: [] + userData: diff --git a/spine-unity/Assets/examples.meta b/spine-unity/Assets/examples.meta index 0728f1da1..81921ca10 100644 --- a/spine-unity/Assets/examples.meta +++ b/spine-unity/Assets/examples.meta @@ -1,2 +1,5 @@ fileFormatVersion: 2 guid: e6712a5a0c05f9f4092f9a3197925e99 +folderAsset: yes +DefaultImporter: + userData: diff --git a/spine-unity/Assets/examples/Unity 3.5.meta b/spine-unity/Assets/examples/Unity 3.5.meta deleted file mode 100644 index 4134d9b0f..000000000 --- a/spine-unity/Assets/examples/Unity 3.5.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 97269dddd903cfd469a75f320a0cef8f diff --git a/spine-unity/Assets/examples/Unity 3.5/goblins.meta b/spine-unity/Assets/examples/Unity 3.5/goblins.meta deleted file mode 100644 index 65cadc94c..000000000 --- a/spine-unity/Assets/examples/Unity 3.5/goblins.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 4e70126bb9873e841b4935b7275730cc diff --git a/spine-unity/Assets/examples/Unity 3.5/goblins/goblins Atlas.asset b/spine-unity/Assets/examples/Unity 3.5/goblins/goblins Atlas.asset deleted file mode 100644 index 06aa0602d..000000000 Binary files a/spine-unity/Assets/examples/Unity 3.5/goblins/goblins Atlas.asset and /dev/null differ diff --git a/spine-unity/Assets/examples/Unity 3.5/goblins/goblins Atlas.asset.meta b/spine-unity/Assets/examples/Unity 3.5/goblins/goblins Atlas.asset.meta deleted file mode 100644 index aef55af76..000000000 --- a/spine-unity/Assets/examples/Unity 3.5/goblins/goblins Atlas.asset.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 618309bc7071d724ca2dbfd70e14feef diff --git a/spine-unity/Assets/examples/Unity 3.5/goblins/goblins Skeleton Data.asset b/spine-unity/Assets/examples/Unity 3.5/goblins/goblins Skeleton Data.asset deleted file mode 100644 index 5e9c37199..000000000 Binary files a/spine-unity/Assets/examples/Unity 3.5/goblins/goblins Skeleton Data.asset and /dev/null differ diff --git a/spine-unity/Assets/examples/Unity 3.5/goblins/goblins Skeleton Data.asset.meta b/spine-unity/Assets/examples/Unity 3.5/goblins/goblins Skeleton Data.asset.meta deleted file mode 100644 index d4f3d167c..000000000 --- a/spine-unity/Assets/examples/Unity 3.5/goblins/goblins Skeleton Data.asset.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 78ac5e44b15e8a7418ea5313951ea050 diff --git a/spine-unity/Assets/examples/Unity 3.5/goblins/goblins.mat b/spine-unity/Assets/examples/Unity 3.5/goblins/goblins.mat deleted file mode 100644 index 24b7062a1..000000000 Binary files a/spine-unity/Assets/examples/Unity 3.5/goblins/goblins.mat and /dev/null differ diff --git a/spine-unity/Assets/examples/Unity 3.5/goblins/goblins.mat.meta b/spine-unity/Assets/examples/Unity 3.5/goblins/goblins.mat.meta deleted file mode 100644 index 32417a746..000000000 --- a/spine-unity/Assets/examples/Unity 3.5/goblins/goblins.mat.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 3f474a0bd32d8d448afdbe538067b5a7 diff --git a/spine-unity/Assets/examples/Unity 3.5/goblins/goblins.unity b/spine-unity/Assets/examples/Unity 3.5/goblins/goblins.unity deleted file mode 100644 index 76ca8138f..000000000 Binary files a/spine-unity/Assets/examples/Unity 3.5/goblins/goblins.unity and /dev/null differ diff --git a/spine-unity/Assets/examples/Unity 3.5/goblins/goblins.unity.meta b/spine-unity/Assets/examples/Unity 3.5/goblins/goblins.unity.meta deleted file mode 100644 index ca8387942..000000000 --- a/spine-unity/Assets/examples/Unity 3.5/goblins/goblins.unity.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: a8b1d5a7e1dcd0e42aee4a2ec763e0d0 diff --git a/spine-unity/Assets/examples/Unity 3.5/spineboy.meta b/spine-unity/Assets/examples/Unity 3.5/spineboy.meta deleted file mode 100644 index 65dc48413..000000000 --- a/spine-unity/Assets/examples/Unity 3.5/spineboy.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: e85fe6096a7d7004b8ad22a2b4aa2e39 diff --git a/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy Atlas.asset b/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy Atlas.asset deleted file mode 100644 index 7b7a0c1c9..000000000 Binary files a/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy Atlas.asset and /dev/null differ diff --git a/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy Atlas.asset.meta b/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy Atlas.asset.meta deleted file mode 100644 index 7a68e0b22..000000000 --- a/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy Atlas.asset.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 2150a1de0cb69654980ea6c7bdf4fc52 diff --git a/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy Skeleton Data.asset b/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy Skeleton Data.asset deleted file mode 100644 index 6e98af88a..000000000 Binary files a/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy Skeleton Data.asset and /dev/null differ diff --git a/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy Skeleton Data.asset.meta b/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy Skeleton Data.asset.meta deleted file mode 100644 index aa25921ad..000000000 --- a/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy Skeleton Data.asset.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: eebba971021a8e44c99cb6d95adbc156 diff --git a/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy.mat b/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy.mat deleted file mode 100644 index cab84ab6e..000000000 Binary files a/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy.mat and /dev/null differ diff --git a/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy.mat.meta b/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy.mat.meta deleted file mode 100644 index 94fd0c121..000000000 --- a/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy.mat.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 3babdb6353ace324fb48964ac5f1f482 diff --git a/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy.unity b/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy.unity deleted file mode 100644 index 552a1be83..000000000 Binary files a/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy.unity and /dev/null differ diff --git a/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy.unity.meta b/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy.unity.meta deleted file mode 100644 index 8c77ce5e4..000000000 --- a/spine-unity/Assets/examples/Unity 3.5/spineboy/spineboy.unity.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 99868dbcfd4678842b017a745dfcf3c0 diff --git a/spine-unity/Assets/examples/Unity 4.meta b/spine-unity/Assets/examples/Unity 4.meta deleted file mode 100644 index 82b87fa21..000000000 --- a/spine-unity/Assets/examples/Unity 4.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: c42e48410176c3b43ac8ba8fbb1256d2 -DefaultImporter: - userData: diff --git a/spine-unity/Assets/examples/Unity 4/spineboy/Spineboy.cs b/spine-unity/Assets/examples/Unity 4/spineboy/Spineboy.cs deleted file mode 100644 index 2cbc5a3bd..000000000 --- a/spine-unity/Assets/examples/Unity 4/spineboy/Spineboy.cs +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2013, Esoteric Software - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ******************************************************************************/ - -using UnityEngine; -using System.Collections; - -public class Spineboy : MonoBehaviour { - public void Start () { - SkeletonAnimation skeletonAnimation = GetComponent(); - skeletonAnimation.state.SetAnimation("walk", true); - } - - public void OnMouseDown () { - SkeletonAnimation skeletonAnimation = GetComponent(); - skeletonAnimation.state.SetAnimation("jump", false); - skeletonAnimation.state.AddAnimation("walk", true); - } -} diff --git a/spine-unity/Assets/examples/data.meta b/spine-unity/Assets/examples/data.meta index 580138f9f..50b8112cf 100644 --- a/spine-unity/Assets/examples/data.meta +++ b/spine-unity/Assets/examples/data.meta @@ -1,2 +1,5 @@ fileFormatVersion: 2 guid: 63d11713f97bfe54bb06572e24050ecb +folderAsset: yes +DefaultImporter: + userData: diff --git a/spine-unity/Assets/examples/data/goblins.atlas.txt.meta b/spine-unity/Assets/examples/data/goblins.atlas.txt.meta index 8bd7d0d86..c5065adff 100644 --- a/spine-unity/Assets/examples/data/goblins.atlas.txt.meta +++ b/spine-unity/Assets/examples/data/goblins.atlas.txt.meta @@ -1,2 +1,4 @@ fileFormatVersion: 2 guid: 7d22747254815624999fd0ab7e8f851c +TextScriptImporter: + userData: diff --git a/spine-unity/Assets/examples/data/goblins.json.txt.meta b/spine-unity/Assets/examples/data/goblins.json.txt.meta index 5851b898d..a2339684c 100644 --- a/spine-unity/Assets/examples/data/goblins.json.txt.meta +++ b/spine-unity/Assets/examples/data/goblins.json.txt.meta @@ -1,2 +1,4 @@ fileFormatVersion: 2 guid: 06f2130f3bf8d4f499a15c55bdcda650 +TextScriptImporter: + userData: diff --git a/spine-unity/Assets/examples/data/goblins.png.meta b/spine-unity/Assets/examples/data/goblins.png.meta index baf4634e0..a38ad6ae5 100644 --- a/spine-unity/Assets/examples/data/goblins.png.meta +++ b/spine-unity/Assets/examples/data/goblins.png.meta @@ -19,6 +19,7 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 1024 textureSettings: @@ -29,5 +30,7 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 + alphaIsTransparency: 0 textureType: -1 buildTargetSettings: [] + userData: diff --git a/spine-unity/Assets/examples/data/spineboy.atlas.txt.meta b/spine-unity/Assets/examples/data/spineboy.atlas.txt.meta index 079615df0..ad6f2b941 100644 --- a/spine-unity/Assets/examples/data/spineboy.atlas.txt.meta +++ b/spine-unity/Assets/examples/data/spineboy.atlas.txt.meta @@ -1,2 +1,4 @@ fileFormatVersion: 2 guid: a42989bcd9f91aa49a56dc67cf27b96a +TextScriptImporter: + userData: diff --git a/spine-unity/Assets/examples/data/spineboy.json.txt.meta b/spine-unity/Assets/examples/data/spineboy.json.txt.meta index 8557b967a..f01f449e4 100644 --- a/spine-unity/Assets/examples/data/spineboy.json.txt.meta +++ b/spine-unity/Assets/examples/data/spineboy.json.txt.meta @@ -1,2 +1,4 @@ fileFormatVersion: 2 guid: b84c2137744fea946bde0d5cd51e4e3d +TextScriptImporter: + userData: diff --git a/spine-unity/Assets/examples/data/spineboy.png.meta b/spine-unity/Assets/examples/data/spineboy.png.meta index 38638f9a3..aee4b728a 100644 --- a/spine-unity/Assets/examples/data/spineboy.png.meta +++ b/spine-unity/Assets/examples/data/spineboy.png.meta @@ -30,6 +30,7 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 + alphaIsTransparency: 0 textureType: -1 buildTargetSettings: [] userData: diff --git a/spine-unity/Assets/examples/Unity 4/goblins.meta b/spine-unity/Assets/examples/goblins.meta similarity index 84% rename from spine-unity/Assets/examples/Unity 4/goblins.meta rename to spine-unity/Assets/examples/goblins.meta index 38300ba18..75d44724b 100644 --- a/spine-unity/Assets/examples/Unity 4/goblins.meta +++ b/spine-unity/Assets/examples/goblins.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 guid: 6982507deb28dc243803f492193a3d7f +folderAsset: yes DefaultImporter: userData: diff --git a/spine-unity/Assets/examples/Unity 4/goblins/goblins Atlas.asset b/spine-unity/Assets/examples/goblins/goblins Atlas.asset similarity index 100% rename from spine-unity/Assets/examples/Unity 4/goblins/goblins Atlas.asset rename to spine-unity/Assets/examples/goblins/goblins Atlas.asset diff --git a/spine-unity/Assets/examples/Unity 4/goblins/goblins Atlas.asset.meta b/spine-unity/Assets/examples/goblins/goblins Atlas.asset.meta similarity index 100% rename from spine-unity/Assets/examples/Unity 4/goblins/goblins Atlas.asset.meta rename to spine-unity/Assets/examples/goblins/goblins Atlas.asset.meta diff --git a/spine-unity/Assets/examples/Unity 4/goblins/goblins Material.mat b/spine-unity/Assets/examples/goblins/goblins Material.mat similarity index 100% rename from spine-unity/Assets/examples/Unity 4/goblins/goblins Material.mat rename to spine-unity/Assets/examples/goblins/goblins Material.mat diff --git a/spine-unity/Assets/examples/Unity 4/goblins/goblins Material.mat.meta b/spine-unity/Assets/examples/goblins/goblins Material.mat.meta similarity index 100% rename from spine-unity/Assets/examples/Unity 4/goblins/goblins Material.mat.meta rename to spine-unity/Assets/examples/goblins/goblins Material.mat.meta diff --git a/spine-unity/Assets/examples/Unity 4/goblins/goblins Skeleton Data.asset b/spine-unity/Assets/examples/goblins/goblins Skeleton Data.asset similarity index 100% rename from spine-unity/Assets/examples/Unity 4/goblins/goblins Skeleton Data.asset rename to spine-unity/Assets/examples/goblins/goblins Skeleton Data.asset diff --git a/spine-unity/Assets/examples/Unity 4/goblins/goblins Skeleton Data.asset.meta b/spine-unity/Assets/examples/goblins/goblins Skeleton Data.asset.meta similarity index 100% rename from spine-unity/Assets/examples/Unity 4/goblins/goblins Skeleton Data.asset.meta rename to spine-unity/Assets/examples/goblins/goblins Skeleton Data.asset.meta diff --git a/spine-unity/Assets/examples/Unity 4/goblins/goblins.unity b/spine-unity/Assets/examples/goblins/goblins.unity similarity index 100% rename from spine-unity/Assets/examples/Unity 4/goblins/goblins.unity rename to spine-unity/Assets/examples/goblins/goblins.unity diff --git a/spine-unity/Assets/examples/Unity 4/goblins/goblins.unity.meta b/spine-unity/Assets/examples/goblins/goblins.unity.meta similarity index 100% rename from spine-unity/Assets/examples/Unity 4/goblins/goblins.unity.meta rename to spine-unity/Assets/examples/goblins/goblins.unity.meta diff --git a/spine-unity/Assets/examples/Unity 4/spineboy.meta b/spine-unity/Assets/examples/spineboy.meta similarity index 84% rename from spine-unity/Assets/examples/Unity 4/spineboy.meta rename to spine-unity/Assets/examples/spineboy.meta index 78ee87467..67b51baac 100644 --- a/spine-unity/Assets/examples/Unity 4/spineboy.meta +++ b/spine-unity/Assets/examples/spineboy.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 guid: a4b271fee35e1594889476a6104cf898 +folderAsset: yes DefaultImporter: userData: diff --git a/spine-unity/Assets/examples/Unity 3.5/spineboy/Spineboy.cs b/spine-unity/Assets/examples/spineboy/Spineboy.cs similarity index 100% rename from spine-unity/Assets/examples/Unity 3.5/spineboy/Spineboy.cs rename to spine-unity/Assets/examples/spineboy/Spineboy.cs diff --git a/spine-unity/Assets/examples/Unity 4/spineboy/Spineboy.cs.meta b/spine-unity/Assets/examples/spineboy/Spineboy.cs.meta similarity index 100% rename from spine-unity/Assets/examples/Unity 4/spineboy/Spineboy.cs.meta rename to spine-unity/Assets/examples/spineboy/Spineboy.cs.meta diff --git a/spine-unity/Assets/examples/Unity 4/spineboy/goblins.mat b/spine-unity/Assets/examples/spineboy/goblins.mat similarity index 100% rename from spine-unity/Assets/examples/Unity 4/spineboy/goblins.mat rename to spine-unity/Assets/examples/spineboy/goblins.mat diff --git a/spine-unity/Assets/examples/Unity 4/spineboy/goblins.mat.meta b/spine-unity/Assets/examples/spineboy/goblins.mat.meta similarity index 100% rename from spine-unity/Assets/examples/Unity 4/spineboy/goblins.mat.meta rename to spine-unity/Assets/examples/spineboy/goblins.mat.meta diff --git a/spine-unity/Assets/examples/Unity 4/spineboy/spineboy Atlas.asset b/spine-unity/Assets/examples/spineboy/spineboy Atlas.asset similarity index 100% rename from spine-unity/Assets/examples/Unity 4/spineboy/spineboy Atlas.asset rename to spine-unity/Assets/examples/spineboy/spineboy Atlas.asset diff --git a/spine-unity/Assets/examples/Unity 4/spineboy/spineboy Atlas.asset.meta b/spine-unity/Assets/examples/spineboy/spineboy Atlas.asset.meta similarity index 100% rename from spine-unity/Assets/examples/Unity 4/spineboy/spineboy Atlas.asset.meta rename to spine-unity/Assets/examples/spineboy/spineboy Atlas.asset.meta diff --git a/spine-unity/Assets/examples/Unity 4/spineboy/spineboy Skeleton Data.asset b/spine-unity/Assets/examples/spineboy/spineboy Skeleton Data.asset similarity index 100% rename from spine-unity/Assets/examples/Unity 4/spineboy/spineboy Skeleton Data.asset rename to spine-unity/Assets/examples/spineboy/spineboy Skeleton Data.asset diff --git a/spine-unity/Assets/examples/Unity 4/spineboy/spineboy Skeleton Data.asset.meta b/spine-unity/Assets/examples/spineboy/spineboy Skeleton Data.asset.meta similarity index 100% rename from spine-unity/Assets/examples/Unity 4/spineboy/spineboy Skeleton Data.asset.meta rename to spine-unity/Assets/examples/spineboy/spineboy Skeleton Data.asset.meta diff --git a/spine-unity/Assets/examples/Unity 4/spineboy/spineboy.mat b/spine-unity/Assets/examples/spineboy/spineboy.mat similarity index 100% rename from spine-unity/Assets/examples/Unity 4/spineboy/spineboy.mat rename to spine-unity/Assets/examples/spineboy/spineboy.mat diff --git a/spine-unity/Assets/examples/Unity 4/spineboy/spineboy.mat.meta b/spine-unity/Assets/examples/spineboy/spineboy.mat.meta similarity index 100% rename from spine-unity/Assets/examples/Unity 4/spineboy/spineboy.mat.meta rename to spine-unity/Assets/examples/spineboy/spineboy.mat.meta diff --git a/spine-unity/Assets/examples/Unity 4/spineboy/spineboy.unity b/spine-unity/Assets/examples/spineboy/spineboy.unity similarity index 100% rename from spine-unity/Assets/examples/Unity 4/spineboy/spineboy.unity rename to spine-unity/Assets/examples/spineboy/spineboy.unity diff --git a/spine-unity/Assets/examples/Unity 4/spineboy/spineboy.unity.meta b/spine-unity/Assets/examples/spineboy/spineboy.unity.meta similarity index 100% rename from spine-unity/Assets/examples/Unity 4/spineboy/spineboy.unity.meta rename to spine-unity/Assets/examples/spineboy/spineboy.unity.meta