Commit Graph

43 Commits

Author SHA1 Message Date
Melbyj1125
f44774f92f the hover text modifies with replaced buttons 2022-04-28 00:47:39 -05:00
Evan Nydahl
ffbd9a3a7a Made some changes to GameManager and controls scene (and added some
animations)
2022-04-27 12:41:52 -05:00
Melbyj1125
bbcd239d12 reworked grapple functionally more of a hookshot 2022-04-03 21:40:12 -05:00
Melbyj1125
890ab6479a Modified Items & Camera 2022-03-27 22:51:22 -05:00
Melbyj1125
7e96690d3d hopefully fixed issue with respawning 2022-03-27 22:24:24 -05:00
Evan Nydahl
51056bc3d5 Refactored ui code to work with new state base player 2022-03-09 13:52:34 -06:00
Melbyj1125
ccbcbab71f Nitro has been State Machined 2022-02-15 23:05:05 -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
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
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
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
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
04d92b39ee Started fixing KingUI 2022-02-04 13:37:54 -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
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
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
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
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
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
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
dd9a7b625c Beginning of KillZone work 2021-12-10 18:29:16 -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
36da5ec848 Resolved many merge conflicts 2021-12-03 13:55:32 -06:00
Evan Nydahl
e0cfb655f8 Merge branch 'controller' into main 2021-12-03 13:42:41 -06:00
Katherine
555ca22573 Merge branch 'KingsAbs' 2021-12-03 13:37:23 -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