Commit Graph

27 Commits

Author SHA1 Message Date
Melbyj1125
4c8cbcf82e grapple still has issues 2021-12-10 18:05:54 -06:00
Melbyj1125
45ce1576b5 updated debug and network player prefab 2021-12-10 13:42:32 -06:00
Melbyj1125
614e0aa685 Fixed Kick 2021-12-10 13:27:00 -06:00
Melbyj1125
6b893f8a77 Merge branch 'MelbySprint5-2' 2021-12-10 13:19:11 -06:00
Evan Nydahl
549af282cc -added rough animation controller 2021-12-10 12:37:32 -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
64b920c3d5 -created a script for breakable objects
-updated block prefabs (updated size/added breakable script)
-added demo scene for blocks/breakable script
2021-12-07 18:35:05 -06:00
Melbyj1125
bd36986887 Reworked Jumping slightly
Added Coyote Jump
Fixed Wallrun Again
Fixed Glider
2021-12-06 14:16:41 -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
Evan Nydahl
97b727b3db -changed cooldown thing (only needed for dodge and boost). May want to
deprecate these
-slight edits to mountain path
2021-12-03 13:32:37 -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
Melbyj1125
55885e2ef1 Wallrun allows players to hop off wall again 2021-12-03 10:51:37 -06:00
Evan Nydahl
20db245902 -Modified mountain (may need more changes later)
-Added full controller support for all abillities that will be in the game
(grapple is currently set to x)
2021-12-01 15:38:24 -06:00
Melbyj1125
57385b47b4 Player Items now carry over to the next scene 2021-12-01 14:23:14 -06:00
Vincent Wheat
ba68320a8f Merge branch 'TerrainScuplting' 2021-11-29 13:27:31 -06:00
wheatv3015
49dea1fcde updates 2021-11-29 12:05:38 -06:00
Melbyj1125
33cf07a9ae Semi-Fixed Wallrunning 2021-11-29 11:53:49 -06:00
Melbyj1125
665b1c793f Inventory UI implemented
Networking should work
2021-11-22 13:52:06 -06:00
Melbyj1125
3ca497b913 Inventory is a dictionary
Inventory Networking
2021-11-19 13:44:36 -06:00
Melbyj1125
e2a1a9150c small changes to player and items for cleanup 2021-11-17 12:21:15 -06:00
Vincent Wheat
2fe2fa5764 Fixed dPlayerMovement & dWallrun references 2021-11-05 13:35:26 -05:00
Melbyj1125
758f06f775 Updated Debug prefab to be the testing version
Update Inventory Selection to work with debug prefab
2021-11-05 13:07:04 -05:00
Melbyj1125
b0ee01f26b Camera can now be disabled and Debug prefab exists 2021-11-05 12:26:09 -05:00
Melbyj1125
7c72259708 Cleaned up code
Slide Works again
Ragdoll works again
Cam is stable
New Debugging prefab
2021-11-03 14:06:19 -05:00