Melbyj1125
ad6df78c0e
Merge branch 'main' of https://github.com/Lautha1/TheKingsRace
2022-03-07 12:05:43 -06:00
Melbyj1125
b9ff40688b
Changes to debug and state machine
2022-03-07 12:02:37 -06:00
Evan Nydahl
ab552e5467
Merge branch 'animationController' into main
2022-03-07 11:26:13 -06:00
Evan Nydahl
d2f75987e8
Animation Controller
...
-Added rough animator diagram--needs more work
-Added a animator manager script to handle animation priority
2022-03-07 11:23:17 -06:00
Melbyj1125
71d7a84725
can kick other players but there is a problem
...
Recovering from ragdoll has problems & host can't kick others for some
reason
2022-03-02 15:08:49 -06:00
Melbyj1125
141c2f3d32
Merge branch 'GrappleBroad'
2022-03-02 14:17:49 -06:00
Melbyj1125
48bdf66fc6
player shouldn't kick themselves
2022-03-02 14:17:14 -06:00
Melbyj1125
9b9e847ba9
modified debug kick
2022-03-02 14:12:35 -06:00
4724c80146
Finished and Fixed the Reset Button
2022-03-02 14:11:15 -06:00
Melbyj1125
d0f27de496
should be able to kick player?
2022-03-02 13:56:24 -06:00
Melbyj1125
a6be528388
Merge branch 'WeatherPause'
2022-03-02 12:58:58 -06:00
Melbyj1125
741dae95cd
weather and pause functionality implemented
2022-03-02 12:56:22 -06:00
Melbyj1125
00c3495461
pause disables inputs instead of scripts
2022-03-01 19:53:23 -06:00
Melbyj1125
0ef78f3eb5
wind should work rn
2022-03-01 17:46:50 -06:00
Melbyj1125
a47ee0c406
started modifying wind
2022-02-28 15:19:19 -06:00
ad30ba0140
Merge branch 'ResetButton'
2022-02-28 14:07:46 -06:00
3f51b34aec
Added a Button to Reset to Last Checkpoint
...
- Unable to test to verify if it works until the Respawn Positions are
in the game scene
2022-02-28 14:03:46 -06:00
Melbyj1125
b80aea96fd
updated weather values
2022-02-28 13:44:20 -06:00
Melbyj1125
5b6b4a2cb9
weather wheel and weather adjustments
2022-02-28 13:42:51 -06:00
Melbyj1125
46dff8f663
doors no longer collide with frame & fixed mom hit
2022-02-25 14:56:30 -06:00
Melbyj1125
d9629ec555
lose Mom on wall and kick renetworked
2022-02-23 13:55:30 -06:00
Melbyj1125
b9a573a97d
fixed an interaction between slide and fall
2022-02-23 07:57:18 -06:00
Melbyj1125
65a7008d24
slide no longer rotates player
...
this means that currently the model doesn't rotate but that will be
rectified once we have the animations
2022-02-23 00:00:43 -06:00
Melbyj1125
167f7840a0
created a debug prefab
2022-02-18 13:56:10 -06:00
Melbyj1125
820b11dd61
Did some bugfixing and commented on everything
2022-02-17 20:55:23 -06:00
Melbyj1125
e74a1c61c0
adjusted anything that refered to playerMovement
2022-02-16 16:44:30 -06:00
Melbyj1125
f0936f4cee
State machine player is networked
...
small cleanups are still needed
2022-02-16 14:21:34 -06:00
Melbyj1125
dfd1687224
updated network behaviour spelling
2022-02-16 13:25:20 -06:00
Melbyj1125
32b0bf7154
added network behavior tags to state managers
2022-02-16 13:21:32 -06:00
Melbyj1125
87594614d5
Merge branch 'sprintActual2Melby'
2022-02-16 13:13:21 -06:00
Melbyj1125
ab3598eee4
added some comments
2022-02-16 12:31:11 -06:00
Melbyj1125
3ff60a830a
bug with crouch fixed
2022-02-16 00:18:44 -06:00
Melbyj1125
095fe0a9cb
Everything is StateMachined just bugtesting
2022-02-16 00:13:12 -06:00
Melbyj1125
ccbcbab71f
Nitro has been State Machined
2022-02-15 23:05:05 -06:00
Melbyj1125
e2438dc364
Finished State Machining Dash
2022-02-15 22:33:26 -06:00
Melbyj1125
f580be178a
Setup all the files so they can be state machined
2022-02-15 21:37:49 -06:00
Melbyj1125
833183d034
Finished the Movement and Aerial groups
...
Working on the Dash, Nitro, and offense groups now
2022-02-15 21:19:12 -06:00
Melbyj1125
ba3ac228f7
cant slide when falling
2022-02-14 13:11:05 -06:00
Melbyj1125
fc525861d4
added slide check functionality for certain functions
2022-02-14 12:55:36 -06:00
Melbyj1125
e1cf0bb094
Have a lot of the basic movement in the stateMachine
...
Will need to finish up and implement some of the ragdoll interactions
2022-02-14 00:32:37 -06:00
Melbyj1125
6f0b3a0d0b
Debug Scripts have been cleaned up.
...
I won't apply this cleanup to the networked version yet because they
will be updated to a state machine anyways.
2022-02-10 21:37:19 -06:00
Evan Nydahl
6cd3024767
General changes
...
1. Added tetzlaff ui changes (code may need to be shortened)
2022-02-09 13:51:06 -06:00
Melbyj1125
8fbedf486d
made dash use R button
2022-02-07 18:10:32 -06:00
Melbyj1125
fff8f4f17e
Merge branch 'sprintV7Melby'
2022-02-07 15:44:29 -06:00
9c15b44b6f
Potential Fix for Kick
2022-02-07 12:16:58 -06:00
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
Evan Nydahl
b61cf12128
Adjustments
...
1. Adjusted player indicators and added a line
2. Reapplied game objects to dash and nitro
3. Readjust keybindings for nitro and dash
2022-02-04 15:20:50 -06:00
Evan Nydahl
83efaf4a34
Merge branch 'stuff' into main
2022-02-04 14:50:42 -06:00
Evan Nydahl
ed8b9ffa91
Added Lots of features
...
1. Added rough fx for erruption
2. Created a sign prefab for level use
3. fixed UI cooldown
2022-02-04 14:38:33 -06:00
04d92b39ee
Started fixing KingUI
2022-02-04 13:37:54 -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
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
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
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
Melbyj1125
37b9fab90a
updated item sprites
2022-01-31 12:19:55 -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
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
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
Melbyj1125
9c3462521e
small adjustment to nitro and player prefabs
2022-01-28 13:45:38 -06:00
Melbyj1125
6bab1292f6
fixed bumper and boulder
...
fixed wallrun on regular player prefab
2022-01-28 13:11:13 -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
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
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
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
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
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
ae287e391a
Fixed PlayerMovevment Bug
2021-12-13 12:24:29 -06:00
Melbyj1125
c3889509c5
Merge branch 'MelbyFinalSprint'
2021-12-10 23:17:37 -06:00
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
