diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/Group48238Mat.mat b/IronToad_UnityProject/Assets/Art/Models/Materials/Group48238Mat.mat new file mode 100644 index 0000000..1f01387 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/Materials/Group48238Mat.mat differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/Group48238Mat.mat.meta b/IronToad_UnityProject/Assets/Art/Models/Materials/Group48238Mat.mat.meta new file mode 100644 index 0000000..0364b65 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/Materials/Group48238Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a9ac0ea32767bfe42aa7ce6753104e25 +timeCreated: 1485053650 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/mat_rockBoulder.mat b/IronToad_UnityProject/Assets/Art/Models/Materials/mat_rockBoulder.mat new file mode 100644 index 0000000..cd6cd2c Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/Materials/mat_rockBoulder.mat differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/mat_rockBoulder.mat.meta b/IronToad_UnityProject/Assets/Art/Models/Materials/mat_rockBoulder.mat.meta new file mode 100644 index 0000000..51e2d57 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/Materials/mat_rockBoulder.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 17ee00c36b59c344e83556e5bed577b6 +timeCreated: 1485052411 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/textures/circle-MAT.png b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/circle-MAT.png new file mode 100644 index 0000000..32d17dd Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/circle-MAT.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/textures/circle-MAT.png.meta b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/circle-MAT.png.meta new file mode 100644 index 0000000..04dac77 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/circle-MAT.png.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: 9a81218b321cc42eba4dd59f9b513146 +timeCreated: 1485051858 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + 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 + - buildTarget: Standalone + 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/Materials/textures/splash-sprite.mat b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/splash-sprite.mat new file mode 100644 index 0000000..9ebccf5 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/splash-sprite.mat differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/textures/splash-sprite.mat.meta b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/splash-sprite.mat.meta new file mode 100644 index 0000000..9da6a59 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/splash-sprite.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eb66aff512dcb4d07a63d2a8ecd24bde +timeCreated: 1485051885 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/lightHouse_LOW.obj.meta b/IronToad_UnityProject/Assets/Art/Models/catapult_rock.OBJ.meta similarity index 89% rename from IronToad_UnityProject/Assets/Art/Models/lightHouse_LOW.obj.meta rename to IronToad_UnityProject/Assets/Art/Models/catapult_rock.OBJ.meta index d94fc60..47c11f1 100644 --- a/IronToad_UnityProject/Assets/Art/Models/lightHouse_LOW.obj.meta +++ b/IronToad_UnityProject/Assets/Art/Models/catapult_rock.OBJ.meta @@ -1,17 +1,17 @@ fileFormatVersion: 2 -guid: 919eb0dba9aa0da44aec3a80f1cf98ea -timeCreated: 1485000000 +guid: ab392ccfd0fbdbb419b0edd49d9ffe20 +timeCreated: 1485052411 licenseType: Free ModelImporter: serializedVersion: 19 fileIDToRecycleName: - 100000: lighthouse + 100000: Group48238 100002: //RootNode - 400000: lighthouse + 400000: Group48238 400002: //RootNode - 2300000: lighthouse - 3300000: lighthouse - 4300000: lighthouse + 2300000: Group48238 + 3300000: Group48238 + 4300000: Group48238 materials: importMaterials: 1 materialName: 0 @@ -36,7 +36,7 @@ ModelImporter: isReadable: 1 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 0.0666 meshCompression: 0 addColliders: 0 importBlendShapes: 1 diff --git a/IronToad_UnityProject/Assets/Art/Models/pier.obj.meta b/IronToad_UnityProject/Assets/Art/Models/pier.obj.meta deleted file mode 100644 index 92a0183..0000000 --- a/IronToad_UnityProject/Assets/Art/Models/pier.obj.meta +++ /dev/null @@ -1,82 +0,0 @@ -fileFormatVersion: 2 -guid: 37549450629db464abffe54861590cf3 -timeCreated: 1485008673 -licenseType: Free -ModelImporter: - serializedVersion: 19 - fileIDToRecycleName: - 100000: pCylinder3 - 100002: //RootNode - 400000: pCylinder3 - 400002: //RootNode - 2300000: pCylinder3 - 3300000: pCylinder3 - 4300000: pCylinder3 - materials: - importMaterials: 1 - materialName: 0 - materialSearch: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - motionNodeName: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - clipAnimations: [] - isReadable: 1 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - importBlendShapes: 1 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - optimizeMeshForGPU: 1 - keepQuads: 0 - weldVertices: 1 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVPackMargin: 4 - useFileScale: 1 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - importAnimation: 1 - copyAvatar: 0 - humanDescription: - serializedVersion: 2 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - rootMotionBoneName: - rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - animationType: 0 - humanoidOversampling: 1 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_C.png b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_C.png new file mode 100644 index 0000000..679c770 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_C.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_C.png.meta b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_C.png.meta new file mode 100644 index 0000000..5ad478e --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_C.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 8108a8c7021f51f40b59580b43dbfd2a +timeCreated: 1485052499 +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/textures/low_rock_default_D.png b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_D.png new file mode 100644 index 0000000..7bf5d7c Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_D.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_D.png.meta b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_D.png.meta new file mode 100644 index 0000000..11e6880 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_D.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 9b0ec7c3400bea04c94e9bd4d17a0ffc +timeCreated: 1485052499 +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/textures/low_rock_default_N.png b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_N.png new file mode 100644 index 0000000..7e6874b Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_N.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_N.png.meta b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_N.png.meta new file mode 100644 index 0000000..daa9329 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_N.png.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: 42574f2ff1b9d00479fce7fa9823e0ad +timeCreated: 1485052499 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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: 1 + 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 + - buildTarget: Standalone + 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/particle effects/fog-mat.mat b/IronToad_UnityProject/Assets/Art/particle effects/fog-mat.mat index afc37ee..a84dc5a 100644 Binary files a/IronToad_UnityProject/Assets/Art/particle effects/fog-mat.mat and b/IronToad_UnityProject/Assets/Art/particle effects/fog-mat.mat differ diff --git a/IronToad_UnityProject/Assets/Art/particle effects/splash.prefab b/IronToad_UnityProject/Assets/Art/particle effects/splash.prefab new file mode 100644 index 0000000..9cf4ece Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/particle effects/splash.prefab differ diff --git a/IronToad_UnityProject/Assets/Art/particle effects/splash.prefab.meta b/IronToad_UnityProject/Assets/Art/particle effects/splash.prefab.meta new file mode 100644 index 0000000..ccfca2a --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/particle effects/splash.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 15855eec8f44a48169b15f54f2988b2e +timeCreated: 1485052510 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Prefabs/catapult-projectile.prefab b/IronToad_UnityProject/Assets/Prefabs/catapult-projectile.prefab new file mode 100644 index 0000000..467dab9 Binary files /dev/null and b/IronToad_UnityProject/Assets/Prefabs/catapult-projectile.prefab differ diff --git a/IronToad_UnityProject/Assets/Prefabs/catapult-projectile.prefab.meta b/IronToad_UnityProject/Assets/Prefabs/catapult-projectile.prefab.meta new file mode 100644 index 0000000..dd61e1b --- /dev/null +++ b/IronToad_UnityProject/Assets/Prefabs/catapult-projectile.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ff24e35626d4349e7be883de5e03e5b1 +timeCreated: 1485036737 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Prefabs/catapultExplosion.prefab b/IronToad_UnityProject/Assets/Prefabs/catapultExplosion.prefab new file mode 100644 index 0000000..337cfbd Binary files /dev/null and b/IronToad_UnityProject/Assets/Prefabs/catapultExplosion.prefab differ diff --git a/IronToad_UnityProject/Assets/Prefabs/catapultExplosion.prefab.meta b/IronToad_UnityProject/Assets/Prefabs/catapultExplosion.prefab.meta new file mode 100644 index 0000000..72f985e --- /dev/null +++ b/IronToad_UnityProject/Assets/Prefabs/catapultExplosion.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 93e56074113fd4131820ce9d0c7d6a77 +timeCreated: 1485040026 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Scripts/Boulder.cs b/IronToad_UnityProject/Assets/Scripts/Boulder.cs index 6669270..55c5f3b 100644 --- a/IronToad_UnityProject/Assets/Scripts/Boulder.cs +++ b/IronToad_UnityProject/Assets/Scripts/Boulder.cs @@ -4,8 +4,9 @@ using UnityEngine; public class Boulder : HeavyObject { - - + public GameObject splash; + public GameObject Explosion; + public override void OnWaterStay(WaterController water,float waveHeight) { } @@ -13,4 +14,17 @@ public class Boulder : HeavyObject public override void OnWaterExit(WaterController water) { } + + void OnTriggerEnter(Collider other) { + if (other.gameObject.CompareTag("Water")) { + Destroy(Instantiate(splash, transform.position,Quaternion.identity), 2.5f); + }else { + Destroy(Instantiate(Explosion, transform.position, Quaternion.identity), 6); + } + } + + + + + } diff --git a/IronToad_UnityProject/Assets/Sound.meta b/IronToad_UnityProject/Assets/Sound.meta new file mode 100644 index 0000000..f8e9b50 --- /dev/null +++ b/IronToad_UnityProject/Assets/Sound.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 844c4f25011b45348a5db5bc5b4f956e +folderAsset: yes +timeCreated: 1485037848 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Sound/Music.meta b/IronToad_UnityProject/Assets/Sound/Music.meta new file mode 100644 index 0000000..b3ddd5b --- /dev/null +++ b/IronToad_UnityProject/Assets/Sound/Music.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 1715d56e0d2b68246a82993db31014ab +folderAsset: yes +timeCreated: 1485038927 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Sound/SFX.meta b/IronToad_UnityProject/Assets/Sound/SFX.meta new file mode 100644 index 0000000..795aecf --- /dev/null +++ b/IronToad_UnityProject/Assets/Sound/SFX.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: de5a3adcedb96f64183518ac89622ade +folderAsset: yes +timeCreated: 1485038927 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Textures.meta b/IronToad_UnityProject/Assets/Textures.meta new file mode 100644 index 0000000..ffdd440 --- /dev/null +++ b/IronToad_UnityProject/Assets/Textures.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 2a6e699820a38a544acfc0015eb679a2 +folderAsset: yes +timeCreated: 1484972317 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta new file mode 100644 index 0000000..47507ca --- /dev/null +++ b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 338533d5d159c00478a9fb5321b7d922 +folderAsset: yes +timeCreated: 1485007190 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/water/planeWater.prefab b/IronToad_UnityProject/Assets/water/planeWater.prefab index e0f40e6..7e18e2b 100644 Binary files a/IronToad_UnityProject/Assets/water/planeWater.prefab and b/IronToad_UnityProject/Assets/water/planeWater.prefab differ diff --git a/IronToad_UnityProject/ProjectSettings/QualitySettings.asset b/IronToad_UnityProject/ProjectSettings/QualitySettings.asset index 3b545db..4548f05 100644 Binary files a/IronToad_UnityProject/ProjectSettings/QualitySettings.asset and b/IronToad_UnityProject/ProjectSettings/QualitySettings.asset differ diff --git a/IronToad_UnityProject/ProjectSettings/TagManager.asset b/IronToad_UnityProject/ProjectSettings/TagManager.asset index de2d837..448c10c 100644 Binary files a/IronToad_UnityProject/ProjectSettings/TagManager.asset and b/IronToad_UnityProject/ProjectSettings/TagManager.asset differ