Reverted back to last working copy

unity_Project/Assets/Character/9-10_Character_Animations_01_Clean.fbx.meta

@@ -662,13 +662,13 @@ ModelImporter:
       name: GunForward
       takeName: Take 001
       firstFrame: 90
-      lastFrame: 91
+      lastFrame: 90
       wrapMode: 0
       orientationOffsetY: 0
       level: 0
       cycleOffset: 0
       loop: 0
-      loopTime: 1
+      loopTime: 0
       loopBlend: 0
       loopBlendOrientation: 0
       loopBlendPositionY: 0
@@ -1089,7 +1089,7 @@ ModelImporter:
     - serializedVersion: 16
       name: Jump_Hang
       takeName: Take 001
-      firstFrame: 114
+      firstFrame: 115
       lastFrame: 115
       wrapMode: 0
       orientationOffsetY: 0
@@ -1524,7 +1524,7 @@ ModelImporter:
       level: 0
       cycleOffset: 0
       loop: 0
-      loopTime: 1
+      loopTime: 0
       loopBlend: 0
       loopBlendOrientation: 0
       loopBlendPositionY: 0
@@ -2801,7 +2801,7 @@ ModelImporter:
     isReadable: 1
   meshes:
     lODScreenPercentages: []
-    globalScale: 15
+    globalScale: 1
     meshCompression: 0
     addColliders: 0
     importBlendShapes: 1
@@ -2834,8 +2834,10 @@ ModelImporter:
     legStretch: .0500000007
     feetSpacing: 0
     rootMotionBoneName: 
+    hasTranslationDoF: 0
   lastHumanDescriptionAvatarSource: {instanceID: 0}
   animationType: 2
+  humanoidOversampling: 1
   additionalBone: 0
   userData: 
   assetBundleName: 

unity_Project/Assets/Materials/lambert2.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 04987efa627aa124284d60a9334ab308
-timeCreated: 1444280770
-licenseType: Free
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

unity_Project/Assets/Scripts/lazerRenderer.cs

@@ -1,15 +0,0 @@
-using UnityEngine;
-using System.Collections;
-
-public class lazerRenderer : MonoBehaviour {
-
-	// Use this for initialization
-	void Start () {
-	
-	}
-	
-	// Update is called once per frame
-	void Update () {
-	
-	}
-}

unity_Project/Assets/Scripts/lazerRenderer.cs.meta

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

unity_Project/Assets/Scripts/magnetGun.cs

@@ -156,10 +156,6 @@ public class magnetGun : MonoBehaviour {
 
 
 			if (item.tag == "moveable"){
-
-				playerController.animator.SetTrigger("startHolding");
-				playerController.animator.SetBool("Holding",true);
-
 				originalConstrants = item.attachedRigidbody.constraints;
 				originalGravity = item.attachedRigidbody.useGravity;
 
@@ -216,11 +212,6 @@ public class magnetGun : MonoBehaviour {
 
 	private void dropItem(Collider item){
 		if (item != null) {
-
-			playerController.animator.SetTrigger("stopHolding");
-			playerController.animator.SetBool("Holding",false);
-
-
 			item.attachedRigidbody.useGravity = originalGravity;
 			item.attachedRigidbody.drag = 0.0f;
 			item.attachedRigidbody.constraints = originalConstrants;

unity_Project/Assets/Scripts/thirdPersonController.cs

@@ -100,16 +100,12 @@ public class thirdPersonController : MonoBehaviour {
 
 			applyGrip();
 
-			//if (!slowed)
-				applyJump (jumpHeight);
+			applyJump (jumpHeight);
 		}
 
 		animator.SetBool ("Grounded", grounded);
 		animator.SetFloat("Run speed",new Vector3 (rigidbody.velocity.x, 0.0f,rigidbody.velocity.z ).magnitude * Mathf.Sign(movementY));
 
-		Vector3 side = transform.InverseTransformDirection (rigidbody.velocity).normalized;
-		animator.SetFloat ("Side",side.x);
-
 		rigidbody.AddForce (new Vector3 (0.0f, -9.81f,0.0f));
 
 		curCollider = null;
@@ -147,7 +143,6 @@ public class thirdPersonController : MonoBehaviour {
 			if (movementY > 0 && this.name == "Player1")
 				movementY = 0;
 		}
-
 		
 		Vector3 velocity = new Vector3 (movementX, 0.0f, movementY) * curSpeed * Time.deltaTime;
 		//Debug.Log (velocity);

unity_Project/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 5.1.3f1
+m_EditorVersion: 5.2.0f3
 m_StandardAssetsVersion: 0