diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/No Name.mat b/IronToad_UnityProject/Assets/Art/Models/Materials/No Name.mat index e15f536..458f8a4 100644 Binary files a/IronToad_UnityProject/Assets/Art/Models/Materials/No Name.mat and b/IronToad_UnityProject/Assets/Art/Models/Materials/No Name.mat differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Rocks/Materials/rocksCombined001Mat.mat.meta b/IronToad_UnityProject/Assets/Art/Models/Rocks/Materials/rocksCombined001Mat.mat.meta index 77e2993..7ea168f 100644 --- a/IronToad_UnityProject/Assets/Art/Models/Rocks/Materials/rocksCombined001Mat.mat.meta +++ b/IronToad_UnityProject/Assets/Art/Models/Rocks/Materials/rocksCombined001Mat.mat.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 6b42b91fe7a50714bb176e9b6d9257f8 -timeCreated: 1484958683 +guid: b9c8f91f6208c48419298d96dae3a31f +timeCreated: 1484974180 licenseType: Free NativeFormatImporter: userData: diff --git a/IronToad_UnityProject/Assets/Art/Models/Rocks/Materials/toonROCKS.mat b/IronToad_UnityProject/Assets/Art/Models/Rocks/Materials/toonROCKS.mat new file mode 100644 index 0000000..0ea7f0f Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/Rocks/Materials/toonROCKS.mat differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Rocks/Materials/toonROCKS.mat.meta b/IronToad_UnityProject/Assets/Art/Models/Rocks/Materials/toonROCKS.mat.meta new file mode 100644 index 0000000..77e2993 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/Rocks/Materials/toonROCKS.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6b42b91fe7a50714bb176e9b6d9257f8 +timeCreated: 1484958683 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_M_AO_G.png b/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_M_AO_G.png index b24067f..782364e 100644 Binary files a/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_M_AO_G.png and b/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_M_AO_G.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_M_AO_G.png.meta b/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_M_AO_G.png.meta index 2f765d4..8ca2d88 100644 --- a/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_M_AO_G.png.meta +++ b/IronToad_UnityProject/Assets/Art/Models/Rocks/textures/rocksToSculpt_LOW_defaultMat_M_AO_G.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 36f20889c67262c4b9e92fdb19461cbe -timeCreated: 1484959004 +guid: 55f2fe18edcb5354cb3b4337dc40a696 +timeCreated: 1484972680 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/terrainTextures/Ground_KalahariSandRocks_2k_alb 1.png b/IronToad_UnityProject/Assets/Art/terrainTextures/Ground_KalahariSandRocks_2k_alb 1.png new file mode 100644 index 0000000..2ddda4b Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/terrainTextures/Ground_KalahariSandRocks_2k_alb 1.png differ diff --git a/IronToad_UnityProject/Assets/Art/terrainTextures/Ground_KalahariSandRocks_2k_alb 1.png.meta b/IronToad_UnityProject/Assets/Art/terrainTextures/Ground_KalahariSandRocks_2k_alb 1.png.meta new file mode 100644 index 0000000..a085e62 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/terrainTextures/Ground_KalahariSandRocks_2k_alb 1.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: d11825db69214b843a37241f7ec5a370 +timeCreated: 1484974229 +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/Rock_BandedSchistRock_2k_basecolor 1.png b/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_BandedSchistRock_2k_basecolor 1.png new file mode 100644 index 0000000..f1e0921 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_BandedSchistRock_2k_basecolor 1.png differ diff --git a/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_BandedSchistRock_2k_basecolor 1.png.meta b/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_BandedSchistRock_2k_basecolor 1.png.meta new file mode 100644 index 0000000..0979fa8 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_BandedSchistRock_2k_basecolor 1.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: c44cdf6bead738145873c2a44102262b +timeCreated: 1484974228 +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/Rock_DistanceCliffWithTrees_2k_basecolor 1.png b/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_DistanceCliffWithTrees_2k_basecolor 1.png new file mode 100644 index 0000000..f6ef2ee Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_DistanceCliffWithTrees_2k_basecolor 1.png differ diff --git a/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_DistanceCliffWithTrees_2k_basecolor 1.png.meta b/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_DistanceCliffWithTrees_2k_basecolor 1.png.meta new file mode 100644 index 0000000..8ca457b --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_DistanceCliffWithTrees_2k_basecolor 1.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: f3495e184a7d2e64ab5daaa4f96c38fd +timeCreated: 1484974229 +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/Rock_sandColored_2k_alb.png.meta b/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_sandColored_2k_alb.png.meta index 76d8179..195872b 100644 --- a/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_sandColored_2k_alb.png.meta +++ b/IronToad_UnityProject/Assets/Art/terrainTextures/Rock_sandColored_2k_alb.png.meta @@ -1,7 +1,13 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 6a4344d114ac4294b9df2673c812714c timeCreated: 1484975361 licenseType: Pro +======= +guid: 6f27d643cbd830143a5d7ae5f9ada877 +timeCreated: 1484974226 +licenseType: Free +>>>>>>> 4aebbd18318bea29e738b027f14b642044c34ee3 TextureImporter: fileIDToRecycleName: {} serializedVersion: 4 diff --git a/IronToad_UnityProject/Assets/Art/terrainTextures/ToonLit 1.mat b/IronToad_UnityProject/Assets/Art/terrainTextures/ToonLit 1.mat new file mode 100644 index 0000000..84c2369 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/terrainTextures/ToonLit 1.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: ToonLit + m_Shader: {fileID: 4800000, guid: 48dca5b99d113b8d11006bab44295342, type: 3} + m_ShaderKeywords: [] + m_CustomRenderQueue: -1 + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 2800000, guid: 9ca701319d113f2d1100ff9b44295342, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _BumpMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _ToonShade + second: + m_Texture: {fileID: 8900000, guid: ed7fefe29d117c8d11005e4844295342, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _Ramp + second: + m_Texture: {fileID: 2800000, guid: 4a056241e2722dc46a7262a8e7073fd9, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + data: + first: + name: _Shininess + second: .699999988 + data: + first: + name: _Outline + second: .00807547197 + m_Colors: + data: + first: + name: _Color + second: {r: .50251013, g: .50251013, b: .50251013, a: 1} + data: + first: + name: _MainTex_ST + second: {r: 1, g: 1, b: 0, a: 0} + data: + first: + name: _Emission + second: {r: 0, g: 0, b: 0, a: 0} + data: + first: + name: _SpecColor + second: {r: 1, g: 1, b: 1, a: 1} + data: + first: + name: _OutlineColor + second: {r: 0, g: 0, b: 0, a: 1} + data: + first: + name: _ToonShade_ST + second: {r: 1, g: 1, b: 0, a: 0} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/IronToad_UnityProject/Assets/Art/terrainTextures/ToonLit 1.mat.meta b/IronToad_UnityProject/Assets/Art/terrainTextures/ToonLit 1.mat.meta new file mode 100644 index 0000000..41af00a --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/terrainTextures/ToonLit 1.mat.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 46d853b05583b804b84ca27e28eb3e6e +NativeFormatImporter: + userData: + assetBundleName: