From 5c35060303f19c357566fdf8b617315dd58ed7f1 Mon Sep 17 00:00:00 2001
From: Joshua Reason <s3544917@student.rmit.edu.au>
Date: Wed, 20 May 2015 11:18:53 +1000
Subject: [PATCH] Fixed confetti

---
 playable/Assets/Lachlan_jump_work.unity       | Bin 291012 -> 291012 bytes
 playable/Assets/Prefabs/Confetti.prefab       | Bin 10288 -> 10288 bytes
 playable/Assets/Scripts/confettiController.cs |  12 ++++++------
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/playable/Assets/Lachlan_jump_work.unity b/playable/Assets/Lachlan_jump_work.unity
index 8499b2e422c0e53d086b262e0a1aad33f18208a1..95499d9f28d04b6d8b3e4c29511d940e038ccaad 100644
GIT binary patch
delta 1303
zcmZA1T}V@57zgm@J<}R8V}jv?tcgmiD-A)ZwQ~-1v9fH|w5^6tlBk&C3}SbuFUrV^
z%H^?(VwYZYu`X%`MqY@0=diS)1x*YJ1_=eNtMxzIS-r=>vvc0x9-im@I6E`xikWo9
zO&e>zSpBG){SGUUftRk~Rz?{{^xag5rIRUFWH+M@A_C`Q8J2|gVO*letJPIk>mEj7
zF7Gug4vWE_>+uHWaWb-4h-P70yoCkbOd&4@#e!SB7ID(e=sK*}xCZ9lZ*0637Kde!
z_a~Rj4dJ>C7CXQwgnOqRc9^w|Q8UK7^r+S9!CV;kkfMDN?Npn@VW36d0c|HP^^c0<
z?Tk9{dvP+CVQVmc(qj!N(S6vs3o2|H#^;U0Y#v5I)T`3tt^$kz>jAZTEVV3&F&MwC
z%P?DqvEV1zAS|dC(~5qEC1HHMxHBzgVf;cK!aPS9Df|q7JZX_8fPCT_jE))`|D4||
z`CxqBFIaqCp6~I9WcD)hV`9Y}^utcW0x%rAl0SRby=T%3AYV{~**lGm8v}Dv1jZL^
zf~D5wwXK-t#x6!@xW)%zF&Mw#Lo13|&H{r-ES^a_5`D*vTR6ISL%smx8%JSZVERh(
z3%T8WOO|}bqZ@@y!uZBfnAMNIc>ex1z5^Tt@@MzHG%An7`ni>SfSHdQ3ogKdutBcg
zA}k5x>rIs|$XQr%A*Zx+c?$HMFs`J$Yf+wr4GaI@3*obAS?Xrg%S~noHUW#mw7;Gf
z=d`>Yeu9aC^K3p|qP=X?ecOeRa_tV8wBc%d6;pfPvCZoJIksucAy^Apl@6h<Mk0zK
z3ZIR*1Z{QsLB5dJAq1>^p|X#4PIcNLI0_{)4xv7Om#Ew!xTn+yH70Z7N}1^!O9Z|O
Q_J(UAizyMZl=%Ao0wwVAv;Y7A

delta 1303
zcmZA0Ur19?90%~<xzpOi3<bjpSre6RJ!u72*zUa%W~8PyZNjRF5*9PmAbPu2P>X!9
zTwZ%9eB9%Ds3{okK}z~(SPq#5n;0nw2?f!Ueb2l%&fVZQ&-v`<@0{Pc=gwq`W->*?
zZg%ii>5EeKr(aKXEqcR;8MP7-Gh+#shIM0}XU5x=6>q~4M*TwGJ6HlX4trz9dsy%&
zBbSTlHH^mxSYJIOAI4U_T|SpGThDa5540981Nu+e7v2p^z}AuXcXM-d0Dt$uVhxN!
z7}uHMfq70bI)wQFGs<~Am>2U)X6!d=lrfmgLA2)3`4`dc-Vr6*$fylT)@JU&sL8(T
z(W*to4--$pfPKoz8-vNsjDo0FV#X6#7*>gSxfv<FHl@UXV!<Vte8#@;SJ)sdXcpr|
zzroTlv0$t&qc~gajXZ}1VdC-soUBzRV7l1x2C%Tzp7?A2nA!sq^M1n;IeGq<L#q2M
zqYiA$I>8RuO;`YCJ$LWZX>}21*3+}e3b6W|ec|fBoEnCS1#4idIeDj-oto-nbVXRW
z5f+1q9XG+8ZT1svUe=vj4^TY9k>mqy7$z<pfo;IVP99x+sI|1)AKeIS7A7tnfqBl`
z7k&&IgjM4H{l5&K^CMam*ei7M1?KkK3ogL=V13B5E>{wkhKY?#<u7Q?4tpc7U_CIa
zk<0wK6tpL`SzuV&dK>r~(SJ3gwFDS-3Y!^#O~4{B{_63#&hswVH#pr@bUX@M$3@_^
z)*SI`H`shEkN;qt*eeYc@Dcu-w%u(mVMgaiw$pev$99a$QsGusu`E@TX++~HPvf8M
zh@iV7JI)sJ$x@(DEJQS@7ztUDw@R$bQe}1&FWx6LOvM|2NS-PqFv*<p?(fnnyBBgf
K;vrX_zxyA+V(qj5

diff --git a/playable/Assets/Prefabs/Confetti.prefab b/playable/Assets/Prefabs/Confetti.prefab
index 31f49a45f1cde05d53dd757bd96cba1de77c146c..d90e3596221934e033100c06639f381be9bddab2 100644
GIT binary patch
delta 21
ccmdlGupwYWjyen1b!D5$1?v5b4wEzt09z&pYybcN

delta 21
ccmdlGupwYWjyekiLxcU~0`-1I$4MFn093IC>;M1&

diff --git a/playable/Assets/Scripts/confettiController.cs b/playable/Assets/Scripts/confettiController.cs
index 960ef46..8da7535 100644
--- a/playable/Assets/Scripts/confettiController.cs
+++ b/playable/Assets/Scripts/confettiController.cs
@@ -57,12 +57,12 @@ public class confettiController : MonoBehaviour {
 		
 	}
 
-	void OnCollisionEnter2D(Collision2D col){
-		if (col.collider.tag == "ground" && Time.time - startTime > 2) {
-			gameObject.GetComponent<BoxCollider2D> ().enabled = false;
-			gameObject.GetComponent<Rigidbody2D> ().isKinematic = true;
-		}
-	}
+	//void OnCollisionEnter2D(Collision2D col){
+	//	if (col.collider.tag == "ground" && Time.time - startTime > 2) {
+	//		gameObject.GetComponent<BoxCollider2D> ().enabled = false;
+	//		gameObject.GetComponent<Rigidbody2D> ().isKinematic = true;
+	//	}
+	//}
 
 
 }