Commit Graph

50 Commits

Author SHA1 Message Date
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
5ca3e74167 saving progress 2023-05-04 16:09:55 -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
Sam
da4a9efbdd fixed what happens if the player is grappling and dies 2023-05-04 14:25:13 -07:00
allylikesfrogs
96acb9ba5f boing 2023-05-04 13:53:37 -07:00
allylikesfrogs
a6caababa3 working on Bounce 2023-05-04 13:20:35 -07:00
Nicholas Novak
212695df5d change: Removed dependencies and references to OLD_StateController 2023-05-04 11:26:47 -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
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
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
e0308905a3 more 2023-05-03 09:53:26 -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
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
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
932af31dc9 player can only access items in correct scenes 2023-05-01 01:52:42 -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
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
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
Bryanna
ac035cecf9 made some changes to double jump 2023-04-28 16:18:50 -07:00
Bryanna
79194a1015 grenouille assets 2023-04-27 15:56:36 -07:00
slevy14
536d777d5f player can now jump on enemies to defeat them 2023-04-26 16:52:49 -07:00
slevy14
d6128d10ef added basic enemy collision
still need to figure out how to make the jumping on heads work, but we need a jump for that lol
2023-04-26 16:05:43 -07:00
slevy14
c0f9749da5 added transition scene with basic tutorial AND PERSISTENT DATA
PLEASE launch game from the main menu scene, otherwise persistent data will not load correctly
2023-04-25 13:27:12 -07:00
slevy14
cea079d243 added basic pause menu 2023-04-25 10:59:49 -07:00
slevy14
34bb1be2fb created spawn point system
works by placing spawn point prefabs wherever you want them. Also created some prefabs of death zone and grapple zone objects
2023-04-25 10:22:38 -07:00
slevy14
775bfd76ea updated enemy behavior
added more sprites, increased functionality, etc
2023-04-20 13:31:08 -07:00
slevy14
32a1412a57 added animation and camera
camera movement is very basic, animation is just right facing lol. also i know the organization is a bit of a mess, i promise i'll fix it
2023-04-19 21:34:00 -07:00
slevy14
686bc2528b Added sounds, fixed some bugs
added a sound for the tambourine, spider web, and background music.\n- finally fixed the web animation\n- added Sir Jacques to the web animation\n- changed the way the fire point tracks the grapple
2023-04-19 17:24:55 -07:00
slevy14
cb059613f9 cleaned up scripts a little bit 2023-04-17 16:47:12 -07:00
slevy14
275763628b reconfigured collision
also made some adjustments to player behavior and controller
2023-04-17 15:22:24 -07:00
Nicholas Novak
fb8732f820 Progress on movement controller 2023-04-17 00:01:49 -07:00
slevy14
5b3de2e587 cleaned up comments in player behavior script 2023-04-14 15:59:13 -07:00
slevy14
4b7bb231a9 added a way for the player to die and respawn, reconfigured test level
ALSO installed TMP but it has been giving me ISSUES
2023-04-13 16:52:11 -07:00
slevy14
5a1ab041de imported grappling files 2023-04-11 19:55:24 -07:00