Commit Graph

228 Commits

Author SHA1 Message Date
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
Bryanna
7e75fd24ce Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb 2023-05-05 16:04:40 -07:00
Bryanna
51af9d6c65 construction complete 2023-05-05 16:04:12 -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
Bryanna
467f67bfd6 bl improved??? 2023-05-05 15:20:31 -07:00
Sam
a0c8ef7506 added lots of details to tambourine level 2023-05-05 14:02:36 -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
e8fcb4e3c4 can now navigate mushroom village
also added event system so the canvases work properly
2023-05-05 13:05:16 -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
ba01db1051 change: Added some enemies and some of the stages, finishing most of the first section of the level 2023-05-05 02:53:03 -07:00
Nicholas Novak
036ce9452c change: Added the Cymbal crash to the controls 2023-05-05 02:52:18 -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
8b773f0119 change: Changed some of the jump values to match the level, and preparing for second half of blocking
This prepares the level for the second half, where the player will be
using the cymbals more, as well as more of the mechanics from other
levels
2023-05-05 00:42:40 -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
Nicholas Novak
6ac28f4560 More work on mushroom forest 2023-05-05 00:41:13 -07:00
Sam
9bd25a7d8e added controller support!
done through the input settings, using the "gamepad" layout -- it should work, but i do not have a controller and cannot test lol. if someone with a controller wants to test, it should work for everything except menu navigation, which you'll still need a mouse for
2023-05-05 00:32:56 -07:00
Sam
7d58fe1e7f added logo to splash screen!! 2023-05-04 23:09:45 -07:00
Sam
d258549933 update build settings
this shouldve been in the last commit but unity was being unity and not updating properly so here we are
2023-05-04 22:57: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
60a54adcf8 Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb 2023-05-04 16:10:11 -07:00
allylikesfrogs
5ca3e74167 saving progress 2023-05-04 16:09:55 -07:00
Bryanna
55f5e77aa2 clarinet transition story 2023-05-04 15:23:46 -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
Bryanna
58b588733c added story to tambourine transition 2023-05-04 14:57:25 -07:00
Bryanna
791e14a48d fix stairs 2023-05-04 14:31:40 -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
1c7ced7b71 change: Removed reference to old state controller 2023-05-04 11:48:09 -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