12 Commits

Author	SHA1	Message	Date
Melbyj1125	6c09c3e976	Merge branch 'MelbyFinalSprint'	2021-12-13 13:12:46 -06:00
Melbyj1125	3c3708f869	Changed Player Stats and altered kick hit box	2021-12-13 13:06:47 -06:00
Melbyj1125	c3889509c5	Merge branch 'MelbyFinalSprint'	2021-12-10 23:17:37 -06:00
Melbyj1125	946e2146a3	grapple still doesn't work fixed some other values with prefabs	2021-12-10 22:36:40 -06:00
Julia Butenhoff	dd9a7b625c	Beginning of KillZone work	2021-12-10 18:29:16 -06:00
Melbyj1125	e91afb02f4	Bumper has been fixed sort of ... You need to use 2 colliders one thats a trigger and one thats not and it will work properly	2021-12-10 12:34:13 -06:00
Melbyj1125	c44afd50a8	Jump has been reworked again but it works now ... Glide has been fixed again Wallrun has been fixed again player can now short hop	2021-12-10 06:52:59 -06:00
Evan Nydahl	36da5ec848	Resolved many merge conflicts	2021-12-03 13:55:32 -06:00
Evan Nydahl	e0cfb655f8	Merge branch 'controller' into main	2021-12-03 13:42:41 -06:00
Katherine	555ca22573	Merge branch 'KingsAbs'	2021-12-03 13:37:23 -06:00
Melbyj1125	7e450955b2	Merge branch 'Sprint5Melby'	2021-12-03 13:27:33 -06:00
Melbyj1125	17d804080d	Gate created and player tagged correctly	2021-12-03 13:17:12 -06:00