diff --git a/IronToad_UnityProject/Assets/Animations/WaveRing.controller b/IronToad_UnityProject/Assets/Animations/WaveRing.controller index b6d10d8..6766e28 100644 Binary files a/IronToad_UnityProject/Assets/Animations/WaveRing.controller and b/IronToad_UnityProject/Assets/Animations/WaveRing.controller differ diff --git a/IronToad_UnityProject/Assets/Art/Models/lightHouse_LOW.obj.meta b/IronToad_UnityProject/Assets/Art/Models/lightHouse_LOW.obj.meta new file mode 100644 index 0000000..d94fc60 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/lightHouse_LOW.obj.meta @@ -0,0 +1,82 @@ +fileFormatVersion: 2 +guid: 919eb0dba9aa0da44aec3a80f1cf98ea +timeCreated: 1485000000 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: lighthouse + 100002: //RootNode + 400000: lighthouse + 400002: //RootNode + 2300000: lighthouse + 3300000: lighthouse + 4300000: lighthouse + 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/pier.obj.meta b/IronToad_UnityProject/Assets/Art/Models/pier.obj.meta new file mode 100644 index 0000000..92a0183 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/pier.obj.meta @@ -0,0 +1,82 @@ +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/Materials/MaskMat.mat b/IronToad_UnityProject/Assets/Materials/MaskMat.mat new file mode 100644 index 0000000..6c53bdf Binary files /dev/null and b/IronToad_UnityProject/Assets/Materials/MaskMat.mat differ diff --git a/IronToad_UnityProject/Assets/Materials/MaskMat.mat.meta b/IronToad_UnityProject/Assets/Materials/MaskMat.mat.meta new file mode 100644 index 0000000..bd43e1d --- /dev/null +++ b/IronToad_UnityProject/Assets/Materials/MaskMat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 710e883f261d31a4ba94c2426f8eb901 +timeCreated: 1485038326 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Models/M_Boat.FBX b/IronToad_UnityProject/Assets/Models/M_Boat.FBX index 1a025d3..da7f92c 100644 Binary files a/IronToad_UnityProject/Assets/Models/M_Boat.FBX and b/IronToad_UnityProject/Assets/Models/M_Boat.FBX differ diff --git a/IronToad_UnityProject/Assets/Models/M_Boat.FBX.meta b/IronToad_UnityProject/Assets/Models/M_Boat.FBX.meta index 4f11a1d..03a76c8 100644 --- a/IronToad_UnityProject/Assets/Models/M_Boat.FBX.meta +++ b/IronToad_UnityProject/Assets/Models/M_Boat.FBX.meta @@ -6,10 +6,25 @@ ModelImporter: serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode + 100002: boat_hull + 100004: boat_sail + 100006: hull_mask 400000: //RootNode + 400002: boat_hull + 400004: boat_sail + 400006: hull_mask 2300000: //RootNode + 2300002: boat_hull + 2300004: boat_sail + 2300006: hull_mask 3300000: //RootNode + 3300002: boat_hull + 3300004: boat_sail + 3300006: hull_mask 4300000: boat + 4300002: boat_hull + 4300004: boat_sail + 4300006: hull_mask 9500000: //RootNode materials: importMaterials: 1 @@ -35,7 +50,7 @@ ModelImporter: isReadable: 1 meshes: lODScreenPercentages: [] - globalScale: 0.2 + globalScale: 1 meshCompression: 0 addColliders: 0 importBlendShapes: 1 diff --git a/IronToad_UnityProject/Assets/Models/Materials/No Name.mat b/IronToad_UnityProject/Assets/Models/Materials/No Name.mat index e15f536..458f8a4 100644 Binary files a/IronToad_UnityProject/Assets/Models/Materials/No Name.mat and b/IronToad_UnityProject/Assets/Models/Materials/No Name.mat differ diff --git a/IronToad_UnityProject/Assets/Models/Materials/boat_LOW_defaultMat_C.mat b/IronToad_UnityProject/Assets/Models/Materials/boat_LOW_defaultMat_C.mat new file mode 100644 index 0000000..e27f244 Binary files /dev/null and b/IronToad_UnityProject/Assets/Models/Materials/boat_LOW_defaultMat_C.mat differ diff --git a/IronToad_UnityProject/Assets/Models/Materials/boat_LOW_defaultMat_C.mat.meta b/IronToad_UnityProject/Assets/Models/Materials/boat_LOW_defaultMat_C.mat.meta new file mode 100644 index 0000000..d66abfb --- /dev/null +++ b/IronToad_UnityProject/Assets/Models/Materials/boat_LOW_defaultMat_C.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d6bfbac740d713642a29680cd761c688 +timeCreated: 1485038037 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Physics Materials/Water.physicMaterial b/IronToad_UnityProject/Assets/Physics Materials/Water.physicMaterial index bd32d04..03926b4 100644 Binary files a/IronToad_UnityProject/Assets/Physics Materials/Water.physicMaterial and b/IronToad_UnityProject/Assets/Physics Materials/Water.physicMaterial differ diff --git a/IronToad_UnityProject/Assets/Scripts/BoatController.cs b/IronToad_UnityProject/Assets/Scripts/BoatController.cs index 3a6a134..e381ce8 100644 --- a/IronToad_UnityProject/Assets/Scripts/BoatController.cs +++ b/IronToad_UnityProject/Assets/Scripts/BoatController.cs @@ -6,7 +6,7 @@ using UnityEngine; public class BoatController : BuoyantObject { public float trunSpeed = 0.5f; - + public float breakSpeed = 20f; // Use this for initialization void Start() { @@ -26,8 +26,15 @@ public class BoatController : BuoyantObject { } void OnCollisionEnter(Collision collision) { - if (collision.gameObject.CompareTag("Rock")) - NotificationServer.notify("show GameOverPanel"); + if (collision.gameObject.CompareTag("Rock")) { + + float forwardHitSpeed = Vector3.Project(collision.relativeVelocity, transform.forward).magnitude; + + Debug.Log("Forward hit:" + forwardHitSpeed); + if (forwardHitSpeed > breakSpeed) { + NotificationServer.notify("show GameOverPanel"); + } + } } diff --git a/IronToad_UnityProject/Assets/Scripts/DontRotate.cs b/IronToad_UnityProject/Assets/Scripts/DontRotate.cs new file mode 100644 index 0000000..584f172 --- /dev/null +++ b/IronToad_UnityProject/Assets/Scripts/DontRotate.cs @@ -0,0 +1,17 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DontRotate : MonoBehaviour { + + private Quaternion originalRot; + // Use this for initialization + void Start () { + originalRot = transform.rotation; + } + + // Update is called once per frame + void Update () { + transform.rotation = originalRot; + } +} diff --git a/IronToad_UnityProject/Assets/Scripts/DontRotate.cs.meta b/IronToad_UnityProject/Assets/Scripts/DontRotate.cs.meta new file mode 100644 index 0000000..9899ceb --- /dev/null +++ b/IronToad_UnityProject/Assets/Scripts/DontRotate.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 676629218e9aa15459d02d01dea3c546 +timeCreated: 1485038957 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Scripts/PlayerController.cs b/IronToad_UnityProject/Assets/Scripts/PlayerController.cs index 696fa74..a0b548e 100644 --- a/IronToad_UnityProject/Assets/Scripts/PlayerController.cs +++ b/IronToad_UnityProject/Assets/Scripts/PlayerController.cs @@ -4,7 +4,7 @@ using UnityEngine; public class PlayerController : MonoBehaviour { - private static bool isLocked = false; + public bool isLocked = false; public float power; public float radius; @@ -12,6 +12,14 @@ public class PlayerController : MonoBehaviour { public GameObject waveRing; + void Start() { + + NotificationServer.register("show GameUI", showGameUI); + NotificationServer.register("hide GameUI", hideGameUI); + + + } + // Update is called once per frame void Update () { @@ -26,14 +34,6 @@ public class PlayerController : MonoBehaviour { if (Physics.Raycast(ray, out hit, Mathf.Infinity,rayMask)) { - Vector3 pos = hit.point; - pos.y += 1; - Quaternion rot = Quaternion.Euler(-90, 0, 0); - - if (waveRing != null) - Destroy(Instantiate(waveRing, pos, rot),4); - - WaterController waterScript = hit.collider.gameObject.GetComponent(); Debug.DrawLine(Camera.main.transform.position, hit.point, Color.red,1); @@ -48,12 +48,14 @@ public class PlayerController : MonoBehaviour { } - /// - /// if true stops player from being able to click on water - /// - /// - public static void lockControls(bool input) { - isLocked = input; + private void showGameUI() { + Debug.Log("UI open"); + isLocked = false; + } + + private void hideGameUI() { + Debug.Log("UI close"); + isLocked = true; } } diff --git a/IronToad_UnityProject/Assets/Scripts/WaterController.cs b/IronToad_UnityProject/Assets/Scripts/WaterController.cs index ad6fd8d..68bd92c 100644 --- a/IronToad_UnityProject/Assets/Scripts/WaterController.cs +++ b/IronToad_UnityProject/Assets/Scripts/WaterController.cs @@ -13,6 +13,7 @@ public class WaterController : MonoBehaviour { public float waveSpeed = 1; public float maxWaveHeight = 2; + public GameObject rippleEffect; #region Unity Functions // Use this for initialization @@ -43,6 +44,13 @@ public class WaterController : MonoBehaviour { point.y = transform.position.y; + Vector3 pos = point; + pos.y += 1; + Quaternion rot = Quaternion.Euler(-90, 0, 0); + + if (rippleEffect != null) + Destroy(Instantiate(rippleEffect, pos, rot), 4); + Collider[] colliders = Physics.OverlapSphere(point, radius); foreach (Collider hit in colliders) { Debug.Log(hit.name); diff --git a/IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures/sf_parallax_test_ao_height.tga b/IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures/sf_parallax_test_ao_height.tga deleted file mode 100644 index 3d6fc2a..0000000 Binary files a/IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures/sf_parallax_test_ao_height.tga and /dev/null differ diff --git a/IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures/sf_parallax_test_ao_height.tga.meta b/IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures/sf_parallax_test_ao_height.tga.meta deleted file mode 100644 index 8a3896f..0000000 --- a/IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures/sf_parallax_test_ao_height.tga.meta +++ /dev/null @@ -1,45 +0,0 @@ -fileFormatVersion: 2 -guid: 5fb7986dd6d0a8e4093ba82369dd6a4d -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: 128 - 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: 0 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures/sf_parallax_test_normals.tga b/IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures/sf_parallax_test_normals.tga deleted file mode 100644 index 2b9b881..0000000 Binary files a/IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures/sf_parallax_test_normals.tga and /dev/null differ diff --git a/IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures/sf_parallax_test_normals.tga.meta b/IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures/sf_parallax_test_normals.tga.meta deleted file mode 100644 index 2f8233e..0000000 --- a/IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures/sf_parallax_test_normals.tga.meta +++ /dev/null @@ -1,45 +0,0 @@ -fileFormatVersion: 2 -guid: cf20bfced7e912046a9ce991a4d775ec -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 1 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 1 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 128 - 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: 0 - textureType: 1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/IronToad_UnityProject/Assets/Shaders/DepthMask.shader b/IronToad_UnityProject/Assets/Shaders/DepthMask.shader new file mode 100644 index 0000000..4aba42a --- /dev/null +++ b/IronToad_UnityProject/Assets/Shaders/DepthMask.shader @@ -0,0 +1,18 @@ +Shader "Masked/Mask" { + + SubShader { + // Render the mask after regular geometry, but before masked geometry and + // transparent things. + + Tags {"Queue" = "Geometry+10" } + + // Don't draw in the RGBA channels; just the depth buffer + + ColorMask 0 + ZWrite On + + // Do nothing specific in the pass: + + Pass {} + } +} \ No newline at end of file diff --git a/IronToad_UnityProject/Assets/Shaders/DepthMask.shader.meta b/IronToad_UnityProject/Assets/Shaders/DepthMask.shader.meta new file mode 100644 index 0000000..ec3f480 --- /dev/null +++ b/IronToad_UnityProject/Assets/Shaders/DepthMask.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 311e51b6b1845554098afdb56d60e28f +timeCreated: 1485038290 +licenseType: Free +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Sound.meta b/IronToad_UnityProject/Assets/Sound.meta deleted file mode 100644 index 4c44fca..0000000 --- a/IronToad_UnityProject/Assets/Sound.meta +++ /dev/null @@ -1,16 +0,0 @@ -fileFormatVersion: 2 -<<<<<<< HEAD -guid: 0fbabcae9313543ffbf1429aeac3664d -folderAsset: yes -timeCreated: 1485006712 -licenseType: Free -======= -guid: 73fb9ee280b0c75439600b4d5c3a6a7d -folderAsset: yes -timeCreated: 1484996421 -licenseType: Pro ->>>>>>> 4dc44205d41ab697039660061470b5816237ab96 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/ShaderForge.meta b/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b similarity index 67% rename from IronToad_UnityProject/Assets/ShaderForge.meta rename to IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b index c2a4bfd..f8e9b50 100644 --- a/IronToad_UnityProject/Assets/ShaderForge.meta +++ b/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 94220348a13529a4490aa9ee3167e649 +guid: 844c4f25011b45348a5db5bc5b4f956e folderAsset: yes -timeCreated: 1484980467 +timeCreated: 1485037848 licenseType: Pro DefaultImporter: userData: diff --git a/IronToad_UnityProject/Assets/ShaderForge/Example Assets.meta b/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta similarity index 58% rename from IronToad_UnityProject/Assets/ShaderForge/Example Assets.meta rename to IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta index 82ceb90..97e3f7f 100644 --- a/IronToad_UnityProject/Assets/ShaderForge/Example Assets.meta +++ b/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: 521359692b2816940bb04fd9950a9177 -folderAsset: yes -timeCreated: 1484980467 +guid: 3c7e12539b1e2c048bbfe0734108abba +timeCreated: 1485039339 licenseType: Pro DefaultImporter: userData: diff --git a/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540 b/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540 new file mode 100644 index 0000000..a809e82 --- /dev/null +++ b/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540 @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7a2ebb0518fbb4d46a3aa17dac934dce +timeCreated: 1485038927 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures.meta b/IronToad_UnityProject/Assets/Sound.meta~HEAD similarity index 58% rename from IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures.meta rename to IronToad_UnityProject/Assets/Sound.meta~HEAD index 612c925..0ebd43e 100644 --- a/IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures.meta +++ b/IronToad_UnityProject/Assets/Sound.meta~HEAD @@ -1,8 +1,6 @@ fileFormatVersion: 2 -guid: bc6edbce34ffe84498ddcb02eb143c3e +guid: 73fb9ee280b0c75439600b4d5c3a6a7d folderAsset: yes -timeCreated: 1484980467 -licenseType: Pro DefaultImporter: userData: assetBundleName: diff --git a/IronToad_UnityProject/Assets/Sound.meta~HEAD.meta b/IronToad_UnityProject/Assets/Sound.meta~HEAD.meta new file mode 100644 index 0000000..dc8b858 --- /dev/null +++ b/IronToad_UnityProject/Assets/Sound.meta~HEAD.meta @@ -0,0 +1,14 @@ +fileFormatVersion: 2 +<<<<<<< HEAD +guid: 7562c5d08f15d254c92f6dbd50cd18c9 +timeCreated: 1485039339 +licenseType: Pro +======= +guid: 0fb49e3e0a97c2c4cb531c04d67f2615 +timeCreated: 1485038927 +licenseType: Free +>>>>>>> 927ced4c4317bc1f86f167c9b1594cec30b8e540 +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/_Scenes/GreyBox_Prototype.unity b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity index 7307103..3ccb46e 100644 Binary files a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity and b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity differ diff --git a/IronToad_UnityProject/Assets/water/planeWater.prefab b/IronToad_UnityProject/Assets/water/planeWater.prefab index bcacca6..e0f40e6 100644 Binary files a/IronToad_UnityProject/Assets/water/planeWater.prefab and b/IronToad_UnityProject/Assets/water/planeWater.prefab differ