Evan Nydahl 36da5ec848 Resolved many merge conflicts

2021-12-03 13:55:32 -06:00

..

Blink.cs

Gate created and player tagged correctly

2021-12-03 13:17:12 -06:00

Blink.cs.meta

Gate created and player tagged correctly

2021-12-03 13:17:12 -06:00

Dash.cs

Merge branch 'controller' into main

2021-12-03 13:42:41 -06:00

Dash.cs.meta

Gate created and player tagged correctly

2021-12-03 13:17:12 -06:00

GrapplingHook.cs

Merge branch 'controller' into main

2021-12-03 13:42:41 -06:00

GrapplingHook.cs.meta

Gate created and player tagged correctly

2021-12-03 13:17:12 -06:00

Nitro.cs

Resolved many merge conflicts

2021-12-03 13:55:32 -06:00

Nitro.cs.meta

Gate created and player tagged correctly

2021-12-03 13:17:12 -06:00

WallRun.cs

Gate created and player tagged correctly

2021-12-03 13:17:12 -06:00

WallRun.cs.meta

Gate created and player tagged correctly

2021-12-03 13:17:12 -06:00