Commit Graph

125 Commits

Author SHA1 Message Date
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
54efc7d934 made trumpet burst bigger, removed tambourine knockback 2023-05-05 16:35:45 -07:00
Sam
d4a9850368 add trumpet burst animation
still needs work
2023-05-05 16:28:10 -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
82841da28e (probably) fixed bug where enemy doesn't reset if grappled
also moved the victory object lower in the brasslands
2023-05-05 16:00:11 -07:00
Sam
043f777207 fixed: menu navigation, singleton bugs
quit buttons in pause menus are fixed. also the persistent data objects were not deleting themselves if another copy exists, so that's been fixed
2023-05-05 13:20:14 -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
14fe75dd44 fix: Make sure that we don't reference a deleted object 2023-05-05 00:42:40 -07:00
Nicholas Novak
cd7195ffd1 fix: Delete old scene controllers when switching back to the main menu 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
Sam
a3552eac81 Merge remote-tracking branch 'origin/master' 2023-05-04 21:17:47 -07:00
Sam
a164f3130f added game end screen
also! the new singleton system doesn't work! returning to the main menu creates a second instance of everything, @nick can you fix this please
2023-05-04 21:17:36 -07:00
allylikesfrogs
af754415ea fuckin with water 2023-05-04 21:08:48 -07:00
allylikesfrogs
06ae0ab9c2 Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb 2023-05-04 19:56:39 -07:00
allylikesfrogs
681c06220a for sammy <3 2023-05-04 19:56:15 -07:00
Sam
c8548e3d4f created new demo scene switcher
this is just an overhaul of the debug scene switcher -- no longer breaks if you leave the main menu! a win for the girlies
2023-05-04 19:54:59 -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
Sam
2dd782e72f actually fixed UI 2023-05-04 14:17:57 -07:00
Nicholas Novak
ef2fe7c97f fix: Made audio work again 2023-05-04 14:08:21 -07:00
allylikesfrogs
96acb9ba5f boing 2023-05-04 13:53:37 -07:00
Sam
7070b33ad3 fixed UI 2023-05-04 13:32:35 -07:00
allylikesfrogs
17c35b411e boing boing mf 2023-05-04 13:31:41 -07:00
allylikesfrogs
a6caababa3 working on Bounce 2023-05-04 13:20:35 -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
212695df5d change: Removed dependencies and references to OLD_StateController 2023-05-04 11:26:47 -07:00
Nicholas Novak
ee0b076ba7 Added in tilemaps and started blocking the level out 2023-05-04 11:26:01 -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
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