Leahnaya/TheKingsRace
1
0
Fork 0
mirror of https://github.com/Leahnaya/TheKingsRace.git synced 2026-04-26 02:00:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
86 Commits 20 Branches 1 Tag 620 MiB
a47550e85b
Commit Graph

86 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vincent Wheat
c8cd797bac meta data for particles 2021-11-01 13:14:18 -05:00
Julia Butenhoff
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
Julia Butenhoff
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
wheatv3015
a86dcde284 Added Particle Textures 2021-10-29 10:43:53 -05:00
Julia Butenhoff
5a9f3e9118 Corrected Spawning Runner Error 2021-10-27 14:22:12 -05:00
Vincent Wheat
dbfab91464 Update UI-UX_Demos.unity 
Added Fog, and skeleton for thunderstorm, need to have home particles for progression.
 2021-10-27 13:19:28 -05:00
wheatv3015
adabb96266 Rain and Snow clouds, can be reused for fog with tweaking 2021-10-26 21:43:15 -05:00
Julia Butenhoff
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
Julia Butenhoff
28be25e572 Spawn in players - Need to fix errors 2021-10-25 14:17:58 -05:00
Julia Butenhoff
21b1ece6d6 Merge branch 'SwapToGame' 2021-10-25 13:41:45 -05:00
Julia Butenhoff
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
Julia Butenhoff
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
wheatv3015
ea789e1543 Update UI-UX_Demos.unity 2021-10-25 11:50:01 -05:00
wheatv3015
2873975cc4 Rain Prototype (Needs Work) 2021-10-25 11:49:34 -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
Julia Butenhoff
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
Julia Butenhoff
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
Melbyj1125
cc99ababff Fixed Jumping issues 
Jumping Feels smooth again
 2021-10-18 12:58:01 -05:00
Julia Butenhoff
5d3bed5800 Move of test scenes to the demos folder 2021-10-18 12:55:52 -05:00
Julia Butenhoff
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
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
Melbyj1125
f0beb67a8d Merge branch 'pMovement' 2021-10-18 12:33:39 -05:00
Melbyj1125
39bc66244e Added Item Cost and Max Points 
Added Glide
Added Item adding verification
 2021-10-18 12:19:44 -05:00
wheatv3015
2a8a7602e0 Started Implementing Grappling Hook 
-Created script to handle grappling hook with structure of intended code outlined
-Added tags for grappling points
 2021-10-17 14:30:13 -05:00
Julia Butenhoff
db5b10ef47 Rewrote Networking and Base Lobby Created 
- Rewrote networking based on tutorials from MLAPI Demo Project and
  Dapper Dino
- Created Lobby UI based on the turorial from Dapper Dino
- Linked Existing UI into using the new networking
- Modified Lobby Settings to only allow 3 players
- Added Field for players to enter their player name
 2021-10-15 16:01:18 -05:00
Julia Butenhoff
fdf3541135 Imported Text Mesh Pro 2021-10-15 14:17:04 -05:00
Melbyj1125
a42e802ace Created the Inventory Selection Scene 
Added an ItemOption Prefab
Created Player Prefab
The player now will get their items in the inventory selection screen
Only within this scene will items be able to be added and removed
Updated player files to check for characterController being enabled
This will make it easier to implement the dual RigidBody system
 2021-10-14 22:50:44 -05:00
wheatv3015
114b567445 Ground Check Fixes 
-Simplified and re calibrated ground check
-Ground Check now functions well, test with inclines
-Temporarily commented out  player inventory lines that produced errors
-Commented out debug statements
 2021-10-13 21:32:25 -05:00
Julia Butenhoff
dd613b4044 Catching of Client Connection Timeout Error 
- Now connecting as a client will throw an error after a set amount of
  time if it didn't connect to a server
 2021-10-13 14:01:20 -05:00
Julia Butenhoff
53daceac89 Added base for IEnumerator of Connection Timeout 2021-10-13 13:39:03 -05:00
Julia Butenhoff
a8ac804e30 Private Client/Host Spawning Working 
- Created an EMPTY prefab to act as the lobby player character
- Use the status labels to display if client or host (depreciated class
  used - will be removed in upcoming version)
- Private Hosts can start a new lobby
- Private Clients can connect to a lobby at a given IP
 2021-10-12 21:57:45 -05:00
Julia Butenhoff
d2c5a4a3b2 Private Host/Client Connection Implemented 
- Starting as Host now works
- Connecting to an IP as client works
- Added password validation to the connection (hard-coded)
 2021-10-11 13:59:21 -05:00
Katherine
69be815a58 Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2021-10-11 13:45:31 -05:00
Katherine
535ea75e08 Bumper Created 
>Added a new Scene for testing King Abilities
>Added a Bumper Script that can be attached to objects to bump the
player away when hit
 2021-10-11 13:35:30 -05:00
Melbyj1125
c39ffc26c1 Fixed Compile Errors 
Will need to readd isGrounded
 2021-10-11 13:00:27 -05:00
Evan Nydahl
fe4b3b6ccc Merge branch 'main' of https://github.com/Lautha1/TheKingsRace into main 2021-10-11 12:52:45 -05:00
Vincent Wheat
4e01df6a1e Merge branch 'UI-Prototypes' 
-Merged in better ground check
-Merged in wallrun prototype
 2021-10-11 12:48:55 -05:00
Julia Butenhoff
24100f05d3 Merge of Julia's branch 'origin/Preloader-Title-Multiplayer' 2021-10-11 12:29:20 -05:00
Melbyj1125
122bf23b30 Fixed Player Jump and Added Itemmanager 
PlayerJump uses raycast to detect when to get jumps back
ItemManager Holds all scriptable Objects that are within resources
Added a resource folder
 2021-10-11 12:12:57 -05:00