Leahnaya/TheKingsRace
1
0
Fork 0
mirror of https://github.com/Leahnaya/TheKingsRace.git synced 2026-07-30 06:37:58 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
539 Commits 20 Branches 1 Tag 620 MiB
036732bda0
Commit Graph

392 Commits

Author SHA1 Message Date
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
9ad203f9ad Merge branch 'GrappleSlime' 2022-04-06 13:50:15 -05:00
Evan Nydahl
764415630e Merge branch 'countDownFix' into main 2022-04-06 13:47:47 -05:00
Melbyj1125
534cc3c90c added camera reference in networked player 2022-04-06 13:44:50 -05:00
Evan Nydahl
a291edd62e General Changes 
-Edited animatpr so it doesn't have deprecated states
-Edited 321 countdown script so players can't pause during the countdown
-Added stub objects for the part switching mechanic (will need to be resized
when we get assets for them.
 2022-04-06 13:43:37 -05:00
Melbyj1125
26fbdba535 look priority when grappling 2022-04-06 13:42:28 -05:00
Melbyj1125
e6fac2a555 Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2022-04-04 12:15:28 -05:00
Vincent Wheat
4a59bf6f3f Merge branch 'ArcherSanPweaseNoBweak' 2022-04-04 12:12:16 -05:00
Vincent Wheat
bf2acec8d0 AngryAboutIt 
Kinda mad about it >:(
 2022-04-04 12:08:45 -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
Vladdie
771ebc1b49 Possible archer fixes. Null ref fix? 2022-04-01 14:23:39 -05:00
Julia Butenhoff
600fe5727a Merge branch 'SlowdownNetwork' 2022-04-01 12:43:27 -05:00
Vincent Wheat
37cf6250df Merge branch 'LevelUpdates' 2022-04-01 11:55:11 -05:00
Vincent Wheat
e08cb61e30 Adjusted level 
-Added force render distance script
-Added slow down zone as a network prefab, replaced old zones in scene, added prefab to preloader
-Adjusted tutorial wall height
 2022-04-01 11:52:47 -05:00
Evan Nydahl
1303aa775a Merge branch 'stuff' into main 2022-04-01 11:50:08 -05:00
Evan Nydahl
08453b455a Added a button to show controls in lobby scene. 
-Will need to get a UI asset eventually.
-actual control text needs to be  edited to actual controls
 2022-04-01 11:37:48 -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
Julia Butenhoff
296bafd41b Partial Network Slowdown 
- Need NetworkObject on Slowdown Zones
 2022-03-30 14:17:58 -05:00
Melbyj1125
b4b4797fa8 fixed jump glide issue 2022-03-30 13:51:46 -05:00
Julia Butenhoff
f0e111a974 Fixed the Kick to now apply properly between players 2022-03-30 13:48:19 -05:00
Julia Butenhoff
99fe74a8d9 Fixed King Null Ref Errors 
- Fixed KingPlace and KingMove Null Refs
- Changed the Networked Slime to isTrigger instead of solid
 2022-03-30 13:27:01 -05:00
Melbyj1125
f63ae476a0 Merge branch 'KickSolution' 2022-03-30 12:44:25 -05:00
Melbyj1125
432cb0c028 removed debug logs and added some 2022-03-30 12:31:38 -05:00
Katherine
1a8d190a83 Merge branch 'UIKingDabs' 2022-03-30 12:29:24 -05:00
Katherine
68eb1f467e King UI 
>King UI clipping issue fixed
>King Buttons made larger
>King Grid adjusted to make it so it dynamically changes properly
>Added a buffer to the grid to prevent the MountainGrid from not
appearing
 2022-03-30 12:19:32 -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
Julia Butenhoff
c6576b6617 Disable the "Restart from Checkpoint" Button for the King 
- They will never need to respawn so we can just make the button
  uninteractable for them
 2022-03-30 09:55:08 -05:00
Vincent Wheat
533a03e205 Enabled Archers 
Enabled Archers
Adjusted Fire Rate of archer
Disabled mesh renderer on killzones
 2022-03-28 14:16:49 -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
Julia Butenhoff
a91a5b6d82 Added Slime/Goo Calls to Debuffs (UNTESTED) 
- Unable to test since the Slime button wasn't working
 2022-03-25 03:24:24 -05:00
Julia Butenhoff
cfc1a12196 Fixed PauseMenu Cursor Locking 
- Doesn't lock the king's cursor on unpause
- Does relock the runner's cursor on unpause
 2022-03-25 03:03:51 -05:00
Julia Butenhoff
2bdfd9c86e Fixed King Movement Caused By Other Players 2022-03-25 02:38:24 -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
9c27eeb6d3 Merge branch 'CustomControl' 2022-03-23 15:37:30 -05:00
Melbyj1125
b1af892672 slime functions added 2022-03-23 15:36:32 -05:00
Julia Butenhoff
5cf6bad287 Merge branch 'KingNetwork1' 2022-03-23 14:04:36 -05:00
Julia Butenhoff
e0f5db1f8a Made the Slime Spawn on Network 
- Debuffs don't apply properly yet
 2022-03-23 14:02:40 -05:00
Melbyj1125
ab1bcb18fb fixed king ui issue and player collision 2022-03-23 13:32:42 -05:00
Melbyj1125
0a9b171498 Merge branch 'MomentumLoss' 2022-03-21 14:09:21 -05:00
Melbyj1125
861600d557 ignores floor layer 2022-03-21 14:06:53 -05:00