Commit Graph

285 Commits

Author SHA1 Message Date
Evan Nydahl
cd2dee89e8 Merge branch 'EvanBranch' into main 2022-01-31 12:12:00 -06:00
Evan Nydahl
72e39a92be Started Fixing UI 2022-01-31 12:09:46 -06:00
Vincent Wheat
66e0e66932 Merge branch 'MountainLayout' 2022-01-31 12:03:39 -06:00
Vincent Wheat
0a93f232b0 Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2022-01-31 12:00:49 -06:00
Vincent Wheat
0ed51102ec Pre main merge
Pre merge commit for new branch
2022-01-31 11:59:58 -06:00
04c0d65041 Merge branch 'AddingRespawnDelay' 2022-01-31 11:52:58 -06:00
c6f1ecbbec First Attempt at making the arrow apply contact to objects 2022-01-31 11:00:30 -06:00
Vincent Wheat
8ff9113c12 Update Game-Mountain.unity
First third of path around/up mountain is put in
2022-01-31 09:47:36 -06:00
8dcb4e11af Adjusted Respawn Delay and Added Respawning Text
- Respawning now takes 3 seconds
- Host also now must wait the same 3 seconds like the clients did
- Added a screen with text that says respawning so players are informed
  of what is happening
2022-01-29 00:12:28 -06:00
047f18e472 Merge branch 'ArcherNet' 2022-01-28 21:38:53 -06:00
4d43e3c832 Shooting work started. Needs Hit Detection Revisions
Waiting on Karl to fix major red flags before I continue this
2022-01-28 21:36:05 -06:00
Melbyj1125
3b451b97e9 Fixed editor user settings
Updated prefab hardcapMaxVel values
2022-01-28 14:33:56 -06:00
Vincent Wheat
7211ac78d6 Continued Vertical Section
Vertical section at foot of mountain reaches correct height
Added kill box at the end of the map
2022-01-28 14:20:22 -06:00
Evan Nydahl
1d210a65ba Fixed hard cap vel 2022-01-28 14:06:47 -06:00
d3811aa2f2 Archer rotates to target the player. Doesn't shoot yet 2022-01-28 14:03:04 -06:00
Evan Nydahl
8b121b87e9 Merge branch 'main' of https://github.com/Lautha1/TheKingsRace into main 2022-01-28 14:02:42 -06:00
Melbyj1125
99994e945b small adjustment to bumper 2022-01-28 13:55:45 -06:00
Melbyj1125
9c3462521e small adjustment to nitro and player prefabs 2022-01-28 13:45:38 -06:00
Evan Nydahl
539c88357b -Added player indicator and the King and KingUI layer 2022-01-28 13:45:19 -06:00
Melbyj1125
6bab1292f6 fixed bumper and boulder
fixed wallrun on regular player prefab
2022-01-28 13:11:13 -06:00
Vincent Wheat
28d8d4bf54 Scene Updates
Started mountain climbable path
2022-01-28 09:10:01 -06:00
Melbyj1125
4042eb1c67 Rebalanced the swing diagram so that if the player is able to lengthen
the rope while swinging it will be able to readjust the length ensuring
that it wont become much longert than the intended length.
2022-01-27 20:53:26 -06:00
Melbyj1125
3c14d11ba8 push to override the current main 2022-01-26 14:08:53 -06:00
Melbyj1125
eb5e3e22a7 Updated some of the player prefabs and repositioned the camera slightly
on them
2022-01-26 13:56:45 -06:00
Melbyj1125
076bf0e158 fixed a couple of the bugs that was found in playtest 3 2022-01-26 13:30:01 -06:00
Vladdie
52b0b7f165 Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2022-01-26 12:53:35 -06:00
Vladdie
957278c4c4 ADjusted the firing point on the prefab. 2022-01-26 12:51:36 -06:00
Melbyj1125
d27f8126cb made some small name changes to prevent issues 2022-01-24 13:52:18 -06:00
Melbyj1125
fca69d01d0 Updated the non debug files 2022-01-24 13:42:08 -06:00
2da2237835 Merge branch 'JuliasWintermBugFixes' 2022-01-24 13:18:38 -06:00
Melbyj1125
f1e693e935 swing is mostly functional
Still needs some easing on movement and other minor changes
2022-01-23 18:42:25 -06:00
Melbyj1125
3306da25ba momentum grappling issue solved
Need to adjust smaller things but swing feels more complete
2022-01-21 03:08:58 -06:00
c1d51f4148 Fixed Items Not Apply to Clients Bug
- Fixed a bug in which clients were not spawned in with their items
  despite selecting them in the lobby.  Also applied this fix to the
  respawn method for the pitfalls
2022-01-19 17:28:12 -06:00
8d81c92115 Fixed Runner Spectating King Bug
- Fixed a bug where a runner would spectate the king if the host and a
  client are both runners and the client finished the race before the
  host did
2022-01-19 16:36:10 -06:00
ade428ef8a Fixed Pitfall Respawning On Clients 2022-01-18 11:46:26 -06:00
Melbyj1125
c881e37b9c Made some small improvements to wallrun and the player prefabs
Grapple movement is a lot better just need to implement momentum
2022-01-09 08:12:14 -06:00
Melbyj1125
107e40e168 test push 2021-12-22 22:37:41 -06:00
Melbyj1125
f4479560b1 Merge branch 'finalfinalMelby' 2021-12-17 08:32:32 -06:00
Melbyj1125
d758c3ed9f small changes 2021-12-17 08:30:10 -06:00
Melbyj1125
79626242c0 A lot of cleanup and adjustments
traction resets after a glide
Keep Momentum after sliding
Wallrun adjusted on player prefab
Wallrun added to Player prefab2
A lot of stats adjusted on all prefabs
2021-12-17 02:04:15 -06:00
Melbyj1125
bb5ee9d2b2 smaller stat changes 2021-12-13 14:20:52 -06:00
d0d82b882c Merge branch 'main' of https://github.com/Lautha1/TheKingsRace Fall-SGX 2021-12-13 14:14:53 -06:00
c93414c6d0 Spawn King and Fixed Respawning on Clients 2021-12-13 14:14:02 -06:00
Evan Nydahl
bfa91240b2 Merge branch 'main' of https://github.com/Lautha1/TheKingsRace into main 2021-12-13 13:58:09 -06:00
Evan Nydahl
55d2bb9fe1 -added a button to credit scene to title screen
-created credit screen
2021-12-13 13:53:31 -06:00
Melbyj1125
6c09c3e976 Merge branch 'MelbyFinalSprint' 2021-12-13 13:12:46 -06:00
Melbyj1125
3c3708f869 Changed Player Stats and altered kick hit box 2021-12-13 13:06:47 -06:00
Katherine
45b666e05b Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2021-12-13 12:30:28 -06:00
Katherine
981e254e8b Final Touches
>King's Placement function teaked slightly
2021-12-13 12:26:06 -06:00
ae287e391a Fixed PlayerMovevment Bug 2021-12-13 12:24:29 -06:00