Commit Graph

269 Commits

Author SHA1 Message Date
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
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
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
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
Melbyj1125
167f7840a0 created a debug prefab 2022-02-18 13:56:10 -06:00
Melbyj1125
820b11dd61 Did some bugfixing and commented on everything 2022-02-17 20:55:23 -06:00
Melbyj1125
e74a1c61c0 adjusted anything that refered to playerMovement 2022-02-16 16:44:30 -06:00
Melbyj1125
f0936f4cee State machine player is networked
small cleanups are still needed
2022-02-16 14:21:34 -06:00
Melbyj1125
dfd1687224 updated network behaviour spelling 2022-02-16 13:25:20 -06:00
Melbyj1125
32b0bf7154 added network behavior tags to state managers 2022-02-16 13:21:32 -06:00
Melbyj1125
87594614d5 Merge branch 'sprintActual2Melby' 2022-02-16 13:13:21 -06:00
Melbyj1125
ab3598eee4 added some comments 2022-02-16 12:31:11 -06:00
Melbyj1125
3ff60a830a bug with crouch fixed 2022-02-16 00:18:44 -06:00
Melbyj1125
095fe0a9cb Everything is StateMachined just bugtesting 2022-02-16 00:13:12 -06:00
Melbyj1125
ccbcbab71f Nitro has been State Machined 2022-02-15 23:05:05 -06:00
Melbyj1125
e2438dc364 Finished State Machining Dash 2022-02-15 22:33:26 -06:00
Melbyj1125
f580be178a Setup all the files so they can be state machined 2022-02-15 21:37:49 -06:00
Melbyj1125
833183d034 Finished the Movement and Aerial groups
Working on the Dash, Nitro, and offense groups now
2022-02-15 21:19:12 -06:00
Melbyj1125
ba3ac228f7 cant slide when falling 2022-02-14 13:11:05 -06:00
Melbyj1125
fc525861d4 added slide check functionality for certain functions 2022-02-14 12:55:36 -06:00
Melbyj1125
e1cf0bb094 Have a lot of the basic movement in the stateMachine
Will need to finish up and implement some of the ragdoll interactions
2022-02-14 00:32:37 -06:00
Melbyj1125
6f0b3a0d0b Debug Scripts have been cleaned up.
I won't apply this cleanup to the networked version yet because they
will be updated to a state machine anyways.
2022-02-10 21:37:19 -06:00
Evan Nydahl
6cd3024767 General changes
1. Added tetzlaff ui changes (code may need to be shortened)
2022-02-09 13:51:06 -06:00
Melbyj1125
8fbedf486d made dash use R button 2022-02-07 18:10:32 -06:00
Melbyj1125
fff8f4f17e Merge branch 'sprintV7Melby' 2022-02-07 15:44:29 -06:00
9c15b44b6f Potential Fix for Kick 2022-02-07 12:16:58 -06:00
Melbyj1125
df02d905b3 Updated player prefabs and non debug scripts
I did remember to uncomment if(!isLocalPlayer) thing
2022-02-07 08:24:07 -06:00
Melbyj1125
574b1d9431 player can grab the grapple farther than the max
it will pull player in after they grab on
2022-02-06 21:38:13 -06:00
Melbyj1125
0188b9aa17 grapple is more consistent and has a better momentum fall off on release 2022-02-04 19:54:14 -06:00
Evan Nydahl
b61cf12128 Adjustments
1. Adjusted player indicators and added a line
2. Reapplied game objects to dash and nitro
3. Readjust keybindings for nitro and dash
2022-02-04 15:20:50 -06:00
Evan Nydahl
83efaf4a34 Merge branch 'stuff' into main 2022-02-04 14:50:42 -06:00
Evan Nydahl
ed8b9ffa91 Added Lots of features
1. Added rough fx for erruption
2. Created a sign prefab for level use
3. fixed UI cooldown
2022-02-04 14:38:33 -06:00
04d92b39ee Started fixing KingUI 2022-02-04 13:37:54 -06:00
e846ebc8c8 Modified the Gates and KickController to sync kicks and apply force
- Now the kicking of gates will sync over the network
- Needs review from Justin to verify this won't break other kickable
  items
2022-02-03 23:14:58 -06:00
Melbyj1125
ba1b2706a6 fixed kick sort of, fixed bumper and boulder
Fix for kick works but is kind of strange and I want to adjust it later
in the future
2022-02-02 18:38:16 -06:00
7ebea33830 Still trying to fix the item bug 2022-02-02 13:16:12 -06:00
651bc24abf Fixed an issue when you take no items into a game 2022-02-02 13:10:42 -06:00
cc3bd3d706 Possible Fixes To Net Bugs 2022-02-02 12:46:48 -06:00
Melbyj1125
dd27705eee updated non debug files 2022-02-02 08:56:29 -06:00
Melbyj1125
df1b7f5448 Fixed an issue with wallrun moving the player up
Still needs adjustments to be more flexible and maybe allow the player
to wall run from standing still to allow for vertical wallrun sections.
2022-02-02 08:48:30 -06:00
Melbyj1125
f683a48b84 Rebalanced Items & Bug Fixed
I updated the player prefabs to be more in line with one another and
increased the max speed they can have
2022-02-02 00:08:06 -06:00
Melbyj1125
bf874ddc84 Updated nitro restoring functionality and buffing 2022-02-01 21:07:45 -06:00