Commit Graph

54 Commits

Author SHA1 Message Date
Evan Nydahl
51056bc3d5 Refactored ui code to work with new state base player 2022-03-09 13:52:34 -06:00
Melbyj1125
87594614d5 Merge branch 'sprintActual2Melby' 2022-02-16 13:13:21 -06:00
Melbyj1125
095fe0a9cb Everything is StateMachined just bugtesting 2022-02-16 00:13:12 -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
fff8f4f17e Merge branch 'sprintV7Melby' 2022-02-07 15:44:29 -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
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
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
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
9c3462521e small adjustment to nitro and player prefabs 2022-01-28 13:45:38 -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
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
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
3c3708f869 Changed Player Stats and altered kick hit box 2021-12-13 13:06:47 -06:00
Melbyj1125
946e2146a3 grapple still doesn't work fixed some other values with prefabs 2021-12-10 22:36:40 -06:00
Melbyj1125
4c8cbcf82e grapple still has issues 2021-12-10 18:05:54 -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
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
Evan Nydahl
e0cfb655f8 Merge branch 'controller' into main 2021-12-03 13:42:41 -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
ba68320a8f Merge branch 'TerrainScuplting' 2021-11-29 13:27:31 -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
Melbyj1125
665b1c793f Inventory UI implemented
Networking should work
2021-11-22 13:52:06 -06:00
Melbyj1125
e2a1a9150c small changes to player and items for cleanup 2021-11-17 12:21:15 -06:00