Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 368fbcb634 BOING!!!!!! allylikesfrogs 2023-05-04 16:52:39 -07:00
• 60a54adcf8 Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb allylikesfrogs 2023-05-04 16:10:11 -07:00
• 5ca3e74167 saving progress allylikesfrogs 2023-05-04 16:09:55 -07:00
• 55f5e77aa2 clarinet transition story Bryanna 2023-05-04 15:23:46 -07:00
• 5d7ef08d32 Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb allylikesfrogs 2023-05-04 15:17:32 -07:00
• 041c7cd30d bonk allylikesfrogs 2023-05-04 15:17:29 -07:00
• 58b588733c added story to tambourine transition Bryanna 2023-05-04 14:57:25 -07:00
• 791e14a48d fix stairs Bryanna 2023-05-04 14:31:40 -07:00
• da4a9efbdd fixed what happens if the player is grappling and dies Sam 2023-05-04 14:25:13 -07:00
• 2dd782e72f actually fixed UI Sam 2023-05-04 14:17:57 -07:00
• ef2fe7c97f fix: Made audio work again Nicholas Novak 2023-05-04 14:08:13 -07:00
• 96acb9ba5f boing allylikesfrogs 2023-05-04 13:53:37 -07:00
• 7070b33ad3 fixed UI Sam 2023-05-04 13:32:35 -07:00
• 17c35b411e boing boing mf allylikesfrogs 2023-05-04 13:31:41 -07:00
• a6caababa3 working on Bounce allylikesfrogs 2023-05-04 13:20:35 -07:00
• 1c7ced7b71 change: Removed reference to old state controller Nicholas Novak 2023-05-04 11:48:09 -07:00
• 4c7ab5fc8c fix: Changed one last invocation to the new state controller system Nicholas Novak 2023-05-04 11:38:06 -07:00
• 212695df5d change: Removed dependencies and references to OLD_StateController Nicholas Novak 2023-05-04 00:51:15 -07:00
• ee158dd9a1 change: Added new tilemaps and MushroomForest scene Nicholas Novak 2023-05-04 00:49:36 -07:00
• ee0b076ba7 Added in tilemaps and started blocking the level out Nicholas Novak 2023-05-03 15:18:21 -07:00
• 9f70008657 change: Added the Mushroom Forest to the build settings Nicholas Novak 2023-05-04 02:21:30 -07:00
• 5a7ce8fb2b change: Switched the state controller and scene controller to a singleton class Nicholas Novak 2023-05-04 02:19:51 -07:00
• afbcb920ac brasslands Bryanna 2023-05-03 17:55:54 -07:00
• 3108c31489 added trumpet visual Sam 2023-05-03 13:16:44 -07:00
• 8d230a5a71 new dash allylikesfrogs 2023-05-03 12:06:29 -07:00
• f7d45185fa dash is working better! allylikesfrogs 2023-05-03 11:53:37 -07:00
• 6fda5e48b5 a few small things Sam 2023-05-03 10:42:41 -07:00
• ba8b17f4ed cloud color Bryanna 2023-05-03 10:18:54 -07:00
• a833bdf0a1 clarinet check allylikesfrogs 2023-05-03 10:11:00 -07:00
• 7ab17418bb trying dash things allylikesfrogs 2023-05-03 10:09:55 -07:00
• fba3f60354 hi allylikesfrogs 2023-05-03 10:03:43 -07:00
• 6a910bd0d6 Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb allylikesfrogs 2023-05-03 09:54:13 -07:00
• e0308905a3 more allylikesfrogs 2023-05-03 09:53:26 -07:00
• 76180cdcb4 brassland fix Bryanna 2023-05-03 09:53:18 -07:00
• f1844faea3 Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb Bryanna 2023-05-03 09:47:14 -07:00
• 8d0e65e080 scene addons Bryanna 2023-05-03 09:45:55 -07:00
• e134dc039e Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb allylikesfrogs 2023-05-03 09:37:30 -07:00
• 90e2f1ae26 more from me allylikesfrogs 2023-05-03 09:37:22 -07:00
• 598e8c1dba more scene additions Bryanna 2023-05-03 09:16:38 -07:00
• 21a69ca2bb updates to my scenes Bryanna 2023-05-03 08:45:30 -07:00
• f1e2de295f ugh2 allylikesfrogs 2023-05-03 08:15:59 -07:00
• 3aa0823bbe ugh allylikesfrogs 2023-05-03 00:35:59 -07:00
• ed72a093fb hello again allylikesfrogs 2023-05-02 23:32:12 -07:00
• 36e5300300 periodic update for my own sanity allylikesfrogs 2023-05-02 22:04:18 -07:00
• 0b1e41fb61 added one line to fix a unity thing Sam 2023-05-02 18:21:00 -07:00
• 21dd2d889a nothing much starting to set up my scripts allylikesfrogs 2023-05-02 17:00:58 -07:00
• 163ead5f93 added transition images system Sam 2023-05-02 16:41:07 -07:00
• 0cc0f292f1 added transition scene between tambourine and clarinet Sam 2023-05-02 16:10:36 -07:00
• 493258f1f9 combined ch and gv scene, created bl scene Bryanna 2023-05-01 18:58:39 -07:00
• fc8c2e6062 ACTUALLY FIXED BROKEN COMMIT Sam 2023-05-01 17:30:54 -07:00
• 071a9b43d4 FIXED BROKEN COMMIT Sam 2023-05-01 16:59:51 -07:00
• 347b1a0b2c fixed: tambourine ui resets properly on player death Sam 2023-05-01 16:53:13 -07:00
• cc694586a4 fixed ui Sam 2023-05-01 16:36:09 -07:00
• febbf21253 added some basic ui Sam 2023-05-01 16:05:41 -07:00
• d1528cc6ff fixed footsteps Sam 2023-05-01 15:06:45 -07:00
• d2d10f064b added footsteps! Sam 2023-05-01 14:22:46 -07:00
• 58222ed569 changed death animation, moved enemies Sam 2023-05-01 13:35:45 -07:00
• 61939d5090 fixed double jump Sam 2023-05-01 02:12:06 -07:00
• 932af31dc9 player can only access items in correct scenes Sam 2023-05-01 01:52:42 -07:00
• d3893d3f0e improved tambourine behavior Sam 2023-05-01 01:15:21 -07:00
• 46f7cfe07e fixed: player jittering and death sliding Sam 2023-04-30 23:53:52 -07:00
• 14a4de41cc bugfixing Sam 2023-04-30 22:01:55 -07:00
• 743dc3d38a added new transitions scenes for story Bryanna 2023-04-30 16:01:33 -07:00
• c51af3ce92 bugfixed tambourine and player death Sam 2023-04-30 14:16:29 -07:00
• 9f36564e67 add player death animation Sam 2023-04-30 13:58:04 -07:00
• 16a190949d created victory object and level progression Sam 2023-04-30 13:34:02 -07:00
• 1b809cfa06 finished tambourine scene layout Sam 2023-04-30 02:07:49 -07:00
• df97e9c5c1 add trumpet sound effect Sam 2023-04-30 00:19:52 -07:00
• 6ca3e3d44e level layout progress slevy14 2023-04-29 18:51:53 -07:00
• dd3d1386be edited some player data to make grapple and jump feel better slevy14 2023-04-29 18:22:26 -07:00
• 3318e11fd1 Added explosion on enemy defeat Sam 2023-04-29 18:10:36 -07:00
• 3ec0e985fb Pulled Bryanna's changes (merge) Sam 2023-04-29 17:24:08 -07:00
• 8bcb35e8aa more progress on level layout slevy14 2023-04-29 17:21:56 -07:00
• d0fb5f4999 added to village scene Bryanna 2023-04-29 16:08:30 -07:00
• fa22316d17 Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb Bryanna 2023-04-29 14:53:30 -07:00
• f2b44b6d96 npcs and one song Bryanna 2023-04-29 14:52:39 -07:00
• 405e20ca2f lots of small changes lol slevy14 2023-04-29 14:51:50 -07:00
• ed3fcf541c changed some tambourine behavior slevy14 2023-04-28 22:07:28 -07:00
• ac035cecf9 made some changes to double jump Bryanna 2023-04-28 16:18:50 -07:00
• db0e7665f7 more layout stuff, still haven't written the script for clarinet or water though :( allylikesfrogs 2023-04-28 11:49:01 -07:00
• 4625a1f6ba added new enemy prefab, reconfigured enemy patrol script slevy14 2023-04-28 02:13:40 -07:00
• 06f8cefd11 committing the player data numbers changes slevy14 2023-04-28 01:43:14 -07:00
• 968eadb389 resized player, edited some movement data slevy14 2023-04-28 01:37:18 -07:00
• e743c67dc7 Merge branch 'combining' Sam 2023-04-27 20:13:32 -07:00
• 153a1b4f8d fixed combining branch slevy14 2023-04-27 20:12:07 -07:00
• 1b634fd829 Merge branch 'master' into combining Sam 2023-04-27 19:50:40 -07:00
• 716036bc1f moved trumpet jump to new player controller slevy14 2023-04-27 19:47:39 -07:00
• 2445765471 trying grenouille assets again Bryanna 2023-04-27 19:45:27 -07:00
• 01ebd18f5b merged "master" into "combining Sam 2023-04-27 19:15:53 -07:00
• 79194a1015 grenouille assets Bryanna 2023-04-27 15:56:36 -07:00
• 043675236f bg and found a new tileset allylikesfrogs 2023-04-27 15:33:22 -07:00
• 234b2038ac basic tileset layout - clarinet level allylikesfrogs 2023-04-27 14:35:44 -07:00
• 863d7e04ef (kinda) fixed grapple momentum slevy14 2023-04-27 13:31:04 -07:00
• 8e221cf94b Adapted movement controller to work with master Nicholas Novak 2023-04-27 12:54:31 -07:00
• ad3b8f9166 player can now jump on enemies to defeat them slevy14 2023-04-26 16:52:49 -07:00
• 7ae4fdd547 added icon for building slevy14 2023-04-26 16:37:10 -07:00
• 0ac8c4b7f2 no substantial changes i'm just done for now allylikesfrogs 2023-04-26 16:33:34 -07:00
• 839a1710ec added basic enemy collision slevy14 2023-04-26 16:05:43 -07:00
• 3a20673b6f new clarinet scene, testing tilemaps allylikesfrogs 2023-04-26 16:01:41 -07:00
• 8dd536f254 added a debug mode variable to state controller slevy14 2023-04-26 13:27:08 -07:00