cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-09-03 20:28:04 +00:00
Code Issues Releases Wiki Activity
7054 commits 30 branches 30 tags 4.1 GiB
Commit graph

617 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
KarimAkra 99ad45997e Push the strums a bit back to the left 2025-06-13 04:21:21 +03: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
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 79185596c1 Hide the pause button on ending cutscenes 2025-06-12 02:53:42 +03: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
Hundrec e657bc900b
save ALL params grrrrr 
Co-authored-by: Kolo <67389779+JustKolosaki@users.noreply.github.com>
 2025-06-09 08:03:05 +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
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_ 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
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
VioletSnowLeopard 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 e7a460042b
fix the opponent strums being misaligned on wide screens 2025-06-02 07:12:48 +07:00
Lasercar ae2c2db28f fixed success message (also forgor playstate change) 2025-05-30 19:49:00 -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
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
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
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
Super e572c7c2fb Remove FlxG.fixedTimeStep from PlayState 
It's in TitleState now
 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
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
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
KarimAkra 5a39439fcc Align the pause button with the notch 2025-04-17 12:07:17 +03:00
zacksgamerz e4733f9a5c Tune the size for the player strumline a tiny bit. 2025-04-17 12:03:32 +03:00
zacksgamerz 3b3f4543b4 Increased player strumline size by 0.05 percent for the default control scheme. 2025-04-17 01:02:28 +03:00
zacksgamerz d92d3130c8 Fixed opponentStrumline wacky positioning. 2025-04-17 01:02:28 +03:00
zacksgamerz 01cc9f1ae4 Added aspect ratio amplification to opponent's strumline in default controls. 2025-04-17 01:02:28 +03:00
KarimAkra 616004d7f6 move FullScreenScaleMode from flixel.system.scaleModes to funkin.ui 2025-04-17 00:29:45 +03:00
zacksgamerz 45986f34c1 Adjust note hitbox calculations for mobile to be more wide-screen friendly. 2025-04-17 00:27:30 +03:00
zacksgamerz 85330f73a1 Small readability tuning for initNoteHitbox in PlayState. 2025-04-17 00:26:46 +03:00
zacksgamerz 318e73a030 Fixed a small typo in playstate. 2025-04-17 00:26:20 +03:00
zacksgamerz 62acfd8365 Add TODO comment to address touch pointer positioning issue in PlayState 2025-04-17 00:25:56 +03:00
zacksgamerz 7a747993e7 Fixed issues with pixel notes' hitboxes on the default control scheme, adjusted positioning and scaled down the size even further. 2025-04-16 23:32:22 +03:00
KarimAkra a289fb7f54 Fixed common issues with the Pointer Plugin 2025-04-16 16:05:20 +03:00
KarimAkra c636024f75 Fixed pausing in PlayState when fake cutouts are present. 2025-04-16 15:59:28 +03:00
sector-a 0e256021b1 Made note vibrations weaker, removed HAPTIC_VIBRATIONS define, moved vibration option from mobileOptions to options 2025-04-16 15:29:26 +03:00
sector-a ca391c6e32 Add Sustain Note vibration 2025-04-16 15:15:15 +03:00
sector-a 5ae73361b0 Move noteVibrations variable to Strumline and Add Sustain note splash vibration 2025-04-16 15:15:15 +03:00
sector-a 4cee6a9d56 Make Note Vibrations stacked amplitude work as intended 2025-04-16 15:15:15 +03:00
KarimAkra c3ed2019b5 Change System.allowScreenTimeout on state/substate destroy instead of close 2025-04-16 15:10:46 +03:00
KarimAkra ea9938a318 rename DISABLE_ADMOB_ADS to FEATURE_ADMOB_ADS 2025-04-16 15:06:07 +03:00
zacksgamerz f17b9d234c Scale down the strumline size visually but increase the hitbox to be bigger for the default control scheme. Added double note overlap. 2025-04-16 15:03:07 +03:00
sector-a f970ea6acf Move TouchUtil and SwipeUtil to funkin.util 2025-04-16 15:00:02 +03:00
sector-a e3e98dc057 Note vibrations with stackable amplitude 2025-04-16 14:54:31 +03:00
KarimAkra 3e75701c1c Adjust Arrows control scheme notes sizes for easier reading & pressing 
Co-Authored-By: MoonDroid <81515012+moondroidcoder@users.noreply.github.com>
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
 2025-04-16 14:35:28 +03:00
KarimAkra f23a6a8ac8 Adjust notes scale & spacing for Arrows control scheme 
Co-Authored-By: luckydog7 <59097731+luckydog7@users.noreply.github.com>
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
 2025-04-16 13:52:00 +03:00
KarimAkra e9b1800ec9 Improves HapticUtil's code a bit 
Co-Authored-By: Mihai Alexandru <77043862+majigsaw77@users.noreply.github.com>
Co-Authored-By: Karim Akra <144803230+karimakra@users.noreply.github.com>
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
 2025-04-16 00:22:56 +03:00
sector-a bee846ec8c Rename NoteDPad controls scheme to Arrows 
my bad
 2025-04-16 00:09:46 +03:00
KarimAkra 2a6720da2e Added a new "Note DPad" control scheme 
Co-Authored-By: MoonDroid <81515012+moondroidcoder@users.noreply.github.com>
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
Co-Authored-By: luckydog7 <59097731+luckydog7@users.noreply.github.com>
 2025-04-15 22:54:00 +03:00
sector-a 4962d55b22 hide hitbox if game is paused 
forgot something!!!!
 2025-04-15 21:37:29 +03:00
KarimAkra d43dfac3e4 Added vibrations to most ResultState ranks and more! 
* Vibrations for most ranks
* Vibrations when scrolling through FreeplayState
* Vibrations for notes hits
* Vibrations for game over

Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
 2025-04-15 21:37:14 +03:00
KarimAkra 9cf134fc2a Made more menus adapted to wide-screens & fixed some bugs 
* Made stuff on the edge of the screen get moved away by the notch
* Made FreeplayState look better on wide-screens
* Adapted StoryMenuState to wide-screens
* Fixed the transition being small on some screen sizes
* refactored some code
 2025-04-15 21:37:06 +03:00
KarimAkra 7b1abe437f Add proper configuration for AdMob ads 
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
Co-Authored-By: Lily <egzozu.be.bas@gmail.com>
 2025-04-15 21:37:00 +03:00
sector-a 530ca0d929 play video ad after results screen instead of in it 2025-04-15 21:36:49 +03:00
KarimAkra 7babcfaf6b Implement extension-admob for mobile ads 
forgor that

videos and fixed banner size

make this a define

keep thes demo units when using TESTING_ADS only

always enable it on debug builds (?)

Update AdMobUtil.hx

admob features

Update PlayState.hx

Update AdMobUtil.hx

Update AdMobUtil.hx

Show privacy options form if required.

Update Main.hx

Update Main.hx

Update PlayState.hx

Update AdMobUtil.hx

Update AdMobUtil.hx

Update AdMobUtil.hx

Co-Authored-By: Mihai Alexandru <77043862+majigsaw77@users.noreply.github.com>
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
 2025-04-15 21:36:05 +03:00