Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown

Conflicts:
	playable/Assets/Objects/Countdown_1.fbx.meta
	playable/Assets/Objects/Countdown_2.fbx.meta
	playable/Assets/Objects/Countdown_3.fbx.meta
	playable/Assets/Objects/Countdown_4.fbx.meta
	playable/Assets/Objects/Countdown_5.fbx.meta

playable/Assets/Objects/Countdown_1.fbx.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: db60cfcccbdf7e045bd35f0b306026ac
+guid: 8c350c922b7608343a1f4e553af7240e
 ModelImporter:
   serializedVersion: 16
   fileIDToRecycleName:

playable/Assets/Objects/Countdown_2.fbx.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9264b6fdf0f58774b8e600f4075b32aa
+guid: c495b284dbc0b374fa69f355483dbec4
 ModelImporter:
   serializedVersion: 16
   fileIDToRecycleName:

playable/Assets/Objects/Countdown_3.fbx.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 82ad2bb10edd24a45bfc106ba4e19586
+guid: 9338731d744d84d4790473a240e07284
 ModelImporter:
   serializedVersion: 16
   fileIDToRecycleName:

playable/Assets/Objects/Countdown_4.fbx.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 84befc063e48108498c02fbc1d515774
+guid: 83429f0a18df9ff4f8a7e7732ef2204a
 ModelImporter:
   serializedVersion: 16
   fileIDToRecycleName:

playable/Assets/Objects/Countdown_5.fbx.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f8fc2b0c59a93394ea107abb040df918
+guid: 6871591022858454eb16b08fef93dc8d
 ModelImporter:
   serializedVersion: 16
   fileIDToRecycleName:

playable/Assets/Scripts/CDscript.cs

@@ -5,7 +5,11 @@ public class CDscript : MonoBehaviour {
 	
 	public bool pause = true;
 	public float startCount = 5.0f;
-	
+	public GameObject num1;
+	public GameObject num2;
+	public GameObject num3;
+	public GameObject num4;
+	public GameObject num5;
 	// Use this for initialization
 	void Start () {
 		pause = true;
@@ -18,22 +22,48 @@ public class CDscript : MonoBehaviour {
 			Time.timeScale = 0;
 			Debug.Log ("cd");
 		}
-		/*if (startCount >=4.0f && <4.9f){
-
+		if (startCount >=4.0f && startCount <= 4.9f){
+			num5.SetActive(true);
+			num4.SetActive(false);
+			num3.SetActive(false);
+			num2.SetActive(false);
+			num1.SetActive(false);
 		}
-		if (startCount >=3.0f && <3.9f){
-			
+		if (startCount >=3.0f && startCount <= 3.9f){
+			num5.SetActive(false);
+			num4.SetActive(true);
+			num3.SetActive(false);
+			num2.SetActive(false);
+			num1.SetActive(false);
 		}
-		if (startCount >=2.0f && <2.9f){
-			
+		if (startCount >=2.0f && startCount <= 2.9f){
+			num5.SetActive(false);
+			num4.SetActive(false);
+			num3.SetActive(true);
+			num2.SetActive(false);
+			num1.SetActive(false);
 		}
-		if (startCount >=1.0f && <1.9f){
-			
+		if (startCount >=1.0f && startCount <= 1.9f){
+			num5.SetActive(false);
+			num4.SetActive(false);
+			num3.SetActive(false);
+			num2.SetActive(true);
+			num1.SetActive(false);
 		}
-		if (startCount >=0.0f && <0.9f){
-			
-		}*/
+		if (startCount >=0.0f && startCount <= 0.9f){
+			num5.SetActive(false);
+			num4.SetActive(false);
+			num3.SetActive(false);
+			num2.SetActive(false);
+			num1.SetActive(true);
+		}
+
 		if (startCount <=0){
+			num5.SetActive(false);
+			num4.SetActive(false);
+			num3.SetActive(false);
+			num2.SetActive(false);
+			num1.SetActive(false);
 			pause = false;
 			Time.timeScale = 1;
 			startCount = startCount + 5.0f;

playable/Assets/Scripts/playerController.cs

@@ -50,7 +50,7 @@ public class playerController : MonoBehaviour {
 	private bool isSpinning = false; //checks if player is spin attacking
 	private float lastHit;
 	private float lastAttack;
-	private int score;
+	public int score;
 	private bool isDashing =false;
 	private bool canDash = true;
 	private float lastDash = 0.0f;

playable/Assets/flameColor.cs

@@ -0,0 +1,51 @@
+using UnityEngine;
+using System.Collections;
+
+public class flameColor : MonoBehaviour {
+	public playerController player1;
+	public playerController player2;
+	public playerController player3;
+	public playerController player4;
+	private int playerLeader;
+	private int topscore;
+
+	// Use this for initialization
+	void Start () {
+	
+	}
+	
+	// Update is called once per frame
+	void Update () {
+		playerLeader = 1;
+		topscore = player1.score;
+
+		if (player2.score > topscore) {
+			playerLeader = 2;
+			topscore = player2.score;
+		}
+		if (player3.score > topscore) {
+			playerLeader = 3;
+			topscore = player3.score;
+		}
+		if (player4.score > topscore) {
+			playerLeader = 4;
+			topscore = player4.score;
+		}
+
+
+		if (playerLeader == 1){
+		    gameObject.GetComponent<ParticleSystem>().startColor = new Color(0, 255, 255);
+		}
+		if (playerLeader == 2){
+			gameObject.GetComponent<ParticleSystem>().startColor = new Color(255, 255, 0);
+		}
+		if (playerLeader == 3){
+			gameObject.GetComponent<ParticleSystem>().startColor = new Color(255, 0, 255);
+		}
+		if (playerLeader == 4){
+			gameObject.GetComponent<ParticleSystem>().startColor = new Color(0, 255, 0);
+		}
+	}
+
+
+}

playable/Assets/flameColor.cs.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 735b9b50a67deaf459049f02587c52ed
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: