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
60a54adcf8
Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb
2023-05-04 16:10:11 -07:00
allylikesfrogs
5ca3e74167
saving progress
2023-05-04 16:09:55 -07:00
Bryanna
55f5e77aa2
clarinet transition story
2023-05-04 15:23:46 -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
Bryanna
58b588733c
added story to tambourine transition
2023-05-04 14:57:25 -07:00
Bryanna
791e14a48d
fix stairs
2023-05-04 14:31:40 -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
1c7ced7b71
change: Removed reference to old state controller
2023-05-04 11:48:09 -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
ee158dd9a1
change: Added new tilemaps and MushroomForest scene
...
This adds two new tilesets, as well as start on the mushroom forest
scene that includes part of the block out of the level, but nothing else
2023-05-04 11:26:01 -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
Bryanna
afbcb920ac
brasslands
2023-05-03 17:55:54 -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
Sam
6fda5e48b5
a few small things
...
changed camera in brasslands and cave, made pin animation shorter
2023-05-03 10:42:41 -07:00
Bryanna
ba8b17f4ed
cloud color
2023-05-03 10:18:54 -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
6a910bd0d6
Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb
2023-05-03 09:54:13 -07:00
allylikesfrogs
e0308905a3
more
2023-05-03 09:53:26 -07:00
Bryanna
76180cdcb4
brassland fix
2023-05-03 09:53:18 -07:00
Bryanna
f1844faea3
Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb
2023-05-03 09:47:14 -07:00
Bryanna
8d0e65e080
scene addons
2023-05-03 09:45:55 -07:00
allylikesfrogs
e134dc039e
Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb
2023-05-03 09:37:30 -07:00
allylikesfrogs
90e2f1ae26
more from me
2023-05-03 09:37:22 -07:00
Bryanna
598e8c1dba
more scene additions
2023-05-03 09:16:38 -07:00
Bryanna
21a69ca2bb
updates to my scenes
2023-05-03 08:45:30 -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
Sam
0cc0f292f1
added transition scene between tambourine and clarinet
2023-05-02 16:10:36 -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
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
Bryanna
743dc3d38a
added new transitions scenes for story
2023-04-30 16:01:33 -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
slevy14
6ca3e3d44e
level layout progress
2023-04-29 18:51:53 -07:00
slevy14
dd3d1386be
edited some player data to make grapple and jump feel better
2023-04-29 18:22:26 -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
slevy14
8bcb35e8aa
more progress on level layout
2023-04-29 17:21:56 -07:00
Bryanna
d0fb5f4999
added to village scene
2023-04-29 16:08:30 -07:00
Bryanna
fa22316d17
Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb
2023-04-29 14:53:30 -07:00
Bryanna
f2b44b6d96
npcs and one song
2023-04-29 14:52:39 -07:00
slevy14
405e20ca2f
lots of small changes lol
...
worked on tambourine level layout, improved tambourine throwing, created enemy respawn system
2023-04-29 14:51:50 -07:00
slevy14
ed3fcf541c
changed some tambourine behavior
...
also working on level layout
2023-04-28 22:07:28 -07:00
Bryanna
ac035cecf9
made some changes to double jump
2023-04-28 16:18:50 -07:00
allylikesfrogs
db0e7665f7
more layout stuff, still haven't written the script for clarinet or water though :(
2023-04-28 11:49:01 -07:00
slevy14
4625a1f6ba
added new enemy prefab, reconfigured enemy patrol script
...
enemy patrol now contains option for vertical movement
2023-04-28 02:13:40 -07:00
slevy14
06f8cefd11
committing the player data numbers changes
...
unity is being stupid, turns out changing this data AT ALL will *not* update the file to be tracked in git. instead, need to quit unity and reopen it to get git to recognize the changes, like here
2023-04-28 01:43:14 -07:00
slevy14
968eadb389
resized player, edited some movement data
2023-04-28 01:37:18 -07:00
slevy14
153a1b4f8d
fixed combining branch
2023-04-27 20:12:07 -07:00
Sam
1b634fd829
Merge branch 'master' into combining
2023-04-27 19:50:40 -07:00
slevy14
716036bc1f
moved trumpet jump to new player controller
...
this should work, though i'm still not 100% sure how the new jump works
2023-04-27 19:47:39 -07:00
Bryanna
2445765471
trying grenouille assets again
2023-04-27 19:45:27 -07:00
Sam
01ebd18f5b
merged "master" into "combining
2023-04-27 19:15:53 -07:00
Bryanna
79194a1015
grenouille assets
2023-04-27 15:56:36 -07:00
allylikesfrogs
043675236f
bg and found a new tileset
2023-04-27 15:33:22 -07:00
allylikesfrogs
234b2038ac
basic tileset layout - clarinet level
2023-04-27 14:35:44 -07:00
slevy14
863d7e04ef
(kinda) fixed grapple momentum
...
also updated the player prefab -- PLEASE remember to override the player prefab with any changes you make to the individual object in the scene
2023-04-27 13:31:04 -07:00
Nicholas Novak
8e221cf94b
Adapted movement controller to work with master
2023-04-27 12:54:31 -07:00
slevy14
ad3b8f9166
player can now jump on enemies to defeat them
2023-04-27 12:27:15 -07:00
slevy14
7ae4fdd547
added icon for building
2023-04-27 12:27:15 -07:00
allylikesfrogs
0ac8c4b7f2
no substantial changes i'm just done for now
2023-04-27 12:27:15 -07:00
