diff --git a/IronToad_UnityProject/Assets/Art/Models/Rocks/Materials/rocksCombined001Mat.mat b/IronToad_UnityProject/Assets/Art/Models/Rocks/Materials/rocksCombined001Mat.mat index 03f6b2c..ebab5ec 100644 Binary files a/IronToad_UnityProject/Assets/Art/Models/Rocks/Materials/rocksCombined001Mat.mat and b/IronToad_UnityProject/Assets/Art/Models/Rocks/Materials/rocksCombined001Mat.mat differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_C.png b/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_C.png index dfe51b5..b2ef596 100644 Binary files a/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_C.png and b/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_C.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_C.png.meta b/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_C.png.meta index 57d1661..e3b49d9 100644 --- a/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_C.png.meta +++ b/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_C.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: c6a3f6d9fbcc6004596801d5261df671 -timeCreated: 1484959006 +guid: 96ac9caa03b5cd54ca97d2741efd4a44 +timeCreated: 1484972681 licenseType: Free TextureImporter: fileIDToRecycleName: {} @@ -28,7 +28,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: 16 + aniso: -1 mipBias: -1 wrapMode: -1 nPOTScale: 1 @@ -58,14 +58,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - - buildTarget: Standalone - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_D.png b/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_D.png new file mode 100644 index 0000000..9dcab35 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_D.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_D.png.meta b/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_D.png.meta new file mode 100644 index 0000000..042a8a1 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_D.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: bd8b36f10e586424ba06670f9cc71f44 +timeCreated: 1484972682 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + 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: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_N.png b/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_N.png index 51b162d..37a505b 100644 Binary files a/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_N.png and b/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_N.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_N.png.meta b/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_N.png.meta index 4cadbdc..38f0ee3 100644 --- a/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_N.png.meta +++ b/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_N.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 5302d1d6da6dda54f9c779e2b814822c -timeCreated: 1484959005 +guid: f005484fa303d6948abbc38e2ff4ae35 +timeCreated: 1484972683 licenseType: Free TextureImporter: fileIDToRecycleName: {} @@ -28,7 +28,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: 16 + aniso: -1 mipBias: -1 wrapMode: -1 nPOTScale: 1 diff --git a/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_gradient.png b/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_gradient.png new file mode 100644 index 0000000..1b7a0a8 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_gradient.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_gradient.png.meta b/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_gradient.png.meta new file mode 100644 index 0000000..6ee28c3 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_gradient.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 83b4494b49f1ea44ca290fd2007bf898 +timeCreated: 1484972853 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + 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: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/terrainTextures/Ground_KalahariSandRocks_2k_alb.png b/IronToad_UnityProject/Assets/Art/terrainTextures/Ground_KalahariSandRocks_2k_alb.png index dff72d5..2ddda4b 100644 Binary files a/IronToad_UnityProject/Assets/Art/terrainTextures/Ground_KalahariSandRocks_2k_alb.png and b/IronToad_UnityProject/Assets/Art/terrainTextures/Ground_KalahariSandRocks_2k_alb.png differ diff --git a/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_BandedSchistRock_2k_basecolor.png b/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_BandedSchistRock_2k_basecolor.png index e367193..f1e0921 100644 Binary files a/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_BandedSchistRock_2k_basecolor.png and b/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_BandedSchistRock_2k_basecolor.png differ diff --git a/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_DistanceCliffWithTrees_2k_basecolor.png b/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_DistanceCliffWithTrees_2k_basecolor.png index 3fb0bfc..f6ef2ee 100644 Binary files a/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_DistanceCliffWithTrees_2k_basecolor.png and b/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_DistanceCliffWithTrees_2k_basecolor.png differ diff --git a/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_sandColored_2k_alb.png b/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_sandColored_2k_alb.png new file mode 100644 index 0000000..115dea0 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_sandColored_2k_alb.png differ diff --git a/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_sandColored_2k_alb.png.meta b/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_sandColored_2k_alb.png.meta new file mode 100644 index 0000000..76d8179 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_sandColored_2k_alb.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 6a4344d114ac4294b9df2673c812714c +timeCreated: 1484975361 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + 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: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/New Terrain 1.asset b/IronToad_UnityProject/Assets/New Terrain 1.asset index 0e24c71..8a38321 100644 Binary files a/IronToad_UnityProject/Assets/New Terrain 1.asset and b/IronToad_UnityProject/Assets/New Terrain 1.asset differ diff --git a/IronToad_UnityProject/Assets/Sound.meta b/IronToad_UnityProject/Assets/Sound.meta deleted file mode 100644 index 982e641..0000000 --- a/IronToad_UnityProject/Assets/Sound.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 091049497d8a5784f93123e69e2329d6 -folderAsset: yes -timeCreated: 1484972317 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity index 26f0976..32b8c84 100644 Binary files a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity and b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity differ