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
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
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
Sam
163ead5f93
added transition images system
2023-05-02 16:41:07 -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
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
