Commit Graph

537 Commits

Author SHA1 Message Date
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
04a8caf8bb Updated Player Prefabs 2022-04-06 13:53:26 -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
510c41e062 Added the PauseMenu Assets 2022-04-06 12:02:39 -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
2e504d5af7 Finished Networking Slowdown Zones 2022-04-01 12:54:25 -05:00
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
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
f0e111a974 Fixed the Kick to now apply properly between players 2022-03-30 13:48:19 -05:00
Vincent Wheat
076ce7be21 Updates to level
Created script to override grass render difference
Thinned out grass in the plains
Imported materials and models
2022-03-30 13:32:16 -05:00
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
885618b704 Fixed an unlinked reference in the PauseMenu Prefab
- Respawn Button became unlinked (fixed)
2022-03-30 11:02:10 -05:00
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
Vincent Wheat
9f1f53f74e Merge branch 'InsertArtAssets' 2022-03-28 13:40:17 -05:00
Vincent Wheat
71fd47ace2 Updates
Swapped/glide platform section
Resized platforms
-Added cannons
2022-03-28 13:34:27 -05:00
Melbyj1125
b50426d4c7 cut punch state 2022-03-28 13:06:13 -05:00
Vincent Wheat
2148c822a9 Updates to level
Tweaked boulder spawn prefab to have a model
Adjusted layout of some obstacles in game-mountain
2022-03-28 10:18:52 -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
516645aa3d Merge branch 'InsertHead' 2022-03-25 12:23:07 -05:00
Melbyj1125
8d417d2d86 replaced king head in lobby: 2022-03-25 12:12:54 -05:00
Katherine
d18f10a406 Merge branch 'KingPolish' 2022-03-25 12:10:32 -05:00
Katherine
e050fb0819 King Grid Fixed
>Removed the extra chunks
>Slow areas might need to have their chunks removed, but that's
non-critical
2022-03-25 12:06:16 -05:00
Evan Nydahl
1b4de427fb Merge branch 'yayAnimations' into main 2022-03-25 11:52:51 -05:00
Evan Nydahl
bf12b60fd5 Added Slide Animation to Animator
-Rough exit, not sure how to fix without more states
2022-03-25 11:50:09 -05:00
Melbyj1125
3e74b74d9b retagged invisible walls 2022-03-25 11:48:54 -05:00