Commit cba4315c authored by kgingras's avatar kgingras
Browse files

smallchanges to triggers

parent 4b6dec6e
fileFormatVersion: 2
guid: 739cac77f5ce9a540bfb250448cc5554
folderAsset: yes
timeCreated: 1454465229
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 03eb77c556cce484ebd76cdaa4deeb97
folderAsset: yes
timeCreated: 1454465229
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 4b3818b4bb4ea2d4a8dbb7c6c290dfad
folderAsset: yes
timeCreated: 1454465229
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 9764338fccaaffc47bb233946af14b7f
folderAsset: yes
timeCreated: 1454465230
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: c623f439f49b2474ebe2c85b312587ac
folderAsset: yes
timeCreated: 1454465230
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: c2d7fe69ad137354fa5180904757ccb7
folderAsset: yes
timeCreated: 1454465230
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
......@@ -83,8 +83,10 @@ public class LocalFiringScript : MonoBehaviour {
void Update () {
if(!dead){
timer += Time.deltaTime;
if(Input.GetAxisRaw("rightTrigger" + playerNum) != 0){
Debug.Log (Input.GetAxis("rightTrigger" + playerNum));
if(Input.GetAxis("rightTrigger" + playerNum) != 0){
if(axisInUse == false){
if(handleScript.hasBall){
throwBall();
......@@ -225,12 +227,15 @@ public class LocalFiringScript : MonoBehaviour {
void SwitchPowerUp(){
// bool dPadHorizAxisInUse = false;
// bool dPadVertAxisInUse = false;
if(Input.GetAxisRaw("DpadHorizontal" + playerNum) != 0){
if(Input.GetAxis("DpadHorizontal" + playerNum) != 0){
if(dPadHorizAxisInUse == false){
if(Input.GetAxisRaw("DpadHorizontal" + playerNum)> 0){
if(Input.GetAxis("DpadHorizontal" + playerNum)> 0){
Debug.Log("right");
selected = power.BlackHole;
}
else if(Input.GetAxisRaw("DpadHorizontal" + playerNum)< 0){
else if(Input.GetAxis("DpadHorizontal" + playerNum)< 0){
Debug.Log("right");
selected = power.Wall;
}
dPadHorizAxisInUse = true;
......@@ -240,9 +245,9 @@ public class LocalFiringScript : MonoBehaviour {
dPadHorizAxisInUse = false;
}
if(Input.GetAxisRaw("DpadVertical" + playerNum) != 0){
if(Input.GetAxis("DpadVertical" + playerNum) != 0){
if(dPadVertAxisInUse == false){
if(Input.GetAxisRaw("DpadVertical" + playerNum)> 0){
if(Input.GetAxis("DpadVertical" + playerNum)> 0){
selected = power.Explosion;
}
dPadVertAxisInUse = true;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment