Commit Graph

72 Commits

Author SHA1 Message Date
Melbyj1125
2bba6bbaa6 Merge branch 'ActuallyMoveGrapple' 2022-05-01 00:04:47 -05:00
Melbyj1125
8e3dfdb9c2 glider rotates and new cursor 2022-05-01 00:02:51 -05:00
Evan Nydahl
9fc03ab00f Put fall animation on network 2022-04-29 17:05:22 -05:00
Evan Nydahl
471ae3ef87 Merge branch 'finalController' into main 2022-04-29 14:59:33 -05:00
Evan Nydahl
56c64dfac4 Animation edits 2022-04-29 14:56:49 -05:00
Melbyj1125
678dacf0e5 modified hook and adding testing 2022-04-29 03:23:24 -05:00
Evan Nydahl
c500bf2649 Merge branch 'controllerKing' into main 2022-04-27 19:57:13 -05:00
Evan Nydahl
b0fb0f9e09 ReAssigned Controller and added colliders for controller in pasue menu 2022-04-27 19:52:01 -05:00
Melbyj1125
911707f761 Merge branch 'RebindingControls' 2022-04-27 19:00:53 -05:00
Melbyj1125
ae7116c1aa in bed with the goblin 2022-04-27 18:59:46 -05:00
Evan Nydahl
2907c3f3eb Merge branch 'animations4' into main 2022-04-27 18:52:05 -05:00
Evan Nydahl
6856a88702 Fine tuned animations 2022-04-27 18:49:42 -05:00
Melbyj1125
48289a5d60 Updated networked Grapple 2022-04-27 01:44:38 -05:00
Melbyj1125
6560a303d5 Grapple Finally Feels Satisfactory 2022-04-27 01:42:29 -05:00
Melbyj1125
f83d22eab8 bug fixes 2022-04-27 00:37:38 -05:00
Melbyj1125
16a02b2332 updated networked grapple 2022-04-25 15:24:35 -05:00
Melbyj1125
e072f3e181 Fixed Grapple Momentum & Added swappable buttons 2022-04-25 14:18:41 -05:00
Melbyj1125
1910501020 Added body parts to networked player 2022-04-25 02:05:18 -05:00
Evan Nydahl
7a94d5d9a1 Added Additional logic to controls menu
-players can no longer leave with same keys and if
they do they will be set to default
-Added some additional changes to animator
2022-04-22 18:00:20 -05:00
a9a444a143 Fixed Kicked Blocks Not Despawning On Network 2022-04-17 01:26:55 -05:00
Melbyj1125
274b441d24 smaller adjustments to grapple 2022-04-11 13:53:31 -05:00
Melbyj1125
427909b463 networked skyrim no more 2022-04-11 13:28:43 -05:00
Melbyj1125
2e594d859a debug skyrim no more 2022-04-11 13:21:41 -05:00
Melbyj1125
a3a54af3c7 Small adjustment to skyrim 2022-04-11 12:07:27 -05:00
Melbyj1125
0a65febafe fixed skyrim issue and other smaller bugs 2022-04-10 23:59:30 -05:00
Melbyj1125
75813c3b4b Added delay to skyrim 2022-04-08 18:48:37 -05:00
Melbyj1125
036732bda0 fixed crouch walk references within state machine 2022-04-08 15:50:55 -05:00
Melbyj1125
fdc77ada48 Implemented Crouch walking 2022-04-08 15:21:24 -05:00
Melbyj1125
562b64b160 removed debug logs 2022-04-08 13:25:59 -05:00
Melbyj1125
b097ca6907 skyrim is finished mostly 2022-04-08 13:21:50 -05:00
Melbyj1125
534cc3c90c added camera reference in networked player 2022-04-06 13:44:50 -05:00
Melbyj1125
26fbdba535 look priority when grappling 2022-04-06 13:42:28 -05:00
Melbyj1125
3f1e2b8a51 Merge branch 'FixGlideJump' 2022-04-04 11:45:28 -05:00
Melbyj1125
bbcd239d12 reworked grapple functionally more of a hookshot 2022-04-03 21:40:12 -05:00
Melbyj1125
b4b4797fa8 fixed jump glide issue 2022-03-30 13:51:46 -05:00
f0e111a974 Fixed the Kick to now apply properly between players 2022-03-30 13:48:19 -05:00
Melbyj1125
432cb0c028 removed debug logs and added some 2022-03-30 12:31:38 -05:00
Melbyj1125
7408467597 kick no longer jitters 2022-03-30 12:12:45 -05:00
Melbyj1125
2980aa8858 kick issue has more or less been solved 2022-03-30 11:40:51 -05:00
Melbyj1125
b50426d4c7 cut punch state 2022-03-28 13:06:13 -05:00
Melbyj1125
7e96690d3d hopefully fixed issue with respawning 2022-03-27 22:24:24 -05:00
Melbyj1125
fc1f1cb68f maybe fixed issue with movestate reference 2022-03-25 14:07:48 -05:00
Melbyj1125
c15ab2cc15 fixed movement bug 2022-03-24 20:39:10 -05:00
Evan Nydahl
40da7ae3a9 Merge branch 'animatorHELL' into main 2022-03-24 19:17:37 -05:00
Evan Nydahl
d5d946e990 Addtional Animator changes
-fixed some transitions that didn't have variables.
-edited base movement exit/enter times to avoid missed transitions
2022-03-24 19:16:16 -05:00
Melbyj1125
ab1bcb18fb fixed king ui issue and player collision 2022-03-23 13:32:42 -05:00
Melbyj1125
861600d557 ignores floor layer 2022-03-21 14:06:53 -05:00
Melbyj1125
ebf15ceb66 adjusted momentum loss 2022-03-20 07:12:46 -05:00
Melbyj1125
4d806060a7 losing momentum when hitting a block should work
player also rotates to face the direction they are moving
2022-03-20 06:53:42 -05:00
Melbyj1125
87c6095623 Merge branch 'MomGrappleOther' 2022-03-13 19:01:48 -05:00