Merge branch 'master' of https://bitbucket.org/JoshuaReason/project-junker

Conflicts:
	unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_3D_objects.png.meta
	unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Jeffrey.png.meta
	unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Joshua.png.meta
	unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO.png.meta
	unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Lachlan.png.meta
	unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Simon.png.meta
	unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_art_assets.png.meta
	unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_developed.png.meta
	unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_sound.png.meta
	unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_text.png.meta
	unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_trailer.png.meta
	unity_Project/Assets/GUI Assets/UI_credits.png.meta
	unity_Project/Assets/GUI Assets/buttons.meta
	unity_Project/Assets/GUI Assets/buttons/btn_continue.png.meta
	unity_Project/Assets/GUI Assets/buttons/btn_credits.png.meta
	unity_Project/Assets/GUI Assets/buttons/btn_exit.png.meta
	unity_Project/Assets/GUI Assets/buttons/btn_new_game.png.meta
	unity_Project/Assets/GUI Assets/buttons/btn_settings.png.meta

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: 

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: 

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: 

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: {}

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: {}

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: {}

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: {}

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: 

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: {}

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: {}

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: {}

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: {}

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: {}

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: {}

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: {}

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");
+	}
+}

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: 

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: []

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: 

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: []

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: []

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: []

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: []

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: []

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);
+			*/
+		}
+	}
 }
+
+

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: 

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: 

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: 

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: 

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: 

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: 

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: 

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: 

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: 

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: 

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: 

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);