Commit Graph

313 Commits

Author SHA1 Message Date
Melbyj1125
df02d905b3 Updated player prefabs and non debug scripts
I did remember to uncomment if(!isLocalPlayer) thing
2022-02-07 08:24:07 -06:00
Melbyj1125
574b1d9431 player can grab the grapple farther than the max
it will pull player in after they grab on
2022-02-06 21:38:13 -06:00
Melbyj1125
0188b9aa17 grapple is more consistent and has a better momentum fall off on release 2022-02-04 19:54:14 -06:00
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
8d5b2c9193 minor fix to boulder 2022-02-02 18:41:43 -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
7ebea33830 Still trying to fix the item bug 2022-02-02 13:16:12 -06:00
651bc24abf Fixed an issue when you take no items into a game 2022-02-02 13:10:42 -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
dd27705eee updated non debug files 2022-02-02 08:56:29 -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
Melbyj1125
37b9fab90a updated item sprites 2022-01-31 12:19:55 -06:00
Melbyj1125
ac441356bd updated cooldown to not throw errors 2022-01-31 12:15:32 -06:00
Melbyj1125
d50d057973 Merge branch 'sprint2MelbySpring' 2022-01-31 12:14:11 -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
Melbyj1125
3c635eeb70 added the new sprites for the items 2022-01-31 12:08:24 -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
Melbyj1125
5f8d487c95 added swing movement easing and adjusted the ropeOffset
Still need to add player movement and height affecting momentum
2022-01-31 10:18:27 -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
Melbyj1125
e249e5d4d5 idle grapple calculations have been solidified
I can now move into adding how player speed and height effect these
things
2022-01-31 09:39:30 -06:00
Melbyj1125
93d2ce9c40 Adjusted prefabs and tags 2022-01-31 08:07:57 -06:00
Melbyj1125
7526d16f75 Implemented tooltips when hovering over an item
Added some placeholder images for the items in the game
made small adjustments to grapple
2022-01-31 08:05:17 -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