Commit Graph

207 Commits

Author SHA1 Message Date
Melbyj1125
bbcd239d12 reworked grapple functionally more of a hookshot 2022-04-03 21:40:12 -05:00
Melbyj1125
15acf40031 have an understanding on how i want to do grapple
have gotten the intial force direction calculations completed and will
be working on expanding it further
2022-04-01 00:28:01 -05:00
Melbyj1125
b4b4797fa8 fixed jump glide issue 2022-03-30 13:51:46 -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
890ab6479a Modified Items & Camera 2022-03-27 22:51:22 -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
b1af892672 slime functions added 2022-03-23 15:36:32 -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
Evan Nydahl
3481c5087a Added dCoolDown for debugPlayer
-This change was required due to change in base cooldown script
2022-03-14 21:54:21 -05:00
60e3213d41 Fixed Weather Wheel Bugs
- Weather now applies to respawned players
- Weather now doesn't disable movement on respawned players
- Weather Wheel can't be spammed
2022-03-14 19:21:04 -05:00
Melbyj1125
87c6095623 Merge branch 'MomGrappleOther' 2022-03-13 19:01:48 -05:00
Evan Nydahl
38e01ac1e5 Edited UI functions for functionallity in network
-Added popups to map
2022-03-11 15:10:48 -06:00
Melbyj1125
f8fc2da95d king lobby stubbed & fixed clipping issue 2022-03-09 15:00:01 -06:00
Evan Nydahl
51056bc3d5 Refactored ui code to work with new state base player 2022-03-09 13:52:34 -06:00
Melbyj1125
7ae4b643a1 Fixed a lot of the issues we addressed on Monday 2022-03-09 02:16:56 -06:00
Evan Nydahl
03a96b8c67 Merge branch 'fixAnimator' into main 2022-03-07 14:13:20 -06:00
Evan Nydahl
ee02e1eb59 Added animator to no debug 2022-03-07 14:10:49 -06:00
Melbyj1125
ad6df78c0e Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2022-03-07 12:05:43 -06:00
Melbyj1125
b9ff40688b Changes to debug and state machine 2022-03-07 12:02:37 -06:00
Evan Nydahl
ab552e5467 Merge branch 'animationController' into main 2022-03-07 11:26:13 -06:00
Evan Nydahl
d2f75987e8 Animation Controller
-Added rough animator diagram--needs more work
-Added a animator manager script to handle animation priority
2022-03-07 11:23:17 -06:00
Melbyj1125
71d7a84725 can kick other players but there is a problem
Recovering from ragdoll has problems & host can't kick others for some
reason
2022-03-02 15:08:49 -06:00
Melbyj1125
141c2f3d32 Merge branch 'GrappleBroad' 2022-03-02 14:17:49 -06:00
Melbyj1125
48bdf66fc6 player shouldn't kick themselves 2022-03-02 14:17:14 -06:00
Melbyj1125
9b9e847ba9 modified debug kick 2022-03-02 14:12:35 -06:00
4724c80146 Finished and Fixed the Reset Button 2022-03-02 14:11:15 -06:00
Melbyj1125
d0f27de496 should be able to kick player? 2022-03-02 13:56:24 -06:00
Melbyj1125
a6be528388 Merge branch 'WeatherPause' 2022-03-02 12:58:58 -06:00
Melbyj1125
741dae95cd weather and pause functionality implemented 2022-03-02 12:56:22 -06:00
Melbyj1125
00c3495461 pause disables inputs instead of scripts 2022-03-01 19:53:23 -06:00
Melbyj1125
0ef78f3eb5 wind should work rn 2022-03-01 17:46:50 -06:00
Melbyj1125
a47ee0c406 started modifying wind 2022-02-28 15:19:19 -06:00
ad30ba0140 Merge branch 'ResetButton' 2022-02-28 14:07:46 -06:00
3f51b34aec Added a Button to Reset to Last Checkpoint
- Unable to test to verify if it works until the Respawn Positions are
  in the game scene
2022-02-28 14:03:46 -06:00
Melbyj1125
b80aea96fd updated weather values 2022-02-28 13:44:20 -06:00
Melbyj1125
5b6b4a2cb9 weather wheel and weather adjustments 2022-02-28 13:42:51 -06:00
Melbyj1125
46dff8f663 doors no longer collide with frame & fixed mom hit 2022-02-25 14:56:30 -06:00
Melbyj1125
d9629ec555 lose Mom on wall and kick renetworked 2022-02-23 13:55:30 -06:00
Melbyj1125
b9a573a97d fixed an interaction between slide and fall 2022-02-23 07:57:18 -06:00
Melbyj1125
65a7008d24 slide no longer rotates player
this means that currently the model doesn't rotate but that will be
rectified once we have the animations
2022-02-23 00:00:43 -06:00