From bdc846ede533c2c6184fc021c60934db3c3577cd Mon Sep 17 00:00:00 2001 From: mattrick Date: Wed, 25 Dec 2013 22:17:25 -0800 Subject: [PATCH] Fixed Repo Error --- Assets/Chunk.prefab.meta | 4 -- Assets/ChunkMaterial.mat.meta | 4 -- Assets/Scripts.meta | 5 --- Assets/Standard Assets.meta | 5 --- .../Character Controllers.meta | 5 --- Assets/Standard Assets/Skyboxes.meta | 5 --- .../Skyboxes/Sunny1 Skybox.mat.meta | 4 -- Assets/Standard Assets/Skyboxes/Textures.meta | 5 --- .../Skyboxes/Textures/Sunny1.meta | 5 --- .../Textures/Sunny1/Sunny1_back.tif.meta | 36 --------------- .../Textures/Sunny1/Sunny1_down.tif.meta | 36 --------------- .../Textures/Sunny1/Sunny1_front.tif.meta | 36 --------------- .../Textures/Sunny1/Sunny1_left.tif.meta | 36 --------------- .../Textures/Sunny1/Sunny1_right.tif.meta | 36 --------------- .../Textures/Sunny1/Sunny1_up.tif.meta | 36 --------------- Assets/Textures.meta | 5 --- Assets/Textures/checkerboard.png.meta | 36 --------------- Assets/Textures/crosshairalpha.png.meta | 45 ------------------- Assets/Textures/tileTexture.png.meta | 36 --------------- Assets/Textures/tileTextureBump.png.meta | 45 ------------------- Assets/garden.unity.meta | 4 -- 21 files changed, 429 deletions(-) delete mode 100644 Assets/Chunk.prefab.meta delete mode 100644 Assets/ChunkMaterial.mat.meta delete mode 100644 Assets/Scripts.meta delete mode 100644 Assets/Standard Assets.meta delete mode 100644 Assets/Standard Assets/Character Controllers.meta delete mode 100644 Assets/Standard Assets/Skyboxes.meta delete mode 100644 Assets/Standard Assets/Skyboxes/Sunny1 Skybox.mat.meta delete mode 100644 Assets/Standard Assets/Skyboxes/Textures.meta delete mode 100644 Assets/Standard Assets/Skyboxes/Textures/Sunny1.meta delete mode 100644 Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_back.tif.meta delete mode 100644 Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_down.tif.meta delete mode 100644 Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_front.tif.meta delete mode 100644 Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_left.tif.meta delete mode 100644 Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_right.tif.meta delete mode 100644 Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_up.tif.meta delete mode 100644 Assets/Textures.meta delete mode 100644 Assets/Textures/checkerboard.png.meta delete mode 100644 Assets/Textures/crosshairalpha.png.meta delete mode 100644 Assets/Textures/tileTexture.png.meta delete mode 100644 Assets/Textures/tileTextureBump.png.meta delete mode 100644 Assets/garden.unity.meta diff --git a/Assets/Chunk.prefab.meta b/Assets/Chunk.prefab.meta deleted file mode 100644 index 5377ce3..0000000 --- a/Assets/Chunk.prefab.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: 0823cae39ac1f1147b3653dc7db245a2 -NativeFormatImporter: - userData: diff --git a/Assets/ChunkMaterial.mat.meta b/Assets/ChunkMaterial.mat.meta deleted file mode 100644 index d41c3eb..0000000 --- a/Assets/ChunkMaterial.mat.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: e1fa29a895b766e4087bebbbbe4e7647 -NativeFormatImporter: - userData: diff --git a/Assets/Scripts.meta b/Assets/Scripts.meta deleted file mode 100644 index 99e5c7d..0000000 --- a/Assets/Scripts.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: 1090bcb745ab46f48bf2f29b212db3be -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/Standard Assets.meta b/Assets/Standard Assets.meta deleted file mode 100644 index 99fe5ae..0000000 --- a/Assets/Standard Assets.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: 8ce8324a93c67cf4db6e30432f3e24ca -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/Standard Assets/Character Controllers.meta b/Assets/Standard Assets/Character Controllers.meta deleted file mode 100644 index 8f37525..0000000 --- a/Assets/Standard Assets/Character Controllers.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: 54216e9ed42974e30967824b7f0b2806 -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/Standard Assets/Skyboxes.meta b/Assets/Standard Assets/Skyboxes.meta deleted file mode 100644 index f8a8da5..0000000 --- a/Assets/Standard Assets/Skyboxes.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: 607426a9820414bfd8081fb22854dbd4 -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/Standard Assets/Skyboxes/Sunny1 Skybox.mat.meta b/Assets/Standard Assets/Skyboxes/Sunny1 Skybox.mat.meta deleted file mode 100644 index 4554519..0000000 --- a/Assets/Standard Assets/Skyboxes/Sunny1 Skybox.mat.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: a2126534b3a11b34e977105bd9e3cc03 -NativeFormatImporter: - userData: diff --git a/Assets/Standard Assets/Skyboxes/Textures.meta b/Assets/Standard Assets/Skyboxes/Textures.meta deleted file mode 100644 index 27e5302..0000000 --- a/Assets/Standard Assets/Skyboxes/Textures.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: 9ef50104b12ed4ca9bed40f105986cd7 -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/Standard Assets/Skyboxes/Textures/Sunny1.meta b/Assets/Standard Assets/Skyboxes/Textures/Sunny1.meta deleted file mode 100644 index 3a3c298..0000000 --- a/Assets/Standard Assets/Skyboxes/Textures/Sunny1.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: 1bf34b610fe6f466faff3dcd833c06f6 -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_back.tif.meta b/Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_back.tif.meta deleted file mode 100644 index 8b702c8..0000000 --- a/Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_back.tif.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: 32ef381921b3f7f479831b042c113762 -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: 512 - textureSettings: - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapMode: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - alphaIsTransparency: 0 - textureType: 0 - buildTargetSettings: [] - userData: diff --git a/Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_down.tif.meta b/Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_down.tif.meta deleted file mode 100644 index 468bcd4..0000000 --- a/Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_down.tif.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: 352e5f82d7105ad408904c5f552b5fe7 -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: 512 - textureSettings: - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapMode: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - alphaIsTransparency: 0 - textureType: 0 - buildTargetSettings: [] - userData: diff --git a/Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_front.tif.meta b/Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_front.tif.meta deleted file mode 100644 index 099774b..0000000 --- a/Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_front.tif.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: 2372dd1814cb4ed47a91f8174877623e -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: 512 - textureSettings: - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapMode: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - alphaIsTransparency: 0 - textureType: 0 - buildTargetSettings: [] - userData: diff --git a/Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_left.tif.meta b/Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_left.tif.meta deleted file mode 100644 index 26fe9d2..0000000 --- a/Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_left.tif.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: 66ebe4da1ef67e64e8aeccb820e409d6 -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: 512 - textureSettings: - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapMode: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - alphaIsTransparency: 0 - textureType: 0 - buildTargetSettings: [] - userData: diff --git a/Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_right.tif.meta b/Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_right.tif.meta deleted file mode 100644 index 617f1f1..0000000 --- a/Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_right.tif.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: 195c271a9118d224c8562ae67cf47a66 -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: 512 - textureSettings: - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapMode: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - alphaIsTransparency: 0 - textureType: 0 - buildTargetSettings: [] - userData: diff --git a/Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_up.tif.meta b/Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_up.tif.meta deleted file mode 100644 index a86e337..0000000 --- a/Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_up.tif.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: 8a98ef45bc7df804d95fd945abd2c943 -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: 512 - textureSettings: - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapMode: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - alphaIsTransparency: 0 - textureType: 0 - buildTargetSettings: [] - userData: diff --git a/Assets/Textures.meta b/Assets/Textures.meta deleted file mode 100644 index e53a715..0000000 --- a/Assets/Textures.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: 75a9f42993c7cb446b8bffb829d7adb4 -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/Textures/checkerboard.png.meta b/Assets/Textures/checkerboard.png.meta deleted file mode 100644 index 8f47d9d..0000000 --- a/Assets/Textures/checkerboard.png.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: 78c863421fc0e6948b59e59996e6ca7d -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 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - userData: diff --git a/Assets/Textures/crosshairalpha.png.meta b/Assets/Textures/crosshairalpha.png.meta deleted file mode 100644 index d218c0e..0000000 --- a/Assets/Textures/crosshairalpha.png.meta +++ /dev/null @@ -1,45 +0,0 @@ -fileFormatVersion: 2 -guid: d379536bbe06cc646bd48c83110ea995 -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 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Textures/tileTexture.png.meta b/Assets/Textures/tileTexture.png.meta deleted file mode 100644 index ad40757..0000000 --- a/Assets/Textures/tileTexture.png.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: 453ea2e1e226d2c4f83fe551570fbabf -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: 512 - textureSettings: - filterMode: 0 - aniso: -1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - userData: diff --git a/Assets/Textures/tileTextureBump.png.meta b/Assets/Textures/tileTextureBump.png.meta deleted file mode 100644 index 73a5508..0000000 --- a/Assets/Textures/tileTextureBump.png.meta +++ /dev/null @@ -1,45 +0,0 @@ -fileFormatVersion: 2 -guid: 640f8137cba04b94890b520575b3e766 -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 1 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 1 - externalNormalMap: 1 - heightScale: .25 - normalMapFilter: 1 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 512 - textureSettings: - filterMode: 0 - aniso: -1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: 1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/garden.unity.meta b/Assets/garden.unity.meta deleted file mode 100644 index cbce262..0000000 --- a/Assets/garden.unity.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: 61b884acb642d904382bce55cfeac61a -DefaultImporter: - userData: