sector-a
aa24e08fdb
Merge branch 'master' into feature/various-haptic-changes
2025-06-13 05:00:36 +03:00
sector-a
49693f06e9
winter horrorland haptics
2025-06-13 04:57:23 +03:00
KarimAkra
403c6250f8
Merge branch 'master' into character-select-extensions
2025-06-13 02:48:19 +03:00
MAJigsaw77
9706a55eca
Merge branch 'master' into bugfix/freeze-video-restarting
2025-06-13 00:04:07 +03:00
KarimAkra
6b11f8b852
slight refactor for FullScreenScaleMode to fix some wide screen related issue
2025-06-12 23:45:50 +03:00
KutikiPlayz and Kade
6ad9ffc7f9
notes move freaking normally
2025-06-12 13:21:39 -07:00
MAJigsaw77
895eeed852
fix: restart on video cutscenes.
2025-06-12 17:56:26 +03:00
MAJigsaw77
1a07e082c9
fix: freeze when restarting a video cutscene.
2025-06-12 12:47:36 +03:00
Kolo and Hundrec
a776ce1a81
stage editor bugfixes + features :D
2025-06-12 00:47:24 -06:00
MoonDroid and GitHub
e92c6ec8f7
Merge pull request #1200 from FunkinCrew/bugfix/hide-pause-button-and-bring-resume-back
2025-06-12 12:00:35 +07:00
sector-a
0d965ba91c
Fix pause button hiding
2025-06-12 04:06:56 +03:00
Lasercar and Kade
9df5395ff8
Load meta/chartdata fix
...
Deletes the song serialiser class, it has no use anymore
Also fixes the BPM changes
Note style is properly set when metadata toolbox is refreshed
Add variation dialog now fills note style dropdown with note styles and sets it properly afterwards
Also makes a few optimisations for the chart editor
2025-06-11 17:32:44 -07:00
zackaryowo and Abnormal
0e24ae911f
Fixed instrumentalOffset goofiness :D
2025-06-11 19:24:46 -05:00
zackaryowo and Abnormal
c87a39b6c2
Oops, don't need this here
...
Thank you @NotHyper-474!
2025-06-11 19:24:46 -05:00
GitRan and Abnormal
9f8e42bd3c
Alter countdown + conductor behavior
...
Conductor's minimum songPosition when music is playing is now combinedOffset.
resyncVocals is also no longer used when the song starts, as it complicates matters and causes weird double-upping whatever due to the song being played, paused, and then played again
2025-06-11 19:24:46 -05:00
GitRan and Abnormal
1f75a641e0
Fix audio offset interactions with song start
...
Don't use combined offset here-- using it will cause the instrumental to skip forwards due to your offset. Just use instrumental offset, and don't play it when the song starts-- let resyncVocals do that
2025-06-11 19:24:46 -05:00
sector-a
47f0fc7236
Bring back the resume entry in pause in cutscenes
2025-06-12 02:55:43 +03:00
sector-a
79185596c1
Hide the pause button on ending cutscenes
2025-06-12 02:53:42 +03:00
Mihai Alexandru and GitHub
a0ae4de5e8
mobile: make changing difficulties add to ad counter
2025-06-12 05:29:37 +07:00
Mihai Alexandru and GitHub
bc01d5cffa
fix: audio desync when restarting a video cutscene.
2025-06-12 04:41:01 +07:00
MAJigsaw77 and Hundrec
295e6f652e
fix: fix gitaroo pause menu on wide screen.
2025-06-11 04:42:33 -06:00
Abnormal and Hundrec
cd3b7d7b95
????????????????????????
2025-06-11 02:52:05 -06:00
5d4e1d276b
additional revision made after pr was pulled internally
...
Co-authored-by: Hyper_ <40342021+NotHyper-474@users.noreply.github.com >
2025-06-11 02:52:05 -06:00
Hyper_ and Eric
d968fb271c
Make sound effects pause with the game
2025-06-10 17:23:46 -04:00
MAJigsaw77
69c5c05039
mobile: adjust admob and iapcore variables a little.
2025-06-10 15:29:08 +03:00
MAJigsaw77 and Hundrec
a97acfe18e
mobile: move ad banner to the top left.
2025-06-09 01:31:19 -06:00
e657bc900b
save ALL params grrrrr
...
Co-authored-by: Kolo <67389779+JustKolosaki@users.noreply.github.com >
2025-06-09 08:03:05 +07:00
Hundrec and GitHub
277416b6a3
Nudge metadata differently for mobile
2025-06-09 08:00:43 +07:00
Mihai Alexandru and GitHub
e90b74f788
Comment the failed ad banner placeholder code.
2025-06-09 06:53:55 +07:00
MoonDroid and GitHub
a103b9641f
Merge pull request #1154 from FunkinCrew/bugfix/admob-running-no-any-state
2025-06-08 20:33:39 +07:00
MAJigsaw77
9e58ef70fb
Adjutements to how playing counter work aswell as playing an ad in the pause menu before restarting the song.
2025-06-08 16:29:33 +03:00
MoonDroid
d432e086cc
Merge branch 'master' into mobile-pause-plus-back
2025-06-08 20:19:01 +07:00
MoonDroid
7f619640f2
fix: Increase GLOBAL_PLAYING_COUNTER when resetting PlayState in Pause Menu
2025-06-08 18:52:01 +07:00
MoonDroid
9d5613cc95
fix: Move pause metadata to bottom right on mobile
2025-06-08 18:43:01 +07:00
MoonDroid
24db9235e1
fix: Add targetStateFactory to prevent Stickers to be called during an ad.
2025-06-08 16:50:28 +07:00
MAJigsaw77
370e00c9b9
Move the metadata buttom right.
2025-06-08 12:22:19 +03:00
fabs
b3ebfd0910
pause button/pause screen rework
2025-06-08 04:09:40 +01:00
fabs
dc04ff23d7
move back button + swap class names
2025-06-08 04:09:20 +01:00
sector-a and GitHub
75aea15539
Fix death haptics not working on some variations
2025-06-07 21:56:52 +07:00
MoonDroid
6e8494e615
Merge branch 'bugfix/admob-running-no-any-state' of https://github.com/FunkinCrew/Funkin-secret into bugfix/admob-running-no-any-state
2025-06-07 21:41:20 +07:00
MoonDroid
4392f5e642
fix: prevent death quote looping in Game Over
2025-06-07 21:41:08 +07:00
MAJigsaw77
21616e9399
Combine both ad counters into GLOBAL_PLAYING_COUNTER.
2025-06-07 17:26:38 +03:00
MAJigsaw77
814c563c55
Move gameover ads loading to gameover state.
2025-06-07 16:38:38 +03:00
MAJigsaw77
537c7cb5a1
Add a callback when the ad finishes showing.
2025-06-07 15:34:57 +03:00
Hyper_ and Eric
eb8d878aeb
Prevent vwoosh timer from running outside PlayState
2025-06-06 21:10:03 -04:00
Hyper_ and Eric
f19ae72b27
Improve vwoosh timer behaviour (no freezing the whole game this time)
2025-06-06 21:10:03 -04:00
Kolo and Eric
63eca96c98
run checks if timer's running
2025-06-06 21:10:03 -04:00
EliteMasterEric
285a607d9a
Stop recreating the Hold Note graphic every time it is revived. This plugs a memory leak.
2025-06-06 20:45:23 -04:00
7a2be205b9
Fix typos and errors in PlayState comments
...
Co-Authored-By: VioletSnowLeopard <202548129+violetsnowleopard@users.noreply.github.com >
2025-06-06 19:14:46 -04:00
sector-a
7aa0db844b
Solve merge conflicts
2025-06-06 14:30:14 +03:00
sector-a