Commit Graph

66 Commits

Author SHA1 Message Date
Vincent Wheat
72ed4e2cd9 Postgame updates
Added models to post game scene
2022-04-27 16:20:39 -05:00
Katherine
029f4a1e52 King Zoom
>File added
>Nothing in it, just a placeholder to push onto main
2022-04-27 12:59:26 -05:00
Katherine
8414113717 Slime Float Fixed
>Slime turns around when it gets to the end of ground
>The slime is fully put together
>It needs bugfixing and testing, but all the pieces are there
2022-04-27 10:15:50 -05:00
Katherine
368a2f4a6a King Hail
>Hail has a marker now
>It dynamically scales
2022-04-22 18:48:47 -05:00
Katherine
f98bc54182 King Art
>Added Mitch's Goo and Bumper to the game
>Added Kong's Blue Slime
>Make the sime's eyes properly move to the correct direction
2022-04-22 13:02:33 -05:00
Katherine
12055b97b2 Merge branch 'KingPolishandPlaytestFeedbackbyKateWithTwoWeeksLefttoSGX' 2022-04-15 14:15:33 -05:00
Katherine
f51042f7c8 Slime Model/1 Object per square
>Slime model has been added
>It does not turn properly...yet
>King can't place things in a chunk where there is a thing
>This also works on the player, meaning the King cant crush the player
2022-04-15 14:05:06 -05:00
Evan Nydahl
db412ae003 Merge branch 'controllerStuff' into main 2022-04-13 11:50:49 -05:00
Evan Nydahl
3379b8b0a8 Created cursor for menu
-created a cursor scrfipt and prefab and I have interegrated them with
the buttons on all pregame buttons (may need some refinement)
2022-04-13 11:45:06 -05:00
Katherine
b16b8a505f King UI fixes
>Q now toggles the UI
>The UI can no longer go offscreen
>The Panel that holds the King's buttons was resized, and its scaling
was changed
2022-04-12 14:12:27 -05:00
Melbyj1125
0a65febafe fixed skyrim issue and other smaller bugs 2022-04-10 23:59:30 -05:00
Katherine
84368a0eb2 Hail Area
>Tested, refined, and removed Debugging for the Hail area's scaling
2022-04-08 18:26:23 -05:00
Melbyj1125
4b06e6d71d Merge branch 'FinallyAwakeAreYou' 2022-04-08 18:16:48 -05:00
Melbyj1125
1757560964 Fixed Bumper issue that occured 2022-04-08 16:04:25 -05:00
b46dc6101f Hail Fully Networked 2022-04-08 15:37:34 -05:00
Katherine
5857c374c5 Skybox
>Added the skyboxes, mutiple
2022-04-08 12:35:04 -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
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
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
2bdfd9c86e Fixed King Movement Caused By Other Players 2022-03-25 02:38:24 -05:00
5cf6bad287 Merge branch 'KingNetwork1' 2022-03-23 14:04:36 -05:00
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
Katherine
febcbbd57f Merge branch 'MountGrid' 2022-03-21 13:23:56 -05:00
Katherine
9ce623bda0 Mountain Grid
>Mountain has a grid
>King can place on the mountain
>Objects are proberly rotated
>KingGrid has begun to be cleaned up
>Grid Reveal no longer cuts off rows
2022-03-21 12:26:27 -05:00
Melbyj1125
7ae4b643a1 Fixed a lot of the issues we addressed on Monday 2022-03-09 02:16:56 -06:00
Katherine
95ba7a6673 King Grid/Quick push
>Pushing King changes to main
>Have made some changes to the King's Grid
>Started on the Mountain Grid
2022-02-28 13:46:24 -06:00
Katherine
949c225ccc Slime Arrows and KingGrid edits
>Added arrows to the slime's movement
>Readjusted the grid to fir with new design
>Added the King model to the scene
2022-02-28 12:19:49 -06:00
Katherine
b1f254131f Merge branch 'KingMess' 2022-02-23 13:28:12 -06:00
Katherine
0655b86352 King Abilities/Radial Menu bugfixes
>Radial Menu has been bugfixed so the players have a harder time
breaking things
>King abilities have had some repeated code moved into a seperate class
2022-02-23 13:18:54 -06:00
Katherine
de49e97f3f Radial Menu
>Radial Menu has been bugfixed and updated
>Clicking a button hides the menu
>Player can cancel placing something
2022-02-18 12:00:47 -06:00
Melbyj1125
e74a1c61c0 adjusted anything that refered to playerMovement 2022-02-16 16:44:30 -06:00
Katherine
640afc25c3 King Menu
>Radial menu has been added in a rough state
>Can be turned on and off
2022-02-16 13:02:16 -06:00
Katherine
ca07457b31 Slime Directionality
>The slime can be placed and sent in four different directions
>It's rough, and needs arrows added and tweaked
>Resided the Goo to be a square not a rectangle
>Gave the Slime and Hail Despawn timers
2022-02-13 14:18:27 -06:00
Katherine
35c5c41f5a Slime Temp and Bug fixes
>Fixed some bakes with the Hail
>Fixed the movement bugs with the king's movement
>Added the Slime in a semi-functional state
2022-02-10 15:54:16 -06:00
Katherine
3c1e36726a King Grid and Hail
>King Grid should be fixed
>Hail has been updated having shadows spawn better
>This is achived through raycasting, and isn't perfect on sloped
surfaces
>King Place is also updated to fix some issues the networking caused
2022-02-08 13:37:53 -06:00
b278e511ff Fixed Blocks Not Placing For Clients 2022-02-04 20:02:55 -06:00
849254a0ef Start working on Box Placing for the King
- Places locally, need to sync to clients
2022-02-04 14:22:52 -06:00
04d92b39ee Started fixing KingUI 2022-02-04 13:37:54 -06:00
Katherine
212a17ad7e Merge branch 'KingGrid' 2022-02-04 13:13:46 -06:00
Katherine
f9a3c15239 King Hail Implementation
>The King can spawn hail by clicking and dragging from two seperate
points
>Fixed some bugs with the King's grid
>Boxes placement cleaned up
2022-02-04 13:10:49 -06:00
Melbyj1125
8d5b2c9193 minor fix to boulder 2022-02-02 18:41:43 -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
Katherine
72e33adcbe King Place updated
>the king can place things on the grid, and they snap to the grid
>Hail and Slime are just placeholder objects at the moment
>Grid snapping might need to be cleaned up
2022-01-31 12:38:30 -06:00
Melbyj1125
e249e5d4d5 idle grapple calculations have been solidified
I can now move into adding how player speed and height effect these
things
2022-01-31 09:39:30 -06:00
Melbyj1125
99994e945b small adjustment to bumper 2022-01-28 13:55:45 -06:00
Melbyj1125
6bab1292f6 fixed bumper and boulder
fixed wallrun on regular player prefab
2022-01-28 13:11:13 -06:00
Katherine
45b666e05b Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2021-12-13 12:30:28 -06:00
Katherine
981e254e8b Final Touches
>King's Placement function teaked slightly
2021-12-13 12:26:06 -06:00
ae287e391a Fixed PlayerMovevment Bug 2021-12-13 12:24:29 -06:00