Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• c4a618ac80 fix: Updated instructions and documented the Unity version master Nicholas Novak 2023-06-01 18:05:18 -07:00
• 873f9216ce Merge branch 'FinalSubmission' Sam 2023-05-07 00:30:47 -07:00
• 3a2368d8b7 put tambourine back on player prefab Sam 2023-05-07 00:30:33 -07:00
• 76fe0be86d Merge branch 'master' into FinalSubmission Sam 2023-05-07 00:27:39 -07:00
• 5333e6028d fix: Re-added projectiles deleting themselves when they hit the player Nicholas Novak 2023-05-07 00:09:37 -07:00
• f5beaf0fe9 change: Fixed some of the colliders on geometry, and removed an old grapple point Nicholas Novak 2023-05-07 00:09:04 -07:00
• 4135171a79 change: Reduced cymbal range to make it harder Nicholas Novak 2023-05-07 00:08:24 -07:00
• bf6996b029 expanded borders of clarinet tilemap Sam 2023-05-07 00:00:21 -07:00
• c2b9a2aa88 Merge remote-tracking branch 'origin/master' Sam 2023-05-06 23:59:14 -07:00
• fc4a9a74d7 minor changes to gv and bl Bryanna 2023-05-06 23:57:50 -07:00
• 56c9c0e1bb improved tambourine collider Sam 2023-05-06 23:53:25 -07:00
• 3831813409 musica Bryanna 2023-05-06 23:18:56 -07:00
• 02a3a5bf5c change: Added music for MushroomForest Nicholas Novak 2023-05-06 23:12:42 -07:00
• b779d63e3a change: Finished my level for the last time, and added all my mechanics in Nicholas Novak 2023-05-06 22:09:42 -07:00
• 8daa9cbfd6 change: Implemented the cymbals as a pogo mechanic for projectiles Nicholas Novak 2023-05-06 22:09:15 -07:00
• e79f43de22 change: Edited the cymbal sound to be shorter Nicholas Novak 2023-05-06 22:08:28 -07:00
• 2567cb867d change: Changed some more of the tilemaps and added a background Nicholas Novak 2023-05-06 22:07:58 -07:00
• 7f7dd1292f change: Added functionality for projectile enemies to shoot Nicholas Novak 2023-05-06 22:07:25 -07:00
• 16cf4b066d change: Added spore shooter enemy Nicholas Novak 2023-05-06 22:06:36 -07:00
• f4c66d6286 change: Added sprites for spore enemies Nicholas Novak 2023-05-06 22:05:52 -07:00
• d6f204806d testing why enemies jittering Sam 2023-05-06 21:00:15 -07:00
• 7d6eaae833 change to bl ending Bryanna 2023-05-06 19:51:35 -07:00
• 95a2a8b5eb fixed collider! allylikesfrogs 2023-05-06 19:50:53 -07:00
• 4146ea97dd fixed sounds and level blocking (again) allylikesfrogs 2023-05-06 19:45:59 -07:00
• a13c836373 fixed transition scene merge error Sam 2023-05-06 19:26:35 -07:00
• e723e2b612 ??? allylikesfrogs 2023-05-06 19:20:37 -07:00
• de5abe740b fixed transition scenes (also deleted the sample scene) Bryanna 2023-05-06 19:13:20 -07:00
• b6804e2986 removed commented out code and print statements Sam 2023-05-06 19:05:46 -07:00
• c13793565d fixed dialog box array resizing errors Sam 2023-05-06 18:49:45 -07:00
• 05cf1c729b fixed explosion animation Sam 2023-05-06 18:32:19 -07:00
• 9b3bc81173 fixed: player no longer holds grapple after dying to projectile Sam 2023-05-06 18:25:35 -07:00
• dcfae28ee3 fixed enemies not dying if pinned Sam 2023-05-06 18:12:32 -07:00
• 3ad6568707 more balance to caverns Sam 2023-05-06 17:37:35 -07:00
• 3e2f462b3d Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb allylikesfrogs 2023-05-06 17:27:12 -07:00
• 6292632853 wrapping up allylikesfrogs 2023-05-06 17:27:02 -07:00
• 5c75acab96 added more spawn points, fixed pin animation Sam 2023-05-06 17:26:56 -07:00
• a757a47af1 fixed tambourine Sam 2023-05-06 17:16:35 -07:00
• 726ef3d1be what if for the poster i gave claude an infinity gauntlet and replaced the gems with his instruments Bryanna 2023-05-06 16:58:34 -07:00
• c61a38ee9d sounds! allylikesfrogs 2023-05-06 16:47:57 -07:00
• 05d7a72699 i have charged my laptop allylikesfrogs 2023-05-06 16:11:51 -07:00
• 5a20ebb5a9 i keep pushing but the baby doesn't want to come out (music) Bryanna 2023-05-06 15:45:32 -07:00
• c8060e33d6 please look at my levels Bryanna 2023-05-06 15:22:08 -07:00
• 643b6c6b41 paintings Bryanna 2023-05-06 15:07:57 -07:00
• 954e11b299 more gren and bl changes Bryanna 2023-05-06 14:51:59 -07:00
• 491fda25c7 changing dash params allylikesfrogs 2023-05-06 14:46:20 -07:00
• 3d93b3840b more gren Bryanna 2023-05-06 14:29:28 -07:00
• 2ce95c9976 Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb allylikesfrogs 2023-05-06 14:23:32 -07:00
• ba56be61d3 reorganizing enemies allylikesfrogs 2023-05-06 14:23:24 -07:00
• 49a9224fce gren fixes Bryanna 2023-05-06 14:09:13 -07:00
• d21841b88b transition screen backgrounds Bryanna 2023-05-06 13:51:22 -07:00
• 09758c732c blocking in some more tile stuff! allylikesfrogs 2023-05-06 12:25:29 -07:00
• 075b140ac1 level changes allylikesfrogs 2023-05-06 10:24:08 -07:00
• b51165e2c8 regenerated clarinet scene collider Sam 2023-05-05 23:07:00 -07:00
• 238987e173 dragonfly allylikesfrogs 2023-05-05 22:59:44 -07:00
• 14fae3788a slight water fixes allylikesfrogs 2023-05-05 22:47:10 -07:00
• 418d0e5566 fix clarinet ui Sam 2023-05-05 22:46:31 -07:00
• d703883d94 working on fixing clarinet Sam 2023-05-05 22:41:07 -07:00
• 257613a4e9 changing some scene stuff, level blocking allylikesfrogs 2023-05-05 22:36:37 -07:00
• d005a7057c Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb allylikesfrogs 2023-05-05 21:38:11 -07:00
• a1cfe23993 hi sammy allylikesfrogs 2023-05-05 21:37:59 -07:00
• 164da00b0f removed wall jump and slide from player controller Sam 2023-05-05 21:10:12 -07:00
• 89ae237941 COYOTE TIME WORKS Sam 2023-05-05 20:52:28 -07:00
• 7ecafe5fb2 dash allylikesfrogs 2023-05-05 20:40:06 -07:00
• b3ab81f7eb water allylikesfrogs 2023-05-05 19:54:18 -07:00
• bcec1cf489 story adjustments Bryanna 2023-05-05 18:44:39 -07:00
• f7c7c19649 saving progress allylikesfrogs 2023-05-05 17:13:40 -07:00
• 54efc7d934 made trumpet burst bigger, removed tambourine knockback Sam 2023-05-05 16:35:45 -07:00
• d4a9850368 add trumpet burst animation Sam 2023-05-05 16:28:10 -07:00
• 7e2c255fd5 Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb allylikesfrogs 2023-05-05 16:19:35 -07:00
• fc8a257547 restructuring level allylikesfrogs 2023-05-05 16:19:27 -07:00
• 7e75fd24ce Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb Bryanna 2023-05-05 16:04:40 -07:00
• 51af9d6c65 construction complete Bryanna 2023-05-05 16:04:12 -07:00
• 82841da28e (probably) fixed bug where enemy doesn't reset if grappled Sam 2023-05-05 16:00:11 -07:00
• 467f67bfd6 bl improved??? Bryanna 2023-05-05 15:20:31 -07:00
• a0c8ef7506 added lots of details to tambourine level Sam 2023-05-05 14:02:36 -07:00
• 043f777207 fixed: menu navigation, singleton bugs Sam 2023-05-05 13:20:14 -07:00
• e8fcb4e3c4 can now navigate mushroom village Sam 2023-05-05 13:05:16 -07:00
• 6131bc7ca1 fixed cymbal bugs Sam 2023-05-05 12:24:04 -07:00
• d3dfe2acac change: Finished MushroomVillage Nicholas Novak 2023-05-05 10:44:42 -07:00
• ba01db1051 change: Added some enemies and some of the stages, finishing most of the first section of the level Nicholas Novak 2023-05-05 02:53:03 -07:00
• 036ce9452c change: Added the Cymbal crash to the controls Nicholas Novak 2023-05-05 02:52:18 -07:00
• 00e9682040 change: Added cymbal functionality to player behavior and added some adjustment to jump pads Nicholas Novak 2023-05-05 02:51:53 -07:00
• 8b773f0119 change: Changed some of the jump values to match the level, and preparing for second half of blocking Nicholas Novak 2023-05-05 00:38:57 -07:00
• f2132b471a change: Implemented more behavior for jump pads and make them repeatedly jumpable Nicholas Novak 2023-05-05 00:38:10 -07:00
• 9057a159c0 fix: Made it so that you can repeatedly bounce on bounce pads Nicholas Novak 2023-05-05 00:32:44 -07:00
• 14fe75dd44 fix: Make sure that we don't reference a deleted object Nicholas Novak 2023-05-04 22:23:51 -07:00
• cd7195ffd1 fix: Delete old scene controllers when switching back to the main menu Nicholas Novak 2023-05-04 22:16:43 -07:00
• 97419d36de change: Added second level to MushroomVillage and implemented jump pads Nicholas Novak 2023-05-04 20:25:44 -07:00
• 6ac28f4560 More work on mushroom forest Nicholas Novak 2023-05-04 16:33:35 -07:00
• 9bd25a7d8e added controller support! Sam 2023-05-05 00:32:56 -07:00
• 7d58fe1e7f added logo to splash screen!! Sam 2023-05-04 23:09:45 -07:00
• d258549933 update build settings Sam 2023-05-04 22:57:35 -07:00
• a3552eac81 Merge remote-tracking branch 'origin/master' Sam 2023-05-04 21:17:47 -07:00
• a164f3130f added game end screen Sam 2023-05-04 21:17:36 -07:00
• af754415ea fuckin with water allylikesfrogs 2023-05-04 21:08:48 -07:00
• 06ae0ab9c2 Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb allylikesfrogs 2023-05-04 19:56:39 -07:00
• 681c06220a for sammy <3 allylikesfrogs 2023-05-04 19:56:15 -07:00
• c8548e3d4f created new demo scene switcher Sam 2023-05-04 19:54:59 -07:00
• 608173221e tidying allylikesfrogs 2023-05-04 17:16:43 -07:00
• ce71c20acb update dash implementation allylikesfrogs 2023-05-04 17:11:09 -07:00