diff --git a/.gitignore b/.gitignore index 2165b2093..c7100f29c 100644 --- a/.gitignore +++ b/.gitignore @@ -31,5 +31,8 @@ spine-xna/obj spine-xna/example/bin spine-xna/example/obj -spine-unity/spine-csharp/* -!spine-unity/spine-csharp/Place spine-csharp here.txt +spine-unity/Assets/src/spine-csharp/* +!spine-unity/Assets/src/spine-csharp/Place spine-csharp here.txt +spine-unity/ProjectSettings +spine-unity/Temp +spine-unity/Library diff --git a/spine-unity/Assets/examples.meta b/spine-unity/Assets/examples.meta new file mode 100644 index 000000000..8047acbfe --- /dev/null +++ b/spine-unity/Assets/examples.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: e6712a5a0c05f9f4092f9a3197925e99 +DefaultImporter: + userData: diff --git a/spine-unity/Assets/examples/data.meta b/spine-unity/Assets/examples/data.meta new file mode 100644 index 000000000..ffd34f62d --- /dev/null +++ b/spine-unity/Assets/examples/data.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 63d11713f97bfe54bb06572e24050ecb +DefaultImporter: + userData: diff --git a/spine-unity/examples/data/goblins.atlas.txt b/spine-unity/Assets/examples/data/goblins.atlas.txt similarity index 100% rename from spine-unity/examples/data/goblins.atlas.txt rename to spine-unity/Assets/examples/data/goblins.atlas.txt diff --git a/spine-unity/Assets/examples/data/goblins.atlas.txt.meta b/spine-unity/Assets/examples/data/goblins.atlas.txt.meta new file mode 100644 index 000000000..c5065adff --- /dev/null +++ b/spine-unity/Assets/examples/data/goblins.atlas.txt.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 7d22747254815624999fd0ab7e8f851c +TextScriptImporter: + userData: diff --git a/spine-unity/examples/data/goblins.json.txt b/spine-unity/Assets/examples/data/goblins.json.txt similarity index 100% rename from spine-unity/examples/data/goblins.json.txt rename to spine-unity/Assets/examples/data/goblins.json.txt diff --git a/spine-unity/Assets/examples/data/goblins.json.txt.meta b/spine-unity/Assets/examples/data/goblins.json.txt.meta new file mode 100644 index 000000000..a2339684c --- /dev/null +++ b/spine-unity/Assets/examples/data/goblins.json.txt.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 06f2130f3bf8d4f499a15c55bdcda650 +TextScriptImporter: + userData: diff --git a/spine-unity/examples/data/goblins.mat b/spine-unity/Assets/examples/data/goblins.mat similarity index 98% rename from spine-unity/examples/data/goblins.mat rename to spine-unity/Assets/examples/data/goblins.mat index 6b9f0119b..5fb7b00d4 100644 Binary files a/spine-unity/examples/data/goblins.mat and b/spine-unity/Assets/examples/data/goblins.mat differ diff --git a/spine-unity/Assets/examples/data/goblins.mat.meta b/spine-unity/Assets/examples/data/goblins.mat.meta new file mode 100644 index 000000000..1cbd1217f --- /dev/null +++ b/spine-unity/Assets/examples/data/goblins.mat.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 66434ac89c9a4b24284759ae97d48205 +NativeFormatImporter: + userData: diff --git a/spine-unity/examples/data/goblins.png b/spine-unity/Assets/examples/data/goblins.png similarity index 100% rename from spine-unity/examples/data/goblins.png rename to spine-unity/Assets/examples/data/goblins.png diff --git a/spine-unity/Assets/examples/data/goblins.png.meta b/spine-unity/Assets/examples/data/goblins.png.meta new file mode 100644 index 000000000..04e530b94 --- /dev/null +++ b/spine-unity/Assets/examples/data/goblins.png.meta @@ -0,0 +1,35 @@ +fileFormatVersion: 2 +guid: cb24cee6cfa29e94388a01a97a006454 +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + textureType: -1 + buildTargetSettings: [] + userData: diff --git a/spine-unity/examples/data/spineboy.atlas.txt b/spine-unity/Assets/examples/data/spineboy.atlas.txt similarity index 100% rename from spine-unity/examples/data/spineboy.atlas.txt rename to spine-unity/Assets/examples/data/spineboy.atlas.txt diff --git a/spine-unity/Assets/examples/data/spineboy.atlas.txt.meta b/spine-unity/Assets/examples/data/spineboy.atlas.txt.meta new file mode 100644 index 000000000..ad6f2b941 --- /dev/null +++ b/spine-unity/Assets/examples/data/spineboy.atlas.txt.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: a42989bcd9f91aa49a56dc67cf27b96a +TextScriptImporter: + userData: diff --git a/spine-unity/examples/data/spineboy.json.txt b/spine-unity/Assets/examples/data/spineboy.json.txt similarity index 100% rename from spine-unity/examples/data/spineboy.json.txt rename to spine-unity/Assets/examples/data/spineboy.json.txt diff --git a/spine-unity/Assets/examples/data/spineboy.json.txt.meta b/spine-unity/Assets/examples/data/spineboy.json.txt.meta new file mode 100644 index 000000000..f01f449e4 --- /dev/null +++ b/spine-unity/Assets/examples/data/spineboy.json.txt.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: b84c2137744fea946bde0d5cd51e4e3d +TextScriptImporter: + userData: diff --git a/spine-unity/examples/data/spineboy.mat b/spine-unity/Assets/examples/data/spineboy.mat similarity index 98% rename from spine-unity/examples/data/spineboy.mat rename to spine-unity/Assets/examples/data/spineboy.mat index 8b44a8692..0a15059ec 100644 Binary files a/spine-unity/examples/data/spineboy.mat and b/spine-unity/Assets/examples/data/spineboy.mat differ diff --git a/spine-unity/Assets/examples/data/spineboy.mat.meta b/spine-unity/Assets/examples/data/spineboy.mat.meta new file mode 100644 index 000000000..b15d43930 --- /dev/null +++ b/spine-unity/Assets/examples/data/spineboy.mat.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: ff2351ca0f1ad244287c515d7cce90fb +NativeFormatImporter: + userData: diff --git a/spine-unity/examples/data/spineboy.png b/spine-unity/Assets/examples/data/spineboy.png similarity index 100% rename from spine-unity/examples/data/spineboy.png rename to spine-unity/Assets/examples/data/spineboy.png diff --git a/spine-unity/Assets/examples/data/spineboy.png.meta b/spine-unity/Assets/examples/data/spineboy.png.meta new file mode 100644 index 000000000..0f97295b7 --- /dev/null +++ b/spine-unity/Assets/examples/data/spineboy.png.meta @@ -0,0 +1,35 @@ +fileFormatVersion: 2 +guid: a5953cbd82f44c644b2e4c26b633c71c +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + textureType: -1 + buildTargetSettings: [] + userData: diff --git a/spine-unity/Assets/examples/spineboy.meta b/spine-unity/Assets/examples/spineboy.meta new file mode 100644 index 000000000..dbcef9d3f --- /dev/null +++ b/spine-unity/Assets/examples/spineboy.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 4474c8d20794f2b41b5355416948c296 +DefaultImporter: + userData: diff --git a/spine-unity/examples/spineboy/SpineboyComponent.cs b/spine-unity/Assets/examples/spineboy/SpineboyComponent.cs similarity index 100% rename from spine-unity/examples/spineboy/SpineboyComponent.cs rename to spine-unity/Assets/examples/spineboy/SpineboyComponent.cs diff --git a/spine-unity/Assets/examples/spineboy/SpineboyComponent.cs.meta b/spine-unity/Assets/examples/spineboy/SpineboyComponent.cs.meta new file mode 100644 index 000000000..cac343146 --- /dev/null +++ b/spine-unity/Assets/examples/spineboy/SpineboyComponent.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5fe5e7b61b19ccf46b700c982173cb7e +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/spine-unity/examples/spineboy/spineboy Atlas.asset b/spine-unity/Assets/examples/spineboy/spineboy Atlas.asset similarity index 96% rename from spine-unity/examples/spineboy/spineboy Atlas.asset rename to spine-unity/Assets/examples/spineboy/spineboy Atlas.asset index f0fd2a6f8..033350485 100644 Binary files a/spine-unity/examples/spineboy/spineboy Atlas.asset and b/spine-unity/Assets/examples/spineboy/spineboy Atlas.asset differ diff --git a/spine-unity/Assets/examples/spineboy/spineboy Atlas.asset.meta b/spine-unity/Assets/examples/spineboy/spineboy Atlas.asset.meta new file mode 100644 index 000000000..f66eda450 --- /dev/null +++ b/spine-unity/Assets/examples/spineboy/spineboy Atlas.asset.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 39e3bb5614837c24eb1c661858084c2a +NativeFormatImporter: + userData: diff --git a/spine-unity/examples/spineboy/spineboy Skeleton Data.asset b/spine-unity/Assets/examples/spineboy/spineboy Skeleton Data.asset similarity index 96% rename from spine-unity/examples/spineboy/spineboy Skeleton Data.asset rename to spine-unity/Assets/examples/spineboy/spineboy Skeleton Data.asset index 60923838d..30ac45dac 100644 Binary files a/spine-unity/examples/spineboy/spineboy Skeleton Data.asset and b/spine-unity/Assets/examples/spineboy/spineboy Skeleton Data.asset differ diff --git a/spine-unity/Assets/examples/spineboy/spineboy Skeleton Data.asset.meta b/spine-unity/Assets/examples/spineboy/spineboy Skeleton Data.asset.meta new file mode 100644 index 000000000..5c8dfb033 --- /dev/null +++ b/spine-unity/Assets/examples/spineboy/spineboy Skeleton Data.asset.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: d04edfd5d421496409ca795016a48045 +NativeFormatImporter: + userData: diff --git a/spine-unity/examples/spineboy/spineboy.unity b/spine-unity/Assets/examples/spineboy/spineboy.unity similarity index 98% rename from spine-unity/examples/spineboy/spineboy.unity rename to spine-unity/Assets/examples/spineboy/spineboy.unity index 3e15494c9..5800bc11c 100644 Binary files a/spine-unity/examples/spineboy/spineboy.unity and b/spine-unity/Assets/examples/spineboy/spineboy.unity differ diff --git a/spine-unity/Assets/examples/spineboy/spineboy.unity.meta b/spine-unity/Assets/examples/spineboy/spineboy.unity.meta new file mode 100644 index 000000000..54845a86f --- /dev/null +++ b/spine-unity/Assets/examples/spineboy/spineboy.unity.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: f5096206ccedb2248944e7ba740a8518 +DefaultImporter: + userData: diff --git a/spine-unity/Assets/src.meta b/spine-unity/Assets/src.meta new file mode 100644 index 000000000..97dc442fe --- /dev/null +++ b/spine-unity/Assets/src.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 169f112a58a7a014eb09b87c01e426dd +DefaultImporter: + userData: diff --git a/spine-unity/src/AtlasAsset.cs b/spine-unity/Assets/src/AtlasAsset.cs similarity index 100% rename from spine-unity/src/AtlasAsset.cs rename to spine-unity/Assets/src/AtlasAsset.cs diff --git a/spine-unity/Assets/src/AtlasAsset.cs.meta b/spine-unity/Assets/src/AtlasAsset.cs.meta new file mode 100644 index 000000000..8cd9bc105 --- /dev/null +++ b/spine-unity/Assets/src/AtlasAsset.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a6b194f808b1af6499c93410e504af42 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/spine-unity/Assets/src/Editor.meta b/spine-unity/Assets/src/Editor.meta new file mode 100644 index 000000000..e78311055 --- /dev/null +++ b/spine-unity/Assets/src/Editor.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: f65f926cf250c204a9658087bc501fab +DefaultImporter: + userData: diff --git a/spine-unity/src/Editor/AtlasAssetInspector.cs b/spine-unity/Assets/src/Editor/AtlasAssetInspector.cs similarity index 100% rename from spine-unity/src/Editor/AtlasAssetInspector.cs rename to spine-unity/Assets/src/Editor/AtlasAssetInspector.cs diff --git a/spine-unity/Assets/src/Editor/AtlasAssetInspector.cs.meta b/spine-unity/Assets/src/Editor/AtlasAssetInspector.cs.meta new file mode 100644 index 000000000..898e53399 --- /dev/null +++ b/spine-unity/Assets/src/Editor/AtlasAssetInspector.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca9b3ce36d70a05408e3bdd5e92c7f64 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/spine-unity/src/Editor/Menus.cs b/spine-unity/Assets/src/Editor/Menus.cs similarity index 100% rename from spine-unity/src/Editor/Menus.cs rename to spine-unity/Assets/src/Editor/Menus.cs diff --git a/spine-unity/Assets/src/Editor/Menus.cs.meta b/spine-unity/Assets/src/Editor/Menus.cs.meta new file mode 100644 index 000000000..ab58e94aa --- /dev/null +++ b/spine-unity/Assets/src/Editor/Menus.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cf21125cbd8928844a85a3ad9002693b +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/spine-unity/src/Editor/SkeletonComponentInspector.cs b/spine-unity/Assets/src/Editor/SkeletonComponentInspector.cs similarity index 100% rename from spine-unity/src/Editor/SkeletonComponentInspector.cs rename to spine-unity/Assets/src/Editor/SkeletonComponentInspector.cs diff --git a/spine-unity/Assets/src/Editor/SkeletonComponentInspector.cs.meta b/spine-unity/Assets/src/Editor/SkeletonComponentInspector.cs.meta new file mode 100644 index 000000000..1d38c4c42 --- /dev/null +++ b/spine-unity/Assets/src/Editor/SkeletonComponentInspector.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 75f45221af7dd564081b96d877373967 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/spine-unity/src/Editor/SkeletonDataAssetInspector.cs b/spine-unity/Assets/src/Editor/SkeletonDataAssetInspector.cs similarity index 100% rename from spine-unity/src/Editor/SkeletonDataAssetInspector.cs rename to spine-unity/Assets/src/Editor/SkeletonDataAssetInspector.cs diff --git a/spine-unity/Assets/src/Editor/SkeletonDataAssetInspector.cs.meta b/spine-unity/Assets/src/Editor/SkeletonDataAssetInspector.cs.meta new file mode 100644 index 000000000..fba64b6e3 --- /dev/null +++ b/spine-unity/Assets/src/Editor/SkeletonDataAssetInspector.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 01cbef8f24d105f4bafa9668d669e040 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/spine-unity/Assets/src/Resources.meta b/spine-unity/Assets/src/Resources.meta new file mode 100644 index 000000000..b9b7e85e4 --- /dev/null +++ b/spine-unity/Assets/src/Resources.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 411b02e44c34aea459ea6ef154df73d4 +DefaultImporter: + userData: diff --git a/spine-unity/Resources/Skeleton.shader b/spine-unity/Assets/src/Resources/Skeleton.shader similarity index 100% rename from spine-unity/Resources/Skeleton.shader rename to spine-unity/Assets/src/Resources/Skeleton.shader diff --git a/spine-unity/Assets/src/Resources/Skeleton.shader.meta b/spine-unity/Assets/src/Resources/Skeleton.shader.meta new file mode 100644 index 000000000..ffa3725ad --- /dev/null +++ b/spine-unity/Assets/src/Resources/Skeleton.shader.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 1e8a610c9e01c3648bac42585e5fc676 +ShaderImporter: + userData: diff --git a/spine-unity/src/SkeletonComponent.cs b/spine-unity/Assets/src/SkeletonComponent.cs similarity index 100% rename from spine-unity/src/SkeletonComponent.cs rename to spine-unity/Assets/src/SkeletonComponent.cs diff --git a/spine-unity/Assets/src/SkeletonComponent.cs.meta b/spine-unity/Assets/src/SkeletonComponent.cs.meta new file mode 100644 index 000000000..255c3fe77 --- /dev/null +++ b/spine-unity/Assets/src/SkeletonComponent.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a0d5e4e6acf3fd8489cb53ffe164e0b4 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/spine-unity/src/SkeletonDataAsset.cs b/spine-unity/Assets/src/SkeletonDataAsset.cs similarity index 100% rename from spine-unity/src/SkeletonDataAsset.cs rename to spine-unity/Assets/src/SkeletonDataAsset.cs diff --git a/spine-unity/Assets/src/SkeletonDataAsset.cs.meta b/spine-unity/Assets/src/SkeletonDataAsset.cs.meta new file mode 100644 index 000000000..db4f247d4 --- /dev/null +++ b/spine-unity/Assets/src/SkeletonDataAsset.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f1b3b4b945939a54ea0b23d3396115fb +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/spine-unity/Assets/src/spine-csharp.meta b/spine-unity/Assets/src/spine-csharp.meta new file mode 100644 index 000000000..358038ce9 --- /dev/null +++ b/spine-unity/Assets/src/spine-csharp.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 1b62d1da83172ed4f9bfc9077b196f79 +DefaultImporter: + userData: diff --git a/spine-unity/spine-csharp/Place spine-csharp here.txt b/spine-unity/Assets/src/spine-csharp/Place spine-csharp here.txt similarity index 100% rename from spine-unity/spine-csharp/Place spine-csharp here.txt rename to spine-unity/Assets/src/spine-csharp/Place spine-csharp here.txt diff --git a/spine-unity/Gizmos/SkeletonComponent Icon.png b/spine-unity/Gizmos/SkeletonComponent Icon.png deleted file mode 100644 index 0d437be90..000000000 Binary files a/spine-unity/Gizmos/SkeletonComponent Icon.png and /dev/null differ