From fcb83b69369c74ba7a7782f8cd5dd96fae90d751 Mon Sep 17 00:00:00 2001
From: Joshua Reason <s3544917@student.rmit.edu.au>
Date: Tue, 5 May 2015 19:36:49 +1000
Subject: [PATCH] Added Xbox controller compatibility for player 1 and 2

---
 playable/Assets/Lachlan_jump_work.unity     | Bin 147780 -> 147780 bytes
 playable/Assets/Scripts/playerController.cs |   2 +-
 playable/ProjectSettings/InputManager.asset | Bin 5680 -> 5720 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/playable/Assets/Lachlan_jump_work.unity b/playable/Assets/Lachlan_jump_work.unity
index b893a0b44981f6f8b3b33973113ccf86ce22354a..283b1a778ec26ec79c9d6c8be5bc9b18f60d7558 100644
GIT binary patch
delta 69
zcmX@o#CfENvtbM449n>a28<HZ7g#ZhOh01DXfS<^6(h&=KbDLcVAl2=E5@L?)5GpF
Y@@+qJow0*&dc#sine7G77_USD0E^=qzW@LL

delta 66
zcmX@o#CfENvtbM449n>aOBofWf3Rd^VPu@X*OJj3NPV?r%x7fWo@&JyITuLpzs@+7
VZ+e3Pqr~KfM=aY5o-tmD0st4a7#siq

diff --git a/playable/Assets/Scripts/playerController.cs b/playable/Assets/Scripts/playerController.cs
index fe2aacd..3bafde4 100644
--- a/playable/Assets/Scripts/playerController.cs
+++ b/playable/Assets/Scripts/playerController.cs
@@ -46,7 +46,7 @@ public class playerController : MonoBehaviour {
 
 		displayHealth ();
 		death ();
-		applyPlayerDirection (Input.GetAxisRaw (HorizontalBtn));
+		applyPlayerDirection (Input.GetAxis (HorizontalBtn));
 		damage ();
 	}
 
diff --git a/playable/ProjectSettings/InputManager.asset b/playable/ProjectSettings/InputManager.asset
index 3320af6415ef1fedf568ff441e0967b7f450e2a1..d1c057cff9992ecdc62c603eb51a6a7d3b21a9f5 100644
GIT binary patch
delta 267
zcmdm>b3=!Nfq^ZNfk7-{BS#DyX9ODq11|#*Z!Tn;%sIJ%jb$^7KnU|>4gs0THEbfH
zML+B985kOXn1O)_L;wNf<dp)_LLinf5NG9A7MEluXDb*^5)ql4B_hViIN4E9SsYbP
zA*r;aBtK8VaB{qeB2Y!7fIP^2r-=WU=7a3v2I8>PBA~&EIq?BTKpq01m}~^Il?iC8
Y@Z=4G0;o0{q1wzexlvSlvV-Uc02+xpd;kCd

delta 227
zcmcbivq6W0fq^ZNfkDh*BS#DyrvV!S11|#*Z!Tn;%sIJ%jb$^7KnOD*7f{S2zbLaR
zKd&S)XL2E%oJvf;lN|#?gFR4&feA!F0nk8(u+*ZG%w(`a87;U%Mu<Wn1qQ4@(k-(n
z)ey>OV3;f?CdF(3r1eD<#XzDkB}T|f6eb&q$W8ttC^K0_OoSOI1yVlQMMwh7H-_?8
Lh{{aP5d8oE>mVpO