Leahnaya/TheKingsRace
1
0
Fork 0
mirror of https://github.com/Leahnaya/TheKingsRace.git synced 2026-03-29 21:24:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
121 Commits 20 Branches 1 Tag 620 MiB
7d69730cc8
Commit Graph

53 Commits

Author SHA1 Message Date
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
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
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
Julia Butenhoff
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
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
Julia Butenhoff
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
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
Julia Butenhoff
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
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
Melbyj1125
45a2c5b473 Rigidbody Standup has been implemented 2021-10-29 12:28:36 -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
Julia Butenhoff
28be25e572 Spawn in players - Need to fix errors 2021-10-25 14:17:58 -05:00
Melbyj1125
5c8e13e0f5 Added NetworkTransform to player 
Added NetworkObject to player
Added Rigidbody to player
 2021-10-25 13:30:42 -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
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
Melbyj1125
cc99ababff Fixed Jumping issues 
Jumping Feels smooth again
 2021-10-18 12:58:01 -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
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
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
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
Vincent Wheat
576f5aafdf Merge branch 'main' into UI-Prototypes 2021-10-08 14:01:45 -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
Vincent Wheat
349d99b238 Merge branch 'main' into UI-Prototypes 2021-10-08 13:55:29 -05:00
Melbyj1125
3569ef0366 Added Inventory 
Player Inventory takes scriptable objects
Items defines a scriptable object that modifies stats
 2021-10-08 13:46:00 -05:00
wheatv3015
b926b52a9a Added Wallrunning 
-Added Gravity() function for all future effects to gravity
-Wallrunning functions as follows:
    -If player isn't grounded & is moving forwards
    -If player is above minimum ground height
    -Check frontal directions with rays to see if we are hitting a wall
    -If yes - no gravity, if no - normal gravity
 2021-10-07 22:16:43 -05:00
Melbyj1125
c16f07986d Implemented Blink to Player Script 
Moved Evans Blink into the playerMovement script
 2021-10-06 14:00:35 -05:00
Melbyj1125
7ad366dfc6 Updated PlayerMovement.script 
Moved MovementScene.scene
The Player now has slight drifting
Will be updated to have traction reduce this drift
 2021-10-06 03:42:15 -05:00