Commit Graph

217 Commits

Author SHA1 Message Date
e846ebc8c8 Modified the Gates and KickController to sync kicks and apply force
- Now the kicking of gates will sync over the network
- Needs review from Justin to verify this won't break other kickable
  items
2022-02-03 23:14:58 -06:00
Melbyj1125
ba1b2706a6 fixed kick sort of, fixed bumper and boulder
Fix for kick works but is kind of strange and I want to adjust it later
in the future
2022-02-02 18:38:16 -06:00
1949de0754 Temporarily disable archer towers while buggy 2022-02-02 13:23:05 -06:00
cc3bd3d706 Possible Fixes To Net Bugs 2022-02-02 12:46:48 -06:00
e009b33e54 Adjusted Game vars back to Network Versions 2022-02-02 12:26:53 -06:00
Melbyj1125
df1b7f5448 Fixed an issue with wallrun moving the player up
Still needs adjustments to be more flexible and maybe allow the player
to wall run from standing still to allow for vertical wallrun sections.
2022-02-02 08:48:30 -06:00
Melbyj1125
f683a48b84 Rebalanced Items & Bug Fixed
I updated the player prefabs to be more in line with one another and
increased the max speed they can have
2022-02-02 00:08:06 -06:00
Melbyj1125
bf874ddc84 Updated nitro restoring functionality and buffing 2022-02-01 21:07:45 -06:00
Melbyj1125
c5ae603e8f swing feels a lot more complete
Takes into accoutn player height and speed
need to adjust slightly for better ingame feel when it is implemented
into the levels.
2022-02-01 20:32:55 -06:00
Melbyj1125
b2bd9783d4 Merge branch 'sprint3MelbySpring' 2022-01-31 14:23:48 -06:00
Melbyj1125
b63b814fe4 Small changes 2022-01-31 14:21:38 -06:00
Evan Nydahl
09ea1fe031 Fixed indicator and CooldownUI 2022-01-31 14:07:23 -06:00
Katherine
72e33adcbe King Place updated
>the king can place things on the grid, and they snap to the grid
>Hail and Slime are just placeholder objects at the moment
>Grid snapping might need to be cleaned up
2022-01-31 12:38:30 -06:00
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
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
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
Evan Nydahl
539c88357b -Added player indicator and the King and KingUI layer 2022-01-28 13:45:19 -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
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
f4479560b1 Merge branch 'finalfinalMelby' 2021-12-17 08:32:32 -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 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
wheatv3015
de0f6c1a0b Lightmap Data
-Generated lightmaps for the level
2021-12-11 16:04:09 -06:00
Melbyj1125
c3889509c5 Merge branch 'MelbyFinalSprint' 2021-12-10 23:17:37 -06:00
Vincent Wheat
597e59264d Updates
-Archer In Scene
-Time for race 7 minutes
-Camera Path Adjusted
-Trees added in scene
-End Collider added to race
2021-12-10 23:15:36 -06:00
Melbyj1125
946e2146a3 grapple still doesn't work fixed some other values with prefabs 2021-12-10 22:36:40 -06:00
6abcb5afba Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2021-12-10 22:31:40 -06:00