Commit Graph

90 Commits

Author SHA1 Message Date
Katherine
7d69730cc8 King UI Started
>King has a UI with buttons
>Clicking the buttons is parsed into the correct function
>Grid and Placement still needs to be implemented
2021-12-03 13:22:48 -06:00
Katherine
27d3d5f4ab King Movement
>King Movement, both Horizontal and and Circular implemented
>King Abilites changed to work with Player's getHit function
2021-12-01 12:43:45 -06:00
Katherine
64aafcb80e Merge branch 'KingAbilities' 2021-11-17 13:28:06 -06:00
Melbyj1125
17a7cdb1ae Player Inventory Networking 2021-11-17 13:20:00 -06:00
Melbyj1125
69a946c3ee Merge branch 'invUpdate' 2021-11-17 12:36:26 -06:00
Evan Nydahl
e233d41b40 Merge branch 'grayboxPlains' into main 2021-11-17 12:30:48 -06:00
Katherine
f20dbd6032 Implemented Hail and reoganised Abilities
>Hail is spawned at a rondom spot in an area
>Hail creates a Shadow directly underneath it
>Hail falls, and shadow scales to the correct size
>Abilites moved into their own folder
>King Implementation Scene Created and King Movement Created
2021-11-17 12:27:35 -06:00
Evan Nydahl
377c36de9e -Made changes to both gray boxes
-Added rough mountain gray box
-Made small edit to cooldown script
2021-11-17 12:26:25 -06:00
Katherine
8e0b76f9ff Cleaned up Bumper, Goo and Slime 2021-11-17 12:24:24 -06:00
Melbyj1125
e2a1a9150c small changes to player and items for cleanup 2021-11-17 12:21:15 -06:00
d23c4ce412 Unlock Cursor after transitioning from the game scene 2021-11-05 14:05:33 -05:00
Vincent Wheat
2fe2fa5764 Fixed dPlayerMovement & dWallrun references 2021-11-05 13:35:26 -05:00
Vincent Wheat
81abd7bfe8 Merge branch 'Particles' 2021-11-05 13:25:57 -05:00
Vincent Wheat
84a8d5134c Script Cleanup
Cleaned up popup controller
2021-11-05 13:19:24 -05:00
Melbyj1125
758f06f775 Updated Debug prefab to be the testing version
Update Inventory Selection to work with debug prefab
2021-11-05 13:07:04 -05:00
6892d2f41f Merge branch 'GameLoading' 2021-11-05 12:46:18 -05:00
Melbyj1125
51464f4440 Merge branch 'movementCleanup' 2021-11-05 12:35:27 -05:00
Melbyj1125
b0ee01f26b Camera can now be disabled and Debug prefab exists 2021-11-05 12:26:09 -05:00
wheatv3015
712d97470d Updated Thunderstorm
-Downwards 'Pow' effect fixed and offset properly
-Added Stub Script for the thunderstorm effect, commented pseudocode, need team feedback
2021-11-05 10:29:45 -05:00
Melbyj1125
7c72259708 Cleaned up code
Slide Works again
Ragdoll works again
Cam is stable
New Debugging prefab
2021-11-03 14:06:19 -05:00
2953687180 Fixed NetworkTransforms and Added Host IP
- Fixed placement of NetworkTransform on Prefab - Needs to be on the
  same level as the character controller and movement
- Added a display of the host IP address in the lobby
2021-11-03 14:03:43 -05:00
Evan Nydahl
c017a00ddb Edited rough graybox plains
-finished top path
-finished middle path
-nearly finsihed bottom
2021-11-02 14:44:30 -05:00
Vincent Wheat
e7a6196c59 Lightning Crackle & Scene Edits
-Adjusted Particle System
-Made Prefab in UI-UX usable
2021-11-01 14:05:36 -05:00
Evan Nydahl
a47550e85b Merge branch 'main' of https://github.com/Lautha1/TheKingsRace into main 2021-11-01 13:32:41 -05:00
Evan Nydahl
704aacf478 Made Cooldown script and half of graybox
-Fully implemented a general cooldwon script
-Added scene and added half of the plains graybox map
2021-11-01 13:27:52 -05:00
Vincent Wheat
04d290e769 Merge branch 'GrapplingHook' 2021-11-01 13:20:19 -05:00
76cd66fa0b Moved NetworkObject on PlayerPrefab 2021-11-01 12:36:02 -05:00
Melbyj1125
0514591c13 Merge branch 'rigidBodySetup' 2021-11-01 12:21:31 -05:00
Melbyj1125
63e2318252 Updated PlayerPrefab
Implemented Slide into player
Added CamFollow
2021-11-01 12:15:17 -05:00
c31f645411 All Players Spawn Successfully
- Moved Spawning to a Manager on Prefab in Game scene
- Created Game Handler (not-implemented)
2021-10-29 13:56:46 -05:00
Melbyj1125
45a2c5b473 Rigidbody Standup has been implemented 2021-10-29 12:28:36 -05:00
5a9f3e9118 Corrected Spawning Runner Error 2021-10-27 14:22:12 -05:00
8431f67505 Fixed Runner Spawning
- Adjusted Spawning to SpawnAsPlayer
- Modified PlayerMovement to not calculate if not the LocalClient
- Added temporary directional light to the game scene to correct the
  editor client being pitch black in scene
2021-10-26 13:19:11 -05:00
Vincent Wheat
debf981e38 Rain and Snow 2021-10-25 14:18:13 -05:00
28be25e572 Spawn in players - Need to fix errors 2021-10-25 14:17:58 -05:00
21b1ece6d6 Merge branch 'SwapToGame' 2021-10-25 13:41:45 -05:00
7a866191bb Continued work on spawning players
- Modified PlayerData to hold IsKing
- Added spawning code
- Need to merge in player prefab with networkobject
2021-10-25 13:38:16 -05:00
Melbyj1125
5c8e13e0f5 Added NetworkTransform to player
Added NetworkObject to player
Added Rigidbody to player
2021-10-25 13:30:42 -05:00
c984664a37 PlayerName Validation and Start of SpawnPoint Logic
- Now check player names for empty strings
- Start handling spawn points for levels
2021-10-25 11:53:54 -05:00
Melbyj1125
702bb555f0 Implemented Item Scripts into objects
Implemented Ragdoll kinda
There are some issues with getting hit while ragdolling that need to be
fixed
Adjusted Dash
Dash still needs some adjustments before being fully implemented
2021-10-25 03:38:56 -05:00
0431cb4c4d Added King/Runner Roles and Team Swapping
- Modified LobbyPlayerState to hold roles
- Set players to runners on lobby join
- Add button to swap teams
- Setup ServerRPC to handle team swap
- Modified logic to make sure all roles filled before game start
2021-10-20 14:08:41 -05:00
wheatv3015
3e245ead44 Grappling Hook Alpha
-Impact based grappling hook with options for other types of implementation
-Wallrun tweaked so players can always jump off wall
2021-10-19 20:22:05 -05:00
cdfc1a0d00 Creation and Swap to Game Scene
- Created the Game-Mountain scene
- Added to Build Settings as Index 4
- Modified ServerGameNetPortal to properly swap to Game-Mountain on
  GameStart() call
2021-10-18 13:12:44 -05:00
Katherine
4d856defa6 Merge branch 'main' into KingAbilities 2021-10-18 13:00:58 -05:00
Melbyj1125
cc99ababff Fixed Jumping issues
Jumping Feels smooth again
2021-10-18 12:58:01 -05:00
99d0142cc8 Merge branch 'LobbySwitching' 2021-10-18 12:53:14 -05:00
Vincent Wheat
e115a7d198 Merge branch 'Wallrunning-Debug'
-Added template for grappling hook
-Fixed ground check in player movement
2021-10-18 12:48:18 -05:00
Evan Nydahl
07914a118c Merge branch 'main' of https://github.com/Lautha1/TheKingsRace into main 2021-10-18 12:38:59 -05:00
Katherine
1b97e497a3 Slime/Goo Added
>Slime created and added to the scene
>Slime can move betwwen two set points
>Slime creates Goo underneath it
>Slime slows the player
>Goo makes the player slippery
2021-10-18 12:36:55 -05:00
Evan Nydahl
460092aacb Added several prototypes
-added kick prototype
-added drop-kick prototype
-added slide prototype
-added dash prototype
-added nitro prototype
2021-10-18 12:35:16 -05:00