diff --git a/unity_Project/Assets/0bjects/Textures/Credits Textures.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures.meta index 8db841f..9c155c5 100644 --- a/unity_Project/Assets/0bjects/Textures/Credits Textures.meta +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 93c6fe7644c3dd249ae67cfc5ef62f4f +guid: 98f33bcc9e41b8949a879320065fa448 folderAsset: yes -timeCreated: 1444816934 +timeCreated: 1444963981 licenseType: Free DefaultImporter: userData: diff --git a/unity_Project/Assets/0bjects/Textures/Credits Textures.meta~HEAD b/unity_Project/Assets/0bjects/Textures/Credits Textures.meta~HEAD new file mode 100644 index 0000000..8db841f --- /dev/null +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures.meta~HEAD @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 93c6fe7644c3dd249ae67cfc5ef62f4f +folderAsset: yes +timeCreated: 1444816934 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/0bjects/Textures/Credits Textures.meta~HEAD.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures.meta~HEAD.meta new file mode 100644 index 0000000..5738ed6 --- /dev/null +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures.meta~HEAD.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 18002ecada6fcf74db33422cdf6b45e3 +timeCreated: 1444977403 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_3D_objects.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_3D_objects.png.meta index b6c8513..7524808 100644 --- a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_3D_objects.png.meta +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_3D_objects.png.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 73807885af79f08409af8cfa504f151d timeCreated: 1444816941 +======= +guid: 5229931a887da744f8b143d3a3b6ebe2 +timeCreated: 1444963987 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Jeffrey.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Jeffrey.png.meta index 6108d95..075e2ba 100644 --- a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Jeffrey.png.meta +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Jeffrey.png.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 5760e5b6217f00f43aa7284f88d673e0 timeCreated: 1444816940 +======= +guid: 508669a15aa596e4fb31b64a9ef0358a +timeCreated: 1444963986 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Joshua.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Joshua.png.meta index f8b93d5..70b0fd7 100644 --- a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Joshua.png.meta +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Joshua.png.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: ffd886b811d09e246bcf9cef7b5300da timeCreated: 1444816946 +======= +guid: 6923f83b6752ee24fab936c70fbdb3f6 +timeCreated: 1444963989 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO.png.meta index 1a651b6..087e86d 100644 --- a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO.png.meta +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO.png.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 5d2c4f9f4d2c70c43a5015441363ec60 timeCreated: 1444816940 +======= +guid: 436e1c01cabf71846b68ffe62d16676f +timeCreated: 1444963986 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO_DoubleSided.png b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO_DoubleSided.png new file mode 100644 index 0000000..0bc5d10 Binary files /dev/null and b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO_DoubleSided.png differ diff --git a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO_DoubleSided.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO_DoubleSided.png.meta new file mode 100644 index 0000000..66ab80f --- /dev/null +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO_DoubleSided.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 773a44313208d2949b7f84a9ba9bcaaf +timeCreated: 1444970994 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + 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 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Lachlan.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Lachlan.png.meta index 8d51942..9301e40 100644 --- a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Lachlan.png.meta +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Lachlan.png.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: c0789dc7df957234fab515bd76187cd5 timeCreated: 1444816942 +======= +guid: f91640ab040168b41ac708a606406911 +timeCreated: 1444963993 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Simon.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Simon.png.meta index e1eb703..e64bdd2 100644 --- a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Simon.png.meta +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Simon.png.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: f689cf6e913fffe468423a391aedcbe4 timeCreated: 1444816946 +======= +guid: 5f52597b29f3415468d182d4708a845c +timeCreated: 1444963988 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_art_assets.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_art_assets.png.meta index 6d4c1cc..f71a77f 100644 --- a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_art_assets.png.meta +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_art_assets.png.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: dd8a665a21c72e046b21eb37d166dcb6 timeCreated: 1444816945 +======= +guid: 17e151b8ca0b54c47b00504bf33440e9 +timeCreated: 1444963984 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_developed.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_developed.png.meta index 0c23473..ec934cb 100644 --- a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_developed.png.meta +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_developed.png.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 225357fdc7247dc4487fa33e7005859b timeCreated: 1444816939 +======= +guid: 854f5a0b19b8d874b851336cdbd51df1 +timeCreated: 1444963991 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_sound.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_sound.png.meta index b55f767..65f55db 100644 --- a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_sound.png.meta +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_sound.png.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 7cf2ef30927a7034fa6853a71c90f81f timeCreated: 1444816942 +======= +guid: 6eb3f04d86801894b8bb4d8ee0801837 +timeCreated: 1444963990 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_text.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_text.png.meta index e62ac32..d96c8bc 100644 --- a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_text.png.meta +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_text.png.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 93e3d399ed60aec4c81447df937219eb timeCreated: 1444816942 +======= +guid: d5b6678e6c800594d987a459a36dff49 +timeCreated: 1444963992 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_trailer.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_trailer.png.meta index 3336e41..302ad07 100644 --- a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_trailer.png.meta +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_trailer.png.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 950f1640e3b96a04e90f56f29c4ab3aa timeCreated: 1444970305 +======= +guid: 4217b02130105354b8bf5cb48e701efc +timeCreated: 1444963985 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/unity_Project/Assets/EndCamera.cs b/unity_Project/Assets/EndCamera.cs new file mode 100644 index 0000000..351886e --- /dev/null +++ b/unity_Project/Assets/EndCamera.cs @@ -0,0 +1,30 @@ +using UnityEngine; +using System.Collections; + +public class EndCamera : MonoBehaviour { + + public MonoBehaviour script; + public float waitTime; + + // Use this for initialization + void Start () { + //script = camera.GetComponent("Smooth Follow") as MonoBehaviour; + } + + // Update is called once per frame + void Update () { + + } + + void OnTriggerEnter(Collider other) { + if (other.transform.tag == "moveable") { + script.enabled = false; + StartCoroutine(wait()); + } + } + + IEnumerator wait() { + yield return new WaitForSeconds(waitTime); + Application.LoadLevel ("TitleScreen"); + } +} diff --git a/unity_Project/Assets/EndCamera.cs.meta b/unity_Project/Assets/EndCamera.cs.meta new file mode 100644 index 0000000..21a3244 --- /dev/null +++ b/unity_Project/Assets/EndCamera.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: df677d53264e848479e62ad841b46475 +timeCreated: 1444968786 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/GUI Assets/UI_credits.png.meta b/unity_Project/Assets/GUI Assets/UI_credits.png.meta index 30c2433..61f2d54 100644 --- a/unity_Project/Assets/GUI Assets/UI_credits.png.meta +++ b/unity_Project/Assets/GUI Assets/UI_credits.png.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: e2273b98b70b41c4789399af71b0160e timeCreated: 1444970306 +======= +guid: 139518c3564a5fa4b91d3b9137dd97a0 +timeCreated: 1444963983 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} @@ -30,6 +35,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 +<<<<<<< HEAD aniso: 16 mipBias: -1 wrapMode: 1 @@ -38,14 +44,29 @@ TextureImporter: rGBM: 0 compressionQuality: 50 spriteMode: 1 +======= + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 +<<<<<<< HEAD alphaIsTransparency: 1 textureType: 8 +======= + alphaIsTransparency: 0 + textureType: -1 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/unity_Project/Assets/GUI Assets/buttons.meta b/unity_Project/Assets/GUI Assets/buttons.meta index a1f1e15..bada2e0 100644 --- a/unity_Project/Assets/GUI Assets/buttons.meta +++ b/unity_Project/Assets/GUI Assets/buttons.meta @@ -1,7 +1,13 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: e05209d25db06c14e89ac6899807685a folderAsset: yes timeCreated: 1444970301 +======= +guid: 246270fcdb8756147a17ddeacc523eaf +folderAsset: yes +timeCreated: 1444963981 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free DefaultImporter: userData: diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_continue.png.meta b/unity_Project/Assets/GUI Assets/buttons/btn_continue.png.meta index 95e65b6..96f102e 100644 --- a/unity_Project/Assets/GUI Assets/buttons/btn_continue.png.meta +++ b/unity_Project/Assets/GUI Assets/buttons/btn_continue.png.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 68ac929074196e04eaa1c95cb34eb5f8 timeCreated: 1444970304 +======= +guid: c6ed5502d45191d409f13d94ae605f98 +timeCreated: 1444963991 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} @@ -30,6 +35,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 +<<<<<<< HEAD aniso: 16 mipBias: -1 wrapMode: 1 @@ -38,14 +44,29 @@ TextureImporter: rGBM: 0 compressionQuality: 50 spriteMode: 1 +======= + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 +<<<<<<< HEAD alphaIsTransparency: 1 textureType: 8 +======= + alphaIsTransparency: 0 + textureType: -1 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_credits.png.meta b/unity_Project/Assets/GUI Assets/buttons/btn_credits.png.meta index bd2546c..15fe78b 100644 --- a/unity_Project/Assets/GUI Assets/buttons/btn_credits.png.meta +++ b/unity_Project/Assets/GUI Assets/buttons/btn_credits.png.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: cd2159db50f67e043b760e4b9e378ceb timeCreated: 1444970305 +======= +guid: ed1d3d6c58fca874aa1332a2dafdbbb4 +timeCreated: 1444963992 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} @@ -30,6 +35,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 +<<<<<<< HEAD aniso: 16 mipBias: -1 wrapMode: 1 @@ -38,14 +44,29 @@ TextureImporter: rGBM: 0 compressionQuality: 50 spriteMode: 1 +======= + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 +<<<<<<< HEAD alphaIsTransparency: 1 textureType: 8 +======= + alphaIsTransparency: 0 + textureType: -1 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_exit.png.meta b/unity_Project/Assets/GUI Assets/buttons/btn_exit.png.meta index e47c777..fde8671 100644 --- a/unity_Project/Assets/GUI Assets/buttons/btn_exit.png.meta +++ b/unity_Project/Assets/GUI Assets/buttons/btn_exit.png.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 0952d26219807984d81378f2b93cd120 timeCreated: 1444970304 +======= +guid: c93aa9271dee1bf4191b97da38a4e5de +timeCreated: 1444963991 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} @@ -30,6 +35,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 +<<<<<<< HEAD aniso: 16 mipBias: -1 wrapMode: 1 @@ -38,14 +44,29 @@ TextureImporter: rGBM: 0 compressionQuality: 50 spriteMode: 1 +======= + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 +<<<<<<< HEAD alphaIsTransparency: 1 textureType: 8 +======= + alphaIsTransparency: 0 + textureType: -1 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_new_game.png.meta b/unity_Project/Assets/GUI Assets/buttons/btn_new_game.png.meta index d9998a1..74a523d 100644 --- a/unity_Project/Assets/GUI Assets/buttons/btn_new_game.png.meta +++ b/unity_Project/Assets/GUI Assets/buttons/btn_new_game.png.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: efeaa4c9cf64299478579c7bb54ef9af timeCreated: 1444970306 +======= +guid: 0d349f824e5ba244ca80b1ef5e856f8b +timeCreated: 1444963982 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} @@ -30,6 +35,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 +<<<<<<< HEAD aniso: 16 mipBias: -1 wrapMode: 1 @@ -38,14 +44,29 @@ TextureImporter: rGBM: 0 compressionQuality: 50 spriteMode: 1 +======= + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 +<<<<<<< HEAD alphaIsTransparency: 1 textureType: 8 +======= + alphaIsTransparency: 0 + textureType: -1 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_settings.png.meta b/unity_Project/Assets/GUI Assets/buttons/btn_settings.png.meta index 9cdcee2..0e99486 100644 --- a/unity_Project/Assets/GUI Assets/buttons/btn_settings.png.meta +++ b/unity_Project/Assets/GUI Assets/buttons/btn_settings.png.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 0d71b952815265d469069b89f501a43c timeCreated: 1444970304 +======= +guid: 197e17f17bcf50244923c00c199cfb80 +timeCreated: 1444963984 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} @@ -30,6 +35,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 +<<<<<<< HEAD aniso: 16 mipBias: -1 wrapMode: 1 @@ -38,14 +44,29 @@ TextureImporter: rGBM: 0 compressionQuality: 50 spriteMode: 1 +======= + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 +<<<<<<< HEAD alphaIsTransparency: 1 textureType: 8 +======= + alphaIsTransparency: 0 + textureType: -1 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/unity_Project/Assets/New Terrain 1.asset b/unity_Project/Assets/New Terrain 1.asset index a37000f..7d71dc4 100644 Binary files a/unity_Project/Assets/New Terrain 1.asset and b/unity_Project/Assets/New Terrain 1.asset differ diff --git a/unity_Project/Assets/Scripts/fence.cs b/unity_Project/Assets/Scripts/fence.cs index 02b11da..000f11c 100644 --- a/unity_Project/Assets/Scripts/fence.cs +++ b/unity_Project/Assets/Scripts/fence.cs @@ -31,4 +31,21 @@ public class fence : MonoBehaviour { */ } } + + void OnTriggerEnter(Collider other) { + if (other.transform.tag == "moveable") { + rigidbody.isKinematic = false; + //rigidbody.velocity = other.relativeVelocity; + /* + ContactPoint contact = collision.contacts[0]; + Vector3 push = transform.position - contact.point; + push.Normalize(); + + Debug.Log("fence: " + push); + rigidbody.AddForceAtPosition(push*1000, contact.point); + */ + } + } } + + diff --git a/unity_Project/Assets/_Scenes/CreditScreen.unity b/unity_Project/Assets/_Scenes/CreditScreen.unity index ffc5caf..f949d49 100644 Binary files a/unity_Project/Assets/_Scenes/CreditScreen.unity and b/unity_Project/Assets/_Scenes/CreditScreen.unity differ diff --git a/unity_Project/Assets/_Scenes/MainLevel.unity b/unity_Project/Assets/_Scenes/MainLevel.unity index dad3af5..b7f6fab 100644 Binary files a/unity_Project/Assets/_Scenes/MainLevel.unity and b/unity_Project/Assets/_Scenes/MainLevel.unity differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures.meta b/unity_Project/Assets/zCreditStuff/Sign Textures.meta new file mode 100644 index 0000000..fcc3c9f --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e59775e1f93aca940a3042d021e47012 +folderAsset: yes +timeCreated: 1444964978 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_3dObjects.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_3dObjects.mat new file mode 100644 index 0000000..dfa3754 Binary files /dev/null and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_3dObjects.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_3dObjects.mat.meta b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_3dObjects.mat.meta new file mode 100644 index 0000000..9f439fe --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_3dObjects.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 88197d1d91b040f4c9396c45103182dd +timeCreated: 1444966650 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_ArtAssets.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_ArtAssets.mat new file mode 100644 index 0000000..df3aa5e Binary files /dev/null and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_ArtAssets.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_ArtAssets.mat.meta b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_ArtAssets.mat.meta new file mode 100644 index 0000000..6fb3807 --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_ArtAssets.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c300f8b12de7e4445a31fbcad532c4f6 +timeCreated: 1444966606 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Credits.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Credits.mat new file mode 100644 index 0000000..05cec7c Binary files /dev/null and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Credits.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Credits.mat.meta b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Credits.mat.meta new file mode 100644 index 0000000..08f3c9d --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Credits.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 21c997d3263b7e347ae888dd06a58a52 +timeCreated: 1444964970 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Jeffrey.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Jeffrey.mat new file mode 100644 index 0000000..8b298cc Binary files /dev/null and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Jeffrey.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Jeffrey.mat.meta b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Jeffrey.mat.meta new file mode 100644 index 0000000..63c4369 --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Jeffrey.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 30d48ae75bd1abd4e8cd85567f01cd32 +timeCreated: 1444966550 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Joshua.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Joshua.mat new file mode 100644 index 0000000..92b9112 Binary files /dev/null and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Joshua.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Joshua.mat.meta b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Joshua.mat.meta new file mode 100644 index 0000000..57d4623 --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Joshua.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b15e911dae052f342a886ba163360b36 +timeCreated: 1444965094 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Lachlan.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Lachlan.mat new file mode 100644 index 0000000..16ed2a8 Binary files /dev/null and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Lachlan.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Lachlan.mat.meta b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Lachlan.mat.meta new file mode 100644 index 0000000..6339f90 --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Lachlan.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 63bcd1a96853ff6479f15b4e87dcd8ba +timeCreated: 1444965816 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Logo.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Logo.mat new file mode 100644 index 0000000..9a14704 Binary files /dev/null and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Logo.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Logo.mat.meta b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Logo.mat.meta new file mode 100644 index 0000000..03b6478 --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Logo.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9a9c99d3824d6b549a6072260e219637 +timeCreated: 1444966745 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_SFX.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_SFX.mat new file mode 100644 index 0000000..814bc43 Binary files /dev/null and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_SFX.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_SFX.mat.meta b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_SFX.mat.meta new file mode 100644 index 0000000..a058f58 --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_SFX.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4c2e138507a1e544ea9051f74e4defce +timeCreated: 1444966677 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Simon.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Simon.mat new file mode 100644 index 0000000..a6d727e Binary files /dev/null and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Simon.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Simon.mat.meta b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Simon.mat.meta new file mode 100644 index 0000000..34832db --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Simon.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8f673623f0d0fb142928e5a70359968a +timeCreated: 1444965592 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Trailer.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Trailer.mat new file mode 100644 index 0000000..4293de8 Binary files /dev/null and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Trailer.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Trailer.mat.meta b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Trailer.mat.meta new file mode 100644 index 0000000..c2b0aa5 --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Trailer.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 44efaad6b0ee2d14794df197e371a72c +timeCreated: 1444966705 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/car_Control.cs b/unity_Project/Assets/zCreditStuff/car_Control.cs index 0ec051f..183d14e 100644 --- a/unity_Project/Assets/zCreditStuff/car_Control.cs +++ b/unity_Project/Assets/zCreditStuff/car_Control.cs @@ -31,8 +31,8 @@ public class car_Control : MonoBehaviour { // Update is called once per frame void FixedUpdate () { carRigid.centerOfMass = centreOfMass; - float inputX = Input.GetAxis ("Player1 Movement Y"); - float inputY = Input.GetAxis("Player1 Movement X"); + float inputX = 1; //Input.GetAxis ("Player1 Movement Y"); + float inputY = 0; //Input.GetAxis("Player1 Movement X"); applyAcceleration (inputX); applyTorque (inputY);