Melbyj1125
946e2146a3
grapple still doesn't work fixed some other values with prefabs
2021-12-10 22:36:40 -06:00
1fe41e62c3
Merge branch 'NetworkedRespawning'
2021-12-10 20:56:31 -06:00
Melbyj1125
82e7cdd729
Merge branch 'MelbyFinalSprint'
2021-12-10 18:31:08 -06:00
Melbyj1125
610d8b832e
Player Teleport Implemented
2021-12-10 18:29:51 -06:00
dd9a7b625c
Beginning of KillZone work
2021-12-10 18:29:16 -06:00
Evan Nydahl
65efe2c69e
Merge branch 'crunchySprint' into main
2021-12-10 18:08:17 -06:00
Melbyj1125
4c8cbcf82e
grapple still has issues
2021-12-10 18:05:54 -06:00
Evan Nydahl
66b72a797e
-edited animation a little--consistently stops animation when player
...
stops moving
2021-12-10 16:41:48 -06:00
Melbyj1125
45ce1576b5
updated debug and network player prefab
2021-12-10 13:42:32 -06:00
Melbyj1125
9bc571dded
added debug updates to regular scripts
2021-12-10 13:30:43 -06:00
Melbyj1125
614e0aa685
Fixed Kick
2021-12-10 13:27:00 -06:00
Melbyj1125
6b893f8a77
Merge branch 'MelbySprint5-2'
2021-12-10 13:19:11 -06:00
Evan Nydahl
549af282cc
-added rough animation controller
2021-12-10 12:37:32 -06:00
Melbyj1125
e91afb02f4
Bumper has been fixed sort of
...
You need to use 2 colliders one thats a trigger and one thats not and it
will work properly
2021-12-10 12:34:13 -06:00
Melbyj1125
c44afd50a8
Jump has been reworked again but it works now
...
Glide has been fixed again
Wallrun has been fixed again
player can now short hop
2021-12-10 06:52:59 -06:00
Evan Nydahl
64b920c3d5
-created a script for breakable objects
...
-updated block prefabs (updated size/added breakable script)
-added demo scene for blocks/breakable script
2021-12-07 18:35:05 -06:00
Melbyj1125
bd36986887
Reworked Jumping slightly
...
Added Coyote Jump
Fixed Wallrun Again
Fixed Glider
2021-12-06 14:16:41 -06:00
Evan Nydahl
36da5ec848
Resolved many merge conflicts
2021-12-03 13:55:32 -06:00
Evan Nydahl
e0cfb655f8
Merge branch 'controller' into main
2021-12-03 13:42:41 -06:00
Katherine
555ca22573
Merge branch 'KingsAbs'
2021-12-03 13:37:23 -06:00
Evan Nydahl
97b727b3db
-changed cooldown thing (only needed for dodge and boost). May want to
...
deprecate these
-slight edits to mountain path
2021-12-03 13:32:37 -06:00
Melbyj1125
7e450955b2
Merge branch 'Sprint5Melby'
2021-12-03 13:27:33 -06:00
Melbyj1125
17d804080d
Gate created and player tagged correctly
2021-12-03 13:17:12 -06:00
Melbyj1125
55885e2ef1
Wallrun allows players to hop off wall again
2021-12-03 10:51:37 -06:00
Evan Nydahl
20db245902
-Modified mountain (may need more changes later)
...
-Added full controller support for all abillities that will be in the game
(grapple is currently set to x)
2021-12-01 15:38:24 -06:00
Melbyj1125
57385b47b4
Player Items now carry over to the next scene
2021-12-01 14:23:14 -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
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
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
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
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
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
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
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
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
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
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
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
Melbyj1125
11691ec8d9
Modified Movement and Stat scripts
...
Added getters and setters for all stats
stats effect movement script
improved movement to feel smoother overall
added mouse controlled camera
2021-10-04 05:32:56 -05:00
Melbyj1125
8a9e0617f5
Added Player related scripts
...
Added PlayerStats
Added PlayerInventory
Added Player
None of these scripts have been fleshed out yet
2021-10-01 14:42:45 -05:00
Melbyj1125
c99f19c192
Created and Updated MovementScene
...
Implemented Basic Player Movement
Created Player and Platform objects
Created PlayerMovement Script
2021-10-01 12:24:18 -05:00
