Merge branch 'controllerKing' into main

This commit is contained in:
Evan Nydahl
2022-04-27 19:57:13 -05:00
13 changed files with 467 additions and 59 deletions

View File

@@ -588,7 +588,7 @@ public class AerialStateManager : NetworkBehaviour
////Grapple Functions
public bool CheckGrapple(){
if(!pStats.IsPaused){
if ((Input.GetKeyDown(GameManager.GM.bindableActions["grappleKey"]) || Input.GetKeyDown(KeyCode.JoystickButton2)) && pStats.HasGrapple) //If grapple button is hit
if ((Input.GetKeyDown(GameManager.GM.bindableActions["grappleKey"]) || Input.GetKeyDown(KeyCode.JoystickButton10)) && pStats.HasGrapple) //If grapple button is hit
{
//Debug.Log("Checking Hooks");
hookPointIndex = FindHookPoint(); //Find the nearest hook point within max distance