Commit Graph

112 Commits

Author SHA1 Message Date
5bccece90b Runners Properly Despawn and Spectate After Map Completion 2021-12-08 13:44:38 -06:00
ecc526d653 Corrected player despawning wrong player
- Still won't properly despawn if not host though
2021-12-06 14:16:34 -06:00
df4a3f0173 Mostly working EndBox Collider
- Currently deletes the wrong player upon enter
- Still needs to swap to proper scene on all players finished
2021-12-03 14:14:29 -06:00
8e945a4d81 Merge branch 'WinLossTrans' 2021-12-01 13:55:39 -06:00
Vincent Wheat
10a9f8d1ca Updates to terrain sculpting
-Updated Terrains for plains, valley
-Added respawn mechanic
-Added PlayerMovement respawn support
2021-12-01 13:51:46 -06:00
ca48a8516b PostGame Transitions To and From Successfully
- End of timer goes to PostGame
- Timer on PostGame returns to Lobby
- Resets PlayerData on return to Lobby
2021-12-01 13:34:53 -06:00
155882e8e6 Added initial objects into PostGame scene 2021-11-29 14:13:38 -06:00
Evan Nydahl
02410a642f Resolved naming conflicts and reorganized 2021-11-29 13:54:29 -06:00
Evan Nydahl
edb74552c4 Merge branch 'grayboxPlains' into main 2021-11-29 13:48:18 -06:00
Evan Nydahl
4912786883 -started controller thing 2021-11-29 13:29:10 -06:00
Vincent Wheat
ba68320a8f Merge branch 'TerrainScuplting' 2021-11-29 13:27:31 -06:00
7185e3b870 Correct Visibility and Naming Issue 2021-11-29 12:17:28 -06:00
58050dbc85 Merge branch 'PlayerEnable' 2021-11-29 12:12:24 -06:00
wheatv3015
49dea1fcde updates 2021-11-29 12:05:38 -06:00
Melbyj1125
fdc44a27f0 Merge branch 'InventoryNetworking' 2021-11-29 12:03:19 -06:00
Melbyj1125
33cf07a9ae Semi-Fixed Wallrunning 2021-11-29 11:53:49 -06:00
Evan Nydahl
1366273e54 Mountain/Controller progress
-more obstacles added to the mountain
-finish line was added at the top of the mountain
-installed new input package
2021-11-29 11:51:09 -06:00
6f948c0c48 Added Overall Race Timer and PlayerHUD template 2021-11-28 11:31:17 -06:00
df5107a1bc Implemented a 321 coundown 2021-11-22 14:22:01 -06:00
Melbyj1125
665b1c793f Inventory UI implemented
Networking should work
2021-11-22 13:52:06 -06:00
b7dd96905b Player Camera Enabled and Movement Restored
- Players Gain Local Camera after cutscene
- Players Movement is disabled until after cutscene
2021-11-19 14:06:59 -06:00
Melbyj1125
3ca497b913 Inventory is a dictionary
Inventory Networking
2021-11-19 13:44:36 -06:00
df46bee0f3
Merge pull request #2 from Lautha1/Thunderstorm-&-Fixes
Thunderstorm Programmed
2021-11-17 13:36:57 -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
wheatv3015
e7cc370cc0 Thunderstorm Programmed 2021-11-11 10:22:07 -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