Commit Graph
1145 Commits
Author SHA1 Message Date
MAJigsaw77andHundrec 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
HundrecandGitHub 277416b6a3 Nudge metadata differently for mobile 2025-06-09 08:00:43 +07:00
Mihai AlexandruandGitHub e90b74f788 Comment the failed ad banner placeholder code. 2025-06-09 06:53:55 +07:00
MoonDroidandGitHub 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-aandGitHub 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_andEric eb8d878aeb Prevent vwoosh timer from running outside PlayState 2025-06-06 21:10:03 -04:00
Hyper_andEric f19ae72b27 Improve vwoosh timer behaviour (no freezing the whole game this time) 2025-06-06 21:10:03 -04:00
KoloandEric 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 d72d93083f Merge branch 'rewrite/master' into mob-96/week3-train-haptics 2025-06-06 14:29:58 +03:00
sector-aandGitHub fabc16d265 Add haptics preference 2025-06-06 04:10:25 +07:00
MAJigsaw77 2f647127b1 Use TOP_CENTER for the AD banner on the pause menu. 2025-06-05 10:05:28 +03:00
Cameron TaylorandGitHub bbddb34853 Merge pull request #1112 from FunkinCrew/lasercar/chart-editor-tweens
[PUBLIC PR] Add additional tween types to Chart Editor events
2025-06-05 02:29:55 -04:00
VioletSnowLeopardandEric 34d5ed1169 Fix combo drop animations 2025-06-04 20:30:21 -04:00
sector-a e9697e6f40 Make sharpness changeable 2025-06-05 01:34:09 +03:00
LasercarandEric 5177e1275e Add all tween types 2025-06-04 17:31:26 -04:00
Karim AkraandGitHub 07ad53a09b Merge pull request #1101 from FunkinCrew/refactor/pause-layout
Refactor pause menu layout
2025-06-04 21:54:35 +03: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
KarimAkra e79d4e69c2 Properly add IOS support for IAR 2025-06-04 17:57:48 +03:00
MoonDroid fda944a9f7 fix: Prevent accidental taps by distinguishing swipes from taps 2025-06-04 21:18:52 +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
EliteMasterEric 0e26f9d936 Implement in-app reviews 2025-06-03 20:00:34 -04:00
Cameron Taylor fb2d587a15 Merge branch 'abnormal/playstate-instance-crash' into rewrite/master 2025-06-03 03:22:22 -04:00
Karim AkraandGitHub e7a460042b fix the opponent strums being misaligned on wide screens 2025-06-02 07:12:48 +07:00
Mihai AlexandruandGitHub ad1021ee33 feature: add a placeholder solid color graphic when a banner advertisement fails to load. 2025-06-02 07:12:16 +07:00
LasercarandKade ae2c2db28f fixed success message (also forgor playstate change) 2025-05-30 19:49:00 -07:00
EliteMasterEricandKade fc83685b0f Remove a bunch of deprecation warnings 2025-05-28 16:33:10 -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-aandKade 5788d04890 Prevent stacked amplitude from not working and fix hold note end vibration 2025-05-20 10:34:56 -07:00
sector-aandKade 30e9b2fb67 Improve the way note vibrations are handled and tweak hold note vibrations 2025-05-20 10:34:56 -07:00
MoonDroidandCameron Taylor 666b57a1cb Increase scroll camera's height to account for bigger screens. 2025-05-12 12:52:24 -04:00
c77e164513 NOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
Co-authored-by: Hundrec <hundrecard@gmail.com>
2025-05-11 20:23:33 +00:00