Merge branch 'stuff' into main

This commit is contained in:
Evan Nydahl
2022-02-04 14:50:42 -06:00
21 changed files with 16543 additions and 1 deletions

View File

@@ -24,7 +24,7 @@ public class dNitro : MonoBehaviour
void Update()
{
//once cooldowns are implemented, put this on one (a long one)
if (Input.GetKeyDown(KeyCode.LeftShift) && isOnCoolDown == false && playerStats.HasNitro)
if ((Input.GetKeyDown(KeyCode.LeftShift) || Input.GetKeyDown(KeyCode.JoystickButton8)) && isOnCoolDown == false && playerStats.HasNitro)
{
isNitroing = true;