Commit Graph

222 Commits

Author SHA1 Message Date
Sam
a13c836373 fixed transition scene merge error 2023-05-06 19:26:35 -07:00
allylikesfrogs
e723e2b612 ??? 2023-05-06 19:20:37 -07:00
Bryanna
de5abe740b fixed transition scenes (also deleted the sample scene) 2023-05-06 19:13:20 -07:00
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
c13793565d fixed dialog box array resizing errors 2023-05-06 18:49:45 -07:00
Sam
05cf1c729b fixed explosion animation
should've been in previous commit but it didn't save bc unity being unity
2023-05-06 18:32:19 -07:00
Sam
9b3bc81173 fixed: player no longer holds grapple after dying to projectile 2023-05-06 18:25:35 -07:00
Sam
dcfae28ee3 fixed enemies not dying if pinned 2023-05-06 18:12:32 -07:00
Sam
3ad6568707 more balance to caverns 2023-05-06 17:37:35 -07:00
allylikesfrogs
3e2f462b3d Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb 2023-05-06 17:27:12 -07:00
allylikesfrogs
6292632853 wrapping up 2023-05-06 17:27:02 -07:00
Sam
5c75acab96 added more spawn points, fixed pin animation 2023-05-06 17:26:56 -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
Bryanna
726ef3d1be what if for the poster i gave claude an infinity gauntlet and replaced the gems with his instruments 2023-05-06 16:58:34 -07:00
allylikesfrogs
c61a38ee9d sounds! 2023-05-06 16:47:57 -07:00
allylikesfrogs
05d7a72699 i have charged my laptop 2023-05-06 16:11:51 -07:00
Bryanna
5a20ebb5a9 i keep pushing but the baby doesn't want to come out (music) 2023-05-06 15:45:32 -07:00
Bryanna
c8060e33d6 please look at my levels 2023-05-06 15:22:08 -07:00
Bryanna
643b6c6b41 paintings 2023-05-06 15:07:57 -07:00
Bryanna
954e11b299 more gren and bl changes 2023-05-06 14:51:59 -07:00
allylikesfrogs
491fda25c7 changing dash params 2023-05-06 14:46:20 -07:00
Bryanna
3d93b3840b more gren 2023-05-06 14:29:28 -07:00
allylikesfrogs
2ce95c9976 Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb 2023-05-06 14:23:32 -07:00
allylikesfrogs
ba56be61d3 reorganizing enemies 2023-05-06 14:23:24 -07:00
Bryanna
49a9224fce gren fixes 2023-05-06 14:09:13 -07:00
Bryanna
d21841b88b transition screen backgrounds 2023-05-06 13:51:22 -07:00
allylikesfrogs
09758c732c blocking in some more tile stuff! 2023-05-06 12:25:29 -07:00
allylikesfrogs
075b140ac1 level changes 2023-05-06 10:24:08 -07:00
Sam
b51165e2c8 regenerated clarinet scene collider 2023-05-05 23:07:00 -07:00
allylikesfrogs
238987e173 dragonfly 2023-05-05 22:59:44 -07:00
allylikesfrogs
14fae3788a slight water fixes 2023-05-05 22:47:10 -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
257613a4e9 changing some scene stuff, level blocking 2023-05-05 22:36:37 -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
Bryanna
bcec1cf489 story adjustments 2023-05-05 18:44:39 -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
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