Sunday night Mayhem push

unity_Project/Assets/0bjects/Textures/txtr_metal_beam_rust.png.meta

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: ca72c62a13912394a822aea477119a2e
+timeCreated: 1444555598
+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/Scripts/PlayerSounds.cs

@@ -56,11 +56,16 @@ public class PlayerSounds : MonoBehaviour {
 
 		//playerCollider = PlayerObject.GetComponent<CapsuleCollider>;
 		Debug.Log ("groundCheck");
+
+		FootOnSand = false;
+
 		RaycastHit FootHit = playerController.hit;
-		if (FootHit.transform.tag == "sand")
+		if (FootHit.collider != null) {
+			if (FootHit.transform.tag == "sand")
 				FootOnSand = true;
-		else
-			FootOnSand = false;
+
+		}
+
 	}
 
 

unity_Project/Assets/Scripts/autoMove.cs

@@ -0,0 +1,24 @@
+using UnityEngine;
+using System.Collections;
+
+public class autoMove : MonoBehaviour {
+	public float moveForce;
+
+	private Rigidbody rb;
+
+	// Use this for initialization
+	void Start () {
+		rb = GetComponent<Rigidbody> ();
+	}
+	
+	// Update is called once per frame
+	void Update () {
+	
+	}
+
+	void FixedUpdate(){
+
+		rb.AddForce (transform.forward * moveForce * Time.deltaTime);
+
+	}
+}

unity_Project/Assets/Scripts/autoMove.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 8a8c886cc0b8c4140bcb4fc36853680b
+timeCreated: 1444558418
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Scripts/camAnimController.cs

@@ -0,0 +1,20 @@
+using UnityEngine;
+using System.Collections;
+
+public class camAnimController : MonoBehaviour {
+
+	public GameObject crossHair;
+	public GameObject cameraOutline;
+	public Animator animator;
+	
+	void Update(){
+		if (this.animator.GetCurrentAnimatorStateInfo (0).IsName ("turnOnGui")) {
+			crossHair.SetActive(true);
+			cameraOutline.SetActive(true);
+			gameObject.SetActive (false);
+		}
+		
+		
+		
+	}
+}

unity_Project/Assets/Scripts/camAnimController.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: e67c7ca5c91984a43ac5edae59369107
+timeCreated: 1444553892
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Scripts/checkpoint.cs

@@ -0,0 +1,25 @@
+using UnityEngine;
+using System.Collections;
+
+public class checkpoint : MonoBehaviour {
+
+	public GameObject respawnPoint;
+
+	// Use this for initialization
+	void Start () {
+	
+	}
+	
+	// Update is called once per frame
+	void Update () {
+	
+	}
+
+	void OnTriggerStay(Collider other) {
+		if (other.tag == "Player") {
+			other.transform.position = respawnPoint.transform.position;
+		}
+	}
+
+
+}

unity_Project/Assets/Scripts/checkpoint.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: adb03fa4e5703214e8614f5934a1e2e9
+timeCreated: 1444557115
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Scripts/magnetGun.cs

@@ -40,7 +40,7 @@ public class magnetGun : MonoBehaviour {
 	private float normGrip;
 	private Renderer lastTargetRenderer;
 	private Color lastTargetColour;
-
+	private float DragSave;
 
 	//public GameObject magnetTipObject;
 
@@ -59,7 +59,6 @@ public class magnetGun : MonoBehaviour {
 			playerScreen = -1;
 
 		normGrip = playerController.grip;
-
 	
 	}
 	
@@ -148,7 +147,7 @@ public class magnetGun : MonoBehaviour {
 	private void pickUpItem(Collider item){
 		if (item != null) {
 
-			_playerSoundScript.PlayPickUp();
+
 
 			if (item == otherPlayer.GravityTarget){
 				otherPlayer.dropItem(item);
@@ -157,6 +156,8 @@ public class magnetGun : MonoBehaviour {
 
 			if (item.tag == "moveable"){
 
+				_playerSoundScript.PlayPickUp();
+
 				playerController.animator.SetBool("Holding",true);
 				//playerController.animator.SetTrigger("startHolding");
 
@@ -164,6 +165,7 @@ public class magnetGun : MonoBehaviour {
 				originalGravity = item.attachedRigidbody.useGravity;
 
 				item.attachedRigidbody.useGravity = false;
+				DragSave = item.attachedRigidbody.drag;
 				item.attachedRigidbody.drag = 3.0f;
 				item.attachedRigidbody.constraints = RigidbodyConstraints.FreezeRotation | originalConstrants;
 				//camera.transform.LookAt(item.transform.position);
@@ -209,7 +211,7 @@ public class magnetGun : MonoBehaviour {
 				Vector3 direction = gravityWell.transform.position - item.transform.position + targetOffset;
 				direction = Vector3.ClampMagnitude(direction,1.0f);
 
-				item.attachedRigidbody.AddForce(direction * objectSpeed * Time.deltaTime);
+				item.attachedRigidbody.AddForce(direction * objectSpeed * item.attachedRigidbody.mass * Time.deltaTime);
 			}
 		}
 	}
@@ -219,7 +221,7 @@ public class magnetGun : MonoBehaviour {
 			playerController.animator.SetBool("Holding",false);
 
 			item.attachedRigidbody.useGravity = originalGravity;
-			item.attachedRigidbody.drag = 0.0f;
+			item.attachedRigidbody.drag = DragSave;
 			item.attachedRigidbody.constraints = originalConstrants;
 
 			if(topScreen)

unity_Project/Assets/Scripts/movebetween.cs

@@ -7,6 +7,8 @@ public class movebetween : MonoBehaviour {
 	//public GameObject end;
 
 	public float distance;
+	public float startDistance;
+	public float endDistance;
 	public float changeDis;
 
 	private Vector3 startPos;
@@ -15,6 +17,8 @@ public class movebetween : MonoBehaviour {
 	public bool useCustomRotation = false;
 
 	private Rigidbody rb;
+	public float moveForce;
+
 
 	void Start(){
 		rb = gameObject.GetComponent<Rigidbody> ();
@@ -37,12 +41,25 @@ public class movebetween : MonoBehaviour {
 	}
 
 	void FixedUpdate(){
+
+		startDistance = Vector3.Distance (gameObject.transform.position, startPos);
+		endDistance = Vector3.Distance (gameObject.transform.position, endPos);
+
+		if (Vector3.Distance (gameObject.transform.position, endPos) <= changeDis || Vector3.Distance (gameObject.transform.position, startPos) <= changeDis) {
+			moveForce = 1000;
+		} else {
+			moveForce = 0;
+		}
+
+
+		rb.AddForce (transform.forward * moveForce * Time.deltaTime);
+
 		if (Vector3.Distance (gameObject.transform.position, startPos) <= changeDis && count != 0) {
 			count--;
 			startPos = points[count].transform.position;
 			endPos = points[count+1].transform.position;
 		}
-		if (Vector3.Distance (gameObject.transform.position, endPos) <= changeDis && count + 1 != points.Length) {
+		if ((Vector3.Distance (gameObject.transform.position, endPos) <= changeDis) && count + 1 != points.Length) {
 			count++;
 			startPos = points[count].transform.position;
 			endPos = points[count+1].transform.position;

unity_Project/Assets/Scripts/musicController.cs

@@ -0,0 +1,73 @@
+using UnityEngine;
+using System.Collections;
+
+public class musicController : MonoBehaviour {
+
+	public AudioClip startMusic;
+	public AudioClip endMusic;
+
+	private AudioSource source;
+	private bool triggered = false;
+
+	void Awake(){
+		source = GetComponent<AudioSource> ();
+	}
+
+	// Use this for initialization
+	void Start () {
+		source.clip = startMusic;
+	}
+	
+	// Update is called once per frame
+	void Update () {
+		if (Input.GetKeyDown (KeyCode.Equals)) {
+			source.volume += 0.1f;
+		}
+		if (Input.GetKeyDown (KeyCode.Minus)) {
+			source.volume -= 0.1f;
+		}
+	
+	}
+
+	IEnumerator fadeOut (float end, float steps){
+
+		Debug.Log ("Volume: " + source.volume);
+		float curVol = source.volume;
+		while(source.volume > end + steps)
+		{
+			source.volume -= steps * Time.deltaTime;
+			Debug.Log ("Volume: " + source.volume);
+			yield return new WaitForSeconds(0.01f);
+		}
+		source.volume = end;
+		source.clip = endMusic;
+		source.Play();
+		StartCoroutine (fadeIn (curVol, 0.2f));
+		yield return null;
+	}
+
+	IEnumerator fadeIn (float end, float steps){
+
+		while(source.volume <end - steps)
+		{
+			source.volume += steps * Time.deltaTime;
+			yield return new WaitForSeconds(0.01f);
+		}
+		source.volume = end;
+		yield return null;
+	}
+
+	void OnTriggerEnter(Collider other) {
+		Debug.Log ("Music Change");
+
+		if (triggered)
+			return;
+		if (other.transform.tag != "Player")
+			return;
+
+		StartCoroutine (fadeOut (0.0f, 0.2f));
+		//fadeIn (1.0f, 0.01f);
+		triggered = true;
+	}
+
+}

unity_Project/Assets/Scripts/musicController.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 40373109a0ed76e4d8547c0247c0292b
+timeCreated: 1444547224
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Scripts/respawners.cs

@@ -0,0 +1,36 @@
+using UnityEngine;
+using System.Collections;
+
+public class respawners : MonoBehaviour {
+
+	private bool player1;
+	private bool player2;
+
+	public GameObject respawnPoint;
+	public GameObject deathTrigger;
+
+	private checkpoint deathScript;
+
+	// Use this for initialization
+	void Start () {
+		deathScript = deathTrigger.GetComponent<checkpoint> ();
+	}
+	
+	// Update is called once per frame
+	void Update () {
+	
+	}
+
+	void OnTriggerStay(Collider other) {
+		if (other.name == "Player1")
+			player1 = true;
+		if (other.name == "Player2")
+			player2 = true;
+
+		if (player1 && player2) {
+			deathTrigger.SetActive(true);
+			deathScript.respawnPoint = respawnPoint;
+			gameObject.SetActive(false);
+		}
+	}
+}

unity_Project/Assets/Scripts/respawners.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 7b1cc3db11ea4cc4cbf7b29f504f6bb8
+timeCreated: 1444557502
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Scripts/thirdPersonController.cs

@@ -60,22 +60,35 @@ public class thirdPersonController : MonoBehaviour {
 
 	void FixedUpdate(){
 
-		//RaycastHit hit;
+		RaycastHit hit;
+		RaycastHit hit2;
+
+
+		Vector3 pos1 = transform.position + (-transform.right * 0.7f) + (transform.forward*0.4f); //+ (transform.forward*0.2f);
+		Vector3 pos2 = transform.position + (-transform.right * 0.7f) +(-transform.forward*0.4f);
 
-		Ray ray = new Ray(transform.position, -Vector3.up);
-		
 
-		if (Physics.Raycast (ray, out hit, 1.3f)) {
+		Ray ray = new Ray(pos1, -Vector3.up);
+		Ray ray2 = new Ray (pos2, -Vector3.up);
+
+		Debug.DrawRay (pos1, -Vector3.up * 1.3f);
+		Debug.DrawRay (pos2, -Vector3.up * 1.3f);
+
+		if (Physics.Raycast (ray, out hit, 1.3f) || Physics.Raycast (ray2, out hit2, 1.3f)) {
 			grounded = true;
 			curMaxVelocity = maxVelocity;
-			if (hit.collider.tag == "moveable")
-				matchVelocity(hit.collider);
+			//if (hit.collider.tag == "moveable"||hit2.collider.tag == "moveable")
+			//	matchVelocity(hit.collider);
 
 		} else {
 			grounded = false;
 			curMaxVelocity = maxAirVelocity;
 			animator.SetBool ("Jump", false);
 		}
+		
+		this.hit = hit;
+		if (hit2.collider != null)
+			this.hit = hit2;
 
 		if (slowed)
 			curSpeed = 700.0f;
@@ -168,7 +181,7 @@ public class thirdPersonController : MonoBehaviour {
 
 	private void matchVelocity(Collider target){
 
-		Debug.Log ("matching velocity");
+		//Debug.Log ("matching velocity");
 
 		//Vector3 velocity = rigidbody.velocity;
 		//velocity = target.attachedRigidbody.velocity;

unity_Project/Assets/Sound/Music/Just-Deserts.mp3.mp3.meta → unity_Project/Assets/Sound/Music/1.Just Deserts.mp3.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: b22f861a792776343801f866a2bcfb87
-timeCreated: 1442192117
+guid: 835b8fd82784c0e4384f10717caf982f
+timeCreated: 1444549962
 licenseType: Free
 AudioImporter:
   serializedVersion: 6

unity_Project/Assets/Sound/Music/Just-Deserts3 - PART 2 ONLY.mp3.meta → unity_Project/Assets/Sound/Music/3.Long Loop.mp3.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 437c8662aaf28154b84c436918a7ec0e
-timeCreated: 1443706907
+guid: 50cf555dcefcd774a948ecad42da6f18
+timeCreated: 1444549957
 licenseType: Free
 AudioImporter:
   serializedVersion: 6

unity_Project/Assets/Standard Assets/Effects/ToonShading/Materials/TLO - Metal Beam Rust.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bb3d65d66149c8f449ff83ea95a221db
+timeCreated: 1444555628
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/Effects/ToonShading/Materials/TLO - Resource Bay.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 13e3e37f683bda64494d245266fdd843
+timeCreated: 1444549397
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: