fums/ofb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
240 Commits 1 Branch 0 Tags
4135171a790fbd3f1185ffb4f2d8808a5ce244c3
Commit Graph
63 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam bf6996b029 expanded borders of clarinet tilemap 2023-05-07 00:00:21 -07:00
Sam c2b9a2aa88 Merge remote-tracking branch 'origin/master' 2023-05-06 23:59:14 -07:00
Sam 56c9c0e1bb improved tambourine collider 
just expanded it slightly so it doesn't get stuck on the bats' heads anymore
 2023-05-06 23:53:25 -07:00
Sam d6f204806d testing why enemies jittering 2023-05-06 21:00:15 -07:00
Sam a13c836373 fixed transition scene merge error 2023-05-06 19:26:35 -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
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
Sam b51165e2c8 regenerated clarinet scene collider 2023-05-05 23:07:00 -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
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
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
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 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
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
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
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
Sam 7070b33ad3 fixed UI 2023-05-04 13:32:35 -07:00
Sam 3108c31489 added trumpet visual 2023-05-03 13:16:44 -07:00
Sam 6fda5e48b5 a few small things 
changed camera in brasslands and cave, made pin animation shorter
 2023-05-03 10:42:41 -07:00
Sam 0b1e41fb61 added one line to fix a unity thing 2023-05-02 18:21:00 -07:00
Sam 163ead5f93 added transition images system 2023-05-02 16:41:07 -07:00
Sam 0cc0f292f1 added transition scene between tambourine and clarinet 2023-05-02 16:10:36 -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 58222ed569 changed death animation, moved enemies 2023-05-01 13:35:45 -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
Sam 932af31dc9 player can only access items in correct scenes 2023-05-01 01:52:42 -07:00
Sam d3893d3f0e improved tambourine behavior 
also worked a bit on level balancing, adding background details
 2023-05-01 01:15:21 -07:00
Sam 46f7cfe07e fixed: player jittering and death sliding 2023-04-30 23:53:52 -07:00
Sam 14a4de41cc bugfixing 
added canvas objects to all scenes (and event systems with them), game should be playable all the way through maybe!
 2023-04-30 22:01:55 -07:00
Sam c51af3ce92 bugfixed tambourine and player death 
death still needs work!
 2023-04-30 14:16:29 -07:00
Sam 9f36564e67 add player death animation 
also bugfixed some tambourine stuff
 2023-04-30 13:58:04 -07:00
Sam 16a190949d created victory object and level progression 
also tried to create a way to launch the game from any scene, but it doesn't really work. don't use anything in the folder called "DEBUG"
 2023-04-30 13:34:02 -07:00
Sam 1b809cfa06 finished tambourine scene layout 
probably still needs some tweaking, not super tested. but it's done and it's late
 2023-04-30 02:07:49 -07:00
Sam df97e9c5c1 add trumpet sound effect 2023-04-30 00:19:52 -07:00
Sam 3318e11fd1 Added explosion on enemy defeat 
Also added a little force for when you land on an enemy, but sometimes it YEETS the player if done at the right moment with a trumpet jump
 2023-04-29 18:10:36 -07:00
Sam 3ec0e985fb Pulled Bryanna's changes (merge) 2023-04-29 17:24:40 -07:00
Sam e743c67dc7 Merge branch 'combining' 2023-04-27 20:13:32 -07:00
Sam 1b634fd829 Merge branch 'master' into combining 2023-04-27 19:50:40 -07:00
Sam 01ebd18f5b merged "master" into "combining 2023-04-27 19:15:53 -07:00
Sammy Levy dfdffb9cf3 Merge branch 'sammy' into 'master' 
Merge Grapple Into Master

See merge request fums/ofb!1
 2023-04-14 23:01:37 +00:00