Commit Graph

46 Commits

Author SHA1 Message Date
Sam
b6804e2986 removed commented out code and print statements
the console should finally be message free! except for the unity memory leak lol but that one's not on us
2023-05-06 19:05:46 -07:00
Sam
9b3bc81173 fixed: player no longer holds grapple after dying to projectile 2023-05-06 18:25:35 -07:00
allylikesfrogs
09758c732c blocking in some more tile stuff! 2023-05-06 12:25:29 -07:00
allylikesfrogs
d005a7057c Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb 2023-05-05 21:38:11 -07:00
allylikesfrogs
a1cfe23993 hi sammy 2023-05-05 21:37:59 -07:00
Sam
164da00b0f removed wall jump and slide from player controller
these aren't mechanics we ever talked about and idk how they work (they don't seem to actually do anything), so i cut them
2023-05-05 21:10:12 -07:00
Sam
89ae237941 COYOTE TIME WORKS
coyote time mf
2023-05-05 20:52:28 -07:00
allylikesfrogs
7ecafe5fb2 dash 2023-05-05 20:40:06 -07:00
allylikesfrogs
b3ab81f7eb water 2023-05-05 19:54:18 -07:00
allylikesfrogs
f7c7c19649 saving progress 2023-05-05 17:13:40 -07:00
Sam
d4a9850368 add trumpet burst animation
still needs work
2023-05-05 16:28:10 -07:00
allylikesfrogs
ce71c20acb update dash implementation 2023-05-04 17:11:09 -07:00
allylikesfrogs
368fbcb634 BOING!!!!!! 2023-05-04 16:52:39 -07:00
allylikesfrogs
5ca3e74167 saving progress 2023-05-04 16:09:55 -07:00
Nicholas Novak
4c7ab5fc8c fix: Changed one last invocation to the new state controller system 2023-05-04 11:47:06 -07:00
Nicholas Novak
5a7ce8fb2b change: Switched the state controller and scene controller to a singleton class
This doesnt' change any of the logic, but simplifies a lot of the main
game loop code.

Many things still rely on the singleton class, but shouldn't so this
will be fixed in a later commit
2023-05-04 11:25:58 -07:00
Sam
3108c31489 added trumpet visual 2023-05-03 13:16:44 -07:00
allylikesfrogs
8d230a5a71 new dash 2023-05-03 12:06:29 -07:00
allylikesfrogs
f7d45185fa dash is working better! 2023-05-03 11:53:37 -07:00
allylikesfrogs
e0308905a3 more 2023-05-03 09:53:26 -07:00
allylikesfrogs
90e2f1ae26 more from me 2023-05-03 09:37:22 -07:00
allylikesfrogs
f1e2de295f ugh2 2023-05-03 08:15:59 -07:00
allylikesfrogs
3aa0823bbe ugh 2023-05-03 00:35:59 -07:00
Sam
febbf21253 added some basic ui
still work in progress, just a progress commit!
2023-05-01 16:05:41 -07:00
Sam
d1528cc6ff fixed footsteps
also @bryanna i moved the grapple poles in the village so they can be reached without the trumpet jump
2023-05-01 15:06:45 -07:00
Sam
d2d10f064b added footsteps!
need to move the call from OnMove to Run, still some bugfixing to do
2023-05-01 14:22:46 -07:00
Sam
61939d5090 fixed double jump
the player can no longer jump twice in the air if they walk off a ledge
2023-05-01 02:12:06 -07:00
Sam
932af31dc9 player can only access items in correct scenes 2023-05-01 01:52:42 -07:00
Sam
46f7cfe07e fixed: player jittering and death sliding 2023-04-30 23:53:52 -07:00
Sam
9f36564e67 add player death animation
also bugfixed some tambourine stuff
2023-04-30 13:58:04 -07:00
Sam
df97e9c5c1 add trumpet sound effect 2023-04-30 00:19:52 -07:00
slevy14
dd3d1386be edited some player data to make grapple and jump feel better 2023-04-29 18:22:26 -07:00
slevy14
405e20ca2f lots of small changes lol
worked on tambourine level layout, improved tambourine throwing, created enemy respawn system
2023-04-29 14:51:50 -07:00
Bryanna
ac035cecf9 made some changes to double jump 2023-04-28 16:18:50 -07:00
slevy14
153a1b4f8d fixed combining branch 2023-04-27 20:12:07 -07:00
slevy14
716036bc1f moved trumpet jump to new player controller
this should work, though i'm still not 100% sure how the new jump works
2023-04-27 19:47:39 -07:00
Sam
01ebd18f5b merged "master" into "combining 2023-04-27 19:15:53 -07:00
Bryanna
79194a1015 grenouille assets 2023-04-27 15:56:36 -07:00
slevy14
863d7e04ef (kinda) fixed grapple momentum
also updated the player prefab -- PLEASE remember to override the player prefab with any changes you make to the individual object in the scene
2023-04-27 13:31:04 -07:00
Nicholas Novak
8e221cf94b Adapted movement controller to work with master 2023-04-27 12:54:31 -07:00
Nicholas Novak
ded2d4e1da Finished overhaul of movement controller 2023-04-27 12:18:47 -07:00
slevy14
cb059613f9 cleaned up scripts a little bit 2023-04-17 16:47:12 -07:00
slevy14
275763628b reconfigured collision
also made some adjustments to player behavior and controller
2023-04-17 15:22:24 -07:00
Nicholas Novak
fb8732f820 Progress on movement controller 2023-04-17 00:01:49 -07:00
Nicholas Novak
663c037af3 Added a movement controller, and added a demo scene 2023-04-09 23:09:21 -07:00
Nicholas Novak
415a92cf24 Initial commit and start of project 2023-04-09 21:59:32 -07:00