cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-09-06 14:07:47 +00:00
Code Issues Releases Wiki Activity
7031 commits 30 branches 30 tags 4.1 GiB
Commit graph

1295 commits

Author SHA1 Message Date
Abnormal 4557a681d1 This desync is Pissing me off... I'm the original Starwalker 2025-06-26 00:17:19 -05:00
MoonDroid 74b30c0be4 feat: Properly call pause() on tabbing out, including for conversations and cutscenes 2025-06-24 18:44:27 -04:00
MoonDroid d0ff60ad0a feat: Make cutscene/conversation pauses call the pause function 2025-06-24 18:44:27 -04:00
MoonDroid 1dd6fb8dd4 chore: Use Preferences.autoPause instead of FlxG.autoPause 2025-06-24 18:44:27 -04:00
MoonDroid 2042f3db8a refactor: Rewrite how pause() works in PlayState and adding different modes 2025-06-24 18:44:27 -04:00
Abnormal 7b9bce3b4e fix: Fix pixel strumline being weird as shit on downscroll 2025-06-25 03:56:22 +08:00
anysad dcac362003 bye combomilestone comments 2025-06-23 23:31:06 -05:00
Lasercar 9b06bd6b11 NuN safety 2025-06-23 16:05:43 -04:00
MoonDroid 4ca42c3975 fix: Add missing import 
hi kade
 2025-06-19 17:07:34 +07:00
Abnormal d7c83a5b70 fix a syntax error 2025-06-18 19:53:53 -04:00
Lasercar 4e31003a0f New highscore plays twice fix 2025-06-18 19:53:53 -04:00
zackaryowo ea6cb75b77 A different approach 
Let's just override the original implementation with our own!
 2025-06-18 13:01:16 -07:00
zackaryowo 9bd2c0b13b Fix dialogue hanging bug 
...wait, it's just one line?
 2025-06-18 13:01:16 -07:00
GitRan af716f9273 Allow disabling cool funcitons !! 2025-06-18 13:01:16 -07:00
GitRan 88d0e8c3b0 FunkinTypeText: Account for dialogue text wrapping 2025-06-18 13:01:16 -07:00
Mihai Alexandru 8393c789e2
admob: dont run interstitial ads within the rank bg tween. 
Co-authored-by: Hundrec <hundrecard@gmail.com>
 2025-06-18 17:58:22 +07:00
EliteMasterEric 948030ef1d Fix several null reference issues tied to the Game Over substate. 2025-06-17 17:19:36 -05:00
Kade 8dce8afdfc add shader teehee 2025-06-17 17:13:43 -05:00
kade-github e7c6798f44 remove unused imports 2025-06-17 17:13:43 -05:00
kade-github 5482dee750 Stop everything, kris get the colorTransform 2025-06-17 17:13:43 -05:00
Abnormal f23eddcf2c
forgot vocals aren't included (#1240) 
Co-authored-by: Hyper_ <40342021+NotHyper-474@users.noreply.github.com>
 2025-06-17 18:49:51 +00:00
Abnormal e82b578eb8 fix a crash when returning to the chart editor on release builds 2025-06-16 23:41:45 -05:00
EliteMasterEric 24d1116deb Preload all the graphics of a note style before the song starts, greatly reduces stutters early in the song. 2025-06-16 16:34:07 -07:00
MAJigsaw77 839ff43123 Merge branch 'master' into bugfix/fix-menus-widescreen-alignment 2025-06-14 21:30:03 +03:00
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 99ad45997e Push the strums a bit back to the left 2025-06-13 04:21:21 +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 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 a776ce1a81 stage editor bugfixes + features :D 2025-06-12 00:47:24 -06:00
MoonDroid 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 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 0e24ae911f Fixed instrumentalOffset goofiness :D 2025-06-11 19:24:46 -05:00
zackaryowo c87a39b6c2 Oops, don't need this here 
Thank you @NotHyper-474!
 2025-06-11 19:24:46 -05:00
GitRan 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 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 a0ae4de5e8
mobile: make changing difficulties add to ad counter 2025-06-12 05:29:37 +07:00
Mihai Alexandru bc01d5cffa
fix: audio desync when restarting a video cutscene. 2025-06-12 04:41:01 +07:00
MAJigsaw77 295e6f652e fix: fix gitaroo pause menu on wide screen. 2025-06-11 04:42:33 -06:00
Abnormal cd3b7d7b95 ???????????????????????? 2025-06-11 02:52:05 -06:00
Abnormal 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_ 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 a97acfe18e mobile: move ad banner to the top left. 2025-06-09 01:31:19 -06:00
Hundrec e657bc900b
save ALL params grrrrr 
Co-authored-by: Kolo <67389779+JustKolosaki@users.noreply.github.com>
 2025-06-09 08:03:05 +07:00
Hundrec 277416b6a3
Nudge metadata differently for mobile 2025-06-09 08:00:43 +07:00
Mihai Alexandru e90b74f788
Comment the failed ad banner placeholder code. 2025-06-09 06:53:55 +07:00
MoonDroid 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 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_ eb8d878aeb Prevent vwoosh timer from running outside PlayState 2025-06-06 21:10:03 -04:00
Hyper_ f19ae72b27 Improve vwoosh timer behaviour (no freezing the whole game this time) 2025-06-06 21:10:03 -04:00
Kolo 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
Hundrec 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-a 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 Taylor 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
VioletSnowLeopard 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
Lasercar 5177e1275e Add all tween types 2025-06-04 17:31:26 -04:00
Karim Akra 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 Akra e7a460042b
fix the opponent strums being misaligned on wide screens 2025-06-02 07:12:48 +07:00
Mihai Alexandru ad1021ee33
feature: add a placeholder solid color graphic when a banner advertisement fails to load. 2025-06-02 07:12:16 +07:00
Lasercar ae2c2db28f fixed success message (also forgor playstate change) 2025-05-30 19:49:00 -07:00
EliteMasterEric fc83685b0f Remove a bunch of deprecation warnings 2025-05-28 16:33:10 -07:00
Eric 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 5788d04890 Prevent stacked amplitude from not working and fix hold note end vibration 2025-05-20 10:34:56 -07:00
sector-a 30e9b2fb67 Improve the way note vibrations are handled and tweak hold note vibrations 2025-05-20 10:34:56 -07:00
MoonDroid 666b57a1cb Increase scroll camera's height to account for bigger screens. 2025-05-12 12:52:24 -04:00
Abnormal 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 c8a86d3df8 Add the pressAction method in TouchUtil and use it everywhere it's useful 2025-05-09 12:54:45 -04:00
Eric 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
sector-a c026c104f5 Fix Strumline for the Arrows controls scheme 2025-05-06 18:08:26 -04:00
Eric 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 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 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 3e0dbe2758 performCleanup on reload 2025-04-30 00:43:37 -04:00
thesuperpig56 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 617d5ffa06 Called the wrong character here, whoops! 2025-04-30 00:42:15 -04:00
thesuperpig56 73114e2da6 Avoid crash when restarting song without characters. 2025-04-30 00:42:15 -04:00
EliteMasterEric 0253df7269 Feature flag cleanup 2025-04-30 00:31:31 -04:00
Kolo 31d3718e5c music file priority thing 
(updated a misleading comment, lols!)
 2025-04-29 16:27:21 -04:00
Lasercar 5fdbd23a17 Misses now actually make you miss your grade 
Sustain notes no longer add to the miss tally
 2025-04-29 16:24:50 -04:00
EliteMasterEric 7e62782fa1 Merge branch 'rewrite/master' into funkin-mobile/main 2025-04-28 13:49:40 -04:00
kade-github 19eb138666 vwooshin for retry 2025-04-25 00:32:07 -04:00
EliteMasterEric e21b01aa66 Fix a broken usage. 2025-04-25 00:32:00 -04:00
EliteMasterEric c41c800998 Fix a bug where render distance ignores scroll speed (test on 0.5x scroll speed), then do some code cleanup and documentation. 2025-04-25 00:32:00 -04:00
Eric 1c4b8751b7
Pico Results Screen Easter Egg (#1007) 2025-04-23 16:52:29 -07:00
Kade 0c6b730647 Merge pull request #998 from FunkinCrew/kolo/cap-score-display 
[PUBLIC PR] Cap Score Displays to their biggest possible values
 2025-04-22 19:00:24 -04:00
Kade 273d950899 Merge branch 'rewrite/master' into kolo/cap-score-display 2025-04-22 19:00:24 -04:00
Super e572c7c2fb Remove FlxG.fixedTimeStep from PlayState 
It's in TitleState now
 2025-04-22 19:00:24 -04:00
Kolo 51324e9c28 mmyes 2025-04-22 19:00:24 -04:00
KarimAkra 4d77d21b15 Refactor menus UI positioning for notch size to look cleaner 2025-04-21 01:10:37 +03:00
sector-a 842d1a72a4 DialogueBox tweaks for fullscreen 2025-04-19 23:11:58 +03:00
MoonDroid 53794ab4cc Fix compiling for desktop platforms by adding missing conditionals in some classes. 2025-04-19 16:09:19 +07:00
Abnormal 6a1160feab chore: Enable null safety for 11 classes 2025-04-18 19:35:24 -04:00
KarimAkra 64126a3df5 fixed StickerSubState import on PauseSubState 2025-04-18 17:08:46 +03:00
KarimAkra a7ef5580a4 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into funkin-mobile/main 2025-04-18 14:41:20 +03:00
sector-a 1f22313b8a Force downscroll mode for Arrows controls scheme 2025-04-17 21:33:58 +03:00
sector-a dc000b33eb Add FEATURE_HAPTICS 2025-04-17 19:51:36 +03:00
KarimAkra b6e31e581a Fixed building errors 2025-04-17 14:51:33 +03:00
sector-a fc2e28ab18 Adjust strumline background for Arrows scheme 2025-04-17 13:12:41 +03:00
sector-a b4f30c341e Fix strumline background 2025-04-17 13:12:18 +03:00
sector-a 8bf14b7d0c Scale the dialogue box and speaker on fullscreen 2025-04-17 13:09:44 +03:00
MoonDroid 85e77486f7 Properly fixed the strumline crash and visual bugs for mobile. 2025-04-17 13:06:01 +03:00
MoonDroid 50f467c366 Temporary crash fix for strumlines on mobile. 2025-04-17 13:03:27 +03:00
MoonDroid 2c5c66286a Move admob interstitial trigger from transition to targetState switching in ResultState. 2025-04-17 12:54:10 +03:00
MAJigsaw77 5d26f8b433 Move the banner to top-left and fix some offsets inside the pause menu. 2025-04-17 12:46:10 +03:00
KarimAkra 39313be86b revert things i accidentally comitted 2025-04-17 12:38:15 +03:00
zacksgamerz 7119d6a476 Tune the size of the hitboxes, strums, and incoming notes to be slighlty bigger. 2025-04-17 12:24:45 +03:00
sector-a 1093dd3400 Make pico playable haptics also work for dark and christmas versions 2025-04-17 12:24:29 +03:00
sector-a 3fcc2cc5bc Add unique haptics for each game over animation 2025-04-17 12:22:56 +03:00
sector-a 5d7517b839 Fix sustain notes vibrations for pixel notes 2025-04-17 12:08:23 +03:00
sector-a 1790c13fac Changed vibration at rank tally animation end in results screen 2025-04-17 12:08:13 +03:00
sector-a 180ec17ce3 Prevent sustained vibrations not ending 2025-04-17 12:07:59 +03:00