Commit Graph

18 Commits

Author SHA1 Message Date
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
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
Melbyj1125
e2a1a9150c small changes to player and items for cleanup 2021-11-17 12:21:15 -06:00
Melbyj1125
51464f4440 Merge branch 'movementCleanup' 2021-11-05 12:35:27 -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
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
Melbyj1125
0514591c13 Merge branch 'rigidBodySetup' 2021-11-01 12:21:31 -05:00
Melbyj1125
45a2c5b473 Rigidbody Standup has been implemented 2021-10-29 12:28:36 -05:00
28be25e572 Spawn in players - Need to fix errors 2021-10-25 14:17:58 -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
Melbyj1125
39bc66244e Added Item Cost and Max Points
Added Glide
Added Item adding verification
2021-10-18 12:19:44 -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
Vincent Wheat
4e01df6a1e Merge branch 'UI-Prototypes'
-Merged in better ground check
-Merged in wallrun prototype
2021-10-11 12:48:55 -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
wheatv3015
61980f55cf Wallrun Updates
-WallRunItem made for equipping/unequipping wall run
-Added Method to PlayerInventory for trying to add special items as items
-Added better method for checking if player isGrounded to PlayerMovement
-Added a setup file for preconfiguring player loadouts
-Added complex wallrun file as a work in progress to allow for robust polished wallrun mechanic
2021-10-11 10:25:52 -05:00
Melbyj1125
c8e298f038 Updated Item scripts and objects
Scripts and objects should actually be committed now
Use Items script to make objects
2021-10-08 13:59:04 -05:00