Commit Graph

72 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
Sam
a757a47af1 fixed tambourine
such a stupid issue omg i can't believe it took me this long to realize what was happening. also added transition music into the caverns
2023-05-06 17:16:35 -07:00
allylikesfrogs
c61a38ee9d sounds! 2023-05-06 16:47:57 -07:00
allylikesfrogs
491fda25c7 changing dash params 2023-05-06 14:46:20 -07:00
allylikesfrogs
09758c732c blocking in some more tile stuff! 2023-05-06 12:25:29 -07:00
Sam
418d0e5566 fix clarinet ui 2023-05-05 22:46:31 -07:00
Sam
d703883d94 working on fixing clarinet
it's all about the parameters now!
2023-05-05 22:41:07 -07:00
allylikesfrogs
a1cfe23993 hi sammy 2023-05-05 21:37:59 -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
allylikesfrogs
7e2c255fd5 Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb 2023-05-05 16:19:35 -07:00
allylikesfrogs
fc8a257547 restructuring level 2023-05-05 16:19:27 -07:00
Sam
6131bc7ca1 fixed cymbal bugs
sound no longer breaks (separate game object for sound), ui updated
2023-05-05 12:24:04 -07:00
Nicholas Novak
d3dfe2acac change: Finished MushroomVillage
This includes changes such as putting enemies in levels, adding
projectiles, and finalizing the bounces for the moving platforms

The cymbal has been implemented, and provides a short immunity to
projectiles

Every section is playable, and includes a final ending object, although there
is no transistion to the level from the previous level yet
2023-05-05 10:44:55 -07:00
Nicholas Novak
00e9682040 change: Added cymbal functionality to player behavior and added some adjustment to jump pads 2023-05-05 02:51:53 -07:00
Nicholas Novak
f2132b471a change: Implemented more behavior for jump pads and make them repeatedly jumpable 2023-05-05 00:42:40 -07:00
Nicholas Novak
9057a159c0 fix: Made it so that you can repeatedly bounce on bounce pads 2023-05-05 00:42:40 -07:00
Nicholas Novak
97419d36de change: Added second level to MushroomVillage and implemented jump pads 2023-05-05 00:42:35 -07:00
allylikesfrogs
af754415ea fuckin with water 2023-05-04 21:08:48 -07:00
allylikesfrogs
681c06220a for sammy <3 2023-05-04 19:56:15 -07:00
allylikesfrogs
608173221e tidying 2023-05-04 17:16:43 -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
allylikesfrogs
5d7ef08d32 Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb 2023-05-04 15:17:32 -07:00
allylikesfrogs
041c7cd30d bonk 2023-05-04 15:17:29 -07:00
Sam
da4a9efbdd fixed what happens if the player is grappling and dies 2023-05-04 14:25:13 -07:00
allylikesfrogs
96acb9ba5f boing 2023-05-04 13:53:37 -07:00
allylikesfrogs
a6caababa3 working on Bounce 2023-05-04 13:20:35 -07:00
Nicholas Novak
212695df5d change: Removed dependencies and references to OLD_StateController 2023-05-04 11:26:47 -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
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
a833bdf0a1 clarinet check 2023-05-03 10:11:00 -07:00
allylikesfrogs
7ab17418bb trying dash things 2023-05-03 10:09:55 -07:00
allylikesfrogs
fba3f60354 hi 2023-05-03 10:03:43 -07:00
allylikesfrogs
e0308905a3 more 2023-05-03 09:53:26 -07:00
allylikesfrogs
f1e2de295f ugh2 2023-05-03 08:15:59 -07:00
allylikesfrogs
3aa0823bbe ugh 2023-05-03 00:35:59 -07:00
allylikesfrogs
ed72a093fb hello again 2023-05-02 23:32:12 -07:00
allylikesfrogs
36e5300300 periodic update for my own sanity 2023-05-02 22:04:18 -07:00
Sam
0b1e41fb61 added one line to fix a unity thing 2023-05-02 18:21:00 -07:00
allylikesfrogs
21dd2d889a nothing much starting to set up my scripts 2023-05-02 17:00:58 -07:00
Bryanna
493258f1f9 combined ch and gv scene, created bl scene 2023-05-01 18:58:39 -07:00
Sam
fc8c2e6062 ACTUALLY FIXED BROKEN COMMIT
pull this one!
2023-05-01 17:30:54 -07:00
Sam
071a9b43d4 FIXED BROKEN COMMIT
for whatever reason the player animator was not being accessed, this should fix it
2023-05-01 16:59:51 -07:00
Sam
347b1a0b2c fixed: tambourine ui resets properly on player death 2023-05-01 16:53:13 -07:00
Sam
cc694586a4 fixed ui
also added the general game ui canvas to all scenes
2023-05-01 16:36:09 -07:00