 Sam
|
d258549933
|
update build settings
this shouldve been in the last commit but unity was being unity and not updating properly so here we are
|
2023-05-04 22:57:35 -07:00 |
|
|
Sam
|
a3552eac81
|
Merge remote-tracking branch 'origin/master'
|
2023-05-04 21:17:47 -07:00 |
|
|
Sam
|
a164f3130f
|
added game end screen
also! the new singleton system doesn't work! returning to the main menu creates a second instance of everything, @nick can you fix this please
|
2023-05-04 21:17:36 -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 |
|
|
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 |
|
|
Sam
|
7070b33ad3
|
fixed UI
|
2023-05-04 13:32:35 -07:00 |
|
|
Sam
|
3108c31489
|
added trumpet visual
|
2023-05-03 13:16:44 -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 |
|
|
Sam
|
0b1e41fb61
|
added one line to fix a unity thing
|
2023-05-02 18:21:00 -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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Sam
|
e743c67dc7
|
Merge branch 'combining'
|
2023-04-27 20:13:32 -07:00 |
|
|
Sam
|
1b634fd829
|
Merge branch 'master' into combining
|
2023-04-27 19:50:40 -07:00 |
|
|
Sam
|
01ebd18f5b
|
merged "master" into "combining
|
2023-04-27 19:15:53 -07:00 |
|
|
Sammy Levy
|
dfdffb9cf3
|
Merge branch 'sammy' into 'master'
Merge Grapple Into Master
See merge request fums/ofb!1
|
2023-04-14 23:01:37 +00:00 |
|