From 0003065fc9fedb0e901ddc85c256454a27425154 Mon Sep 17 00:00:00 2001
From: Joshua Reason <s3544917@student.rmit.edu.au>
Date: Sat, 10 Oct 2015 17:59:21 +1100
Subject: [PATCH] Fixed merge + turns off sparkles when rod inactive.

---
 unity_Project/Assets/Scripts/MagnetLaser.cs           | 11 +++++++++--
 unity_Project/Assets/Scripts/thirdPersonController.cs |  2 +-
 unity_Project/Assets/Textures.meta                    |  9 ---------
 3 files changed, 10 insertions(+), 12 deletions(-)
 delete mode 100644 unity_Project/Assets/Textures.meta

diff --git a/unity_Project/Assets/Scripts/MagnetLaser.cs b/unity_Project/Assets/Scripts/MagnetLaser.cs
index 56fa56f..fd4e0cc 100644
--- a/unity_Project/Assets/Scripts/MagnetLaser.cs
+++ b/unity_Project/Assets/Scripts/MagnetLaser.cs
@@ -5,7 +5,8 @@ public class MagnetLaser : MonoBehaviour {
 
 	private LineRenderer lr;
 	public GameObject player;
-	public GameObject rodstart;
+	public GameObject rodStart;
+	public GameObject magnetSparkles;
 	public int segments;
 	public float randomSize;
 	private magnetGun gun;
@@ -25,9 +26,13 @@ public class MagnetLaser : MonoBehaviour {
 	void Update () {
 
 		if (gun.GravityTarget != null) {
+			if (magnetSparkles != null)
+				magnetSparkles.SetActive(true);
+
+
 			lr.enabled = true;
 			lr.SetVertexCount(segments+1);
-			lr.SetPosition(0, rodstart.transform.position);
+			lr.SetPosition(0, rodStart.transform.position);
 			lr.SetPosition (segments,gun.GravityTarget.transform.position);
 
 			Vector3 normalizedV  =(gun.GravityTarget.transform.position - player.transform.position);
@@ -48,6 +53,8 @@ public class MagnetLaser : MonoBehaviour {
 
 		} else {
 			lr.enabled = false;
+			if (magnetSparkles != null)
+				magnetSparkles.SetActive(false);
 		}
 
 
diff --git a/unity_Project/Assets/Scripts/thirdPersonController.cs b/unity_Project/Assets/Scripts/thirdPersonController.cs
index bb2de41..fb01f1a 100644
--- a/unity_Project/Assets/Scripts/thirdPersonController.cs
+++ b/unity_Project/Assets/Scripts/thirdPersonController.cs
@@ -36,7 +36,7 @@ public class thirdPersonController : MonoBehaviour {
 	private float movementX;
 	private float movementY;
 
-	private bool grounded;
+	public bool grounded;
 
 	private Rigidbody rigidbody;
 
diff --git a/unity_Project/Assets/Textures.meta b/unity_Project/Assets/Textures.meta
deleted file mode 100644
index 8915b1d..0000000
--- a/unity_Project/Assets/Textures.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 97def69cc8aa8f0458d67929f23873dd
-folderAsset: yes
-timeCreated: 1444371283
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: