KarimAkra
99ad45997e
Push the strums a bit back to the left
2025-06-13 04:21:21 +03: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
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
79185596c1
Hide the pause button on ending cutscenes
2025-06-12 02:53:42 +03: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
e657bc900b
save ALL params grrrrr
...
Co-authored-by: Kolo <67389779+JustKolosaki@users.noreply.github.com >
2025-06-09 08:03:05 +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
fabs
b3ebfd0910
pause button/pause screen rework
2025-06-08 04:09:40 +01: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
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
VioletSnowLeopard and Eric
34d5ed1169
Fix combo drop animations
2025-06-04 20:30:21 -04:00
MoonDroid
80393bbc6d
Revert "Push the pausebutton slightly further onto the left for iOS."
...
This reverts commit 7689c7d2e4
2025-06-04 22:17:31 +07:00
MoonDroid
2c44785c39
Move pause metadata text to bottom-right corner
...
also fix an issue where the countdown keeps running during pause.
2025-06-04 22:12:54 +07:00
MoonDroid
ab00a126fa
refactor: Move pause and countdown logic into function, trigger on tab-out
2025-06-04 21:17:53 +07:00
MoonDroid
7689c7d2e4
Push the pausebutton slightly further onto the left for iOS.
2025-06-04 21:16:03 +07:00
Cameron Taylor
fb2d587a15
Merge branch 'abnormal/playstate-instance-crash' into rewrite/master
2025-06-03 03:22:22 -04:00
Karim Akra and GitHub
e7a460042b
fix the opponent strums being misaligned on wide screens
2025-06-02 07:12:48 +07:00
Lasercar and Kade
ae2c2db28f
fixed success message (also forgor playstate change)
2025-05-30 19:49:00 -07:00
+5
d61cc1d5be
Merge public commits to MAIN and DEVELOP ( #1045 )
...
Co-authored-by: Hyper_ <40342021+NotHyper-474@users.noreply.github.com >
Co-authored-by: Lasercar <64717068+Lasercar@users.noreply.github.com >
Co-authored-by: Hundrec <hundrecard@gmail.com >
Co-authored-by: Lasercar <B_l_u_t_a_c_k@hotmail.com.au >
Co-authored-by: anysad <anysadiscool@gmail.com >
Co-authored-by: VioletSnowLeopard <ngzeretzke@gmail.com >
Co-authored-by: unknown <47027981+ACrazyTown@users.noreply.github.com >
Co-authored-by: kade-github <26305836+Kade-github@users.noreply.github.com >
Co-authored-by: JackXson-Real <32755192+JackXson-Real@users.noreply.github.com >
Co-authored-by: Abnormal <86753001+AbnormalPoof@users.noreply.github.com >
Co-authored-by: CrusherNotDrip <90648119+CrusherNotDrip@users.noreply.github.com >
Co-authored-by: cyn0x8 <cyn0x8+git@gmail.com >
Co-authored-by: ChillyBeanBAM <109490279+ChillyBeanBAM@users.noreply.github.com >
2025-05-28 16:06:35 -07:00
sector-a and Kade
5788d04890
Prevent stacked amplitude from not working and fix hold note end vibration
2025-05-20 10:34:56 -07:00
sector-a and Kade
30e9b2fb67
Improve the way note vibrations are handled and tweak hold note vibrations
2025-05-20 10:34:56 -07:00
c77e164513
NOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
...
Co-authored-by: Hundrec <hundrecard@gmail.com >
2025-05-11 20:23:33 +00:00
Abnormal
d2acb5d167
fix: Fix the game crashing when hot reloading with F5
2025-05-11 15:13:27 -05:00
sector-a and Cameron Taylor
c8a86d3df8
Add the pressAction method in TouchUtil and use it everywhere it's useful
2025-05-09 12:54:45 -04:00
+3
44c32cb0fc
More public 0.6.4 fixes ( #1016 )
...
Co-authored-by: Hyper_ <40342021+NotHyper-474@users.noreply.github.com >
Co-authored-by: Lasercar <64717068+Lasercar@users.noreply.github.com >
Co-authored-by: Lasercar <B_l_u_t_a_c_k@hotmail.com.au >
Co-authored-by: anysad <anysadiscool@gmail.com >
Co-authored-by: Hundrec <hundrecard@gmail.com >
Co-authored-by: VioletSnowLeopard <ngzeretzke@gmail.com >
Co-authored-by: unknown <47027981+ACrazyTown@users.noreply.github.com >
Co-authored-by: kade-github <26305836+Kade-github@users.noreply.github.com >
Co-authored-by: Abnormal <86753001+AbnormalPoof@users.noreply.github.com >
Co-authored-by: CrusherNotDrip <90648119+CrusherNotDrip@users.noreply.github.com >
Co-authored-by: cyn0x8 <cyn0x8+git@gmail.com >
2025-05-08 10:28:39 -07:00
Eric and GitHub
301f71b428
Merge pull request #4930 from Hundrec/Lasercar/commit-recovery
...
<RECOVERY> Restore two of Lasercar's commits
2025-05-02 14:30:11 -04:00
Eric and GitHub
45f0f14ed9
Merge pull request #4318 from Lasercar/fix-strumline-offset-when-downscroll
...
Fix strumline offset when downscroll
2025-05-02 14:29:11 -04:00
Hundrec and Lasercar
d9fcaf0e63
Restore Lasercar's changes
...
Dropped them somewhere whoopsie
Co-Authored-By: Lasercar <64717068+Lasercar@users.noreply.github.com >
2025-05-02 05:02:29 -06:00
EliteMasterEric
e917da0a7b
Merge branch 'rewrite/master' into funkin-mobile/main
2025-05-01 21:46:20 -04:00
EliteMasterEric
8de74c361c
Additional cleanup
2025-05-01 19:55:44 -04:00
MoonDroid
9216fff9b0
Move InAppPurchasesUtil and AdMobUtil to funkin/api/mobile
2025-05-01 23:24:51 +07:00
VioletSnowLeopard
0101bae7ec
convert decimal chance to percent
2025-04-30 09:31:22 -04:00
Kolo and Eric
3e0dbe2758
performCleanup on reload
2025-04-30 00:43:37 -04:00
bbc0546c74
Shortened statement based on suggestion.
...
Co-authored-by: Abnormal <86753001+AbnormalPoof@users.noreply.github.com >
2025-04-30 00:42:15 -04:00
thesuperpig56 and Eric
617d5ffa06
Called the wrong character here, whoops!
2025-04-30 00:42:15 -04:00
thesuperpig56 and Eric
73114e2da6
Avoid crash when restarting song without characters.
2025-04-30 00:42:15 -04:00
KarimAkra