Commit Graph

245 Commits

Author SHA1 Message Date
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
Sam
e743c67dc7 Merge branch 'combining' 2023-04-27 20:13:32 -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
slevy14
839a1710ec 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-27 12:27:15 -07:00
allylikesfrogs
3a20673b6f new clarinet scene, testing tilemaps 2023-04-27 12:27:15 -07:00
slevy14
8dd536f254 added a debug mode variable to state controller
if this is checked, then the debug menu will be useable. when building the game, make sure to uncheck the debug mode box to prevent it from coming up in the build
2023-04-27 12:27:15 -07:00
slevy14
5216ea077a added scene switcher debug menu
can be accessed at any time with the
2023-04-27 12:27:15 -07:00