1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-09-03 20:28:04 +00:00
Commit graph

180 commits

Author SHA1 Message Date
MoonDroid 9e3efc0de7 fix: Prevent options back-queuing 2025-06-19 22:09:44 +07:00
MoonDroid fc82b79c9a fix: Prevent back queueing in Options 2025-06-19 17:08:50 +07:00
Lasercar 4819a74c29 Charselect remember character 2025-06-16 16:08:17 -04:00
MAJigsaw77 a69e08e986 Merge branch 'master' into back-button-tweaks 2025-06-14 22:06:18 +03:00
Abnormal e8cd87c1f1 Add FEATURE_NAUGHTYNESS and turn it off for mobile builds 2025-06-13 21:16:41 -04:00
MoonDroid 1b7dc5f1ac fix: Make backing out of options instant 2025-06-13 09:45:55 +07:00
EliteMasterEric de0a56ec95 Temporarily disable the input offsets feature until we get it fully functioning again. 2025-06-11 20:15:55 -07:00
Abnormal 70f0a54191 feat: Options Menu scrolling 2025-06-10 08:57:55 -07:00
MoonDroid b0f4a075b5 fix: Tweak back button position in Preferences 2025-06-10 17:15:12 +07:00
MoonDroid 031f888a25 Remove debug display, pause on unfocus, and FPS from Mobile 2025-06-10 17:14:52 +07:00
MoonDroid bc94a5a6ac fix: Remove control schemes and add back button into Options 2025-06-10 17:13:56 +07:00
Mihai Alexandru eec304f42f
mobile: add RESTORE PURCHASES button on the options menu. 2025-06-09 05:41:16 +07:00
Mihai Alexandru 5057f3d1de
Merge pull request #1147 from FunkinCrew/fix/menu-cleanup
[MOBILE] Small menu fixes for mobile release
2025-06-08 21:32:55 +03:00
MoonDroid d432e086cc Merge branch 'master' into mobile-pause-plus-back 2025-06-08 20:19:01 +07:00
MoonDroid f2280b1c0f fix: Move the backbutton correctly to the bottom right, remove forced color 2025-06-08 19:22:46 +07:00
fabs dc04ff23d7 move back button + swap class names 2025-06-08 04:09:20 +01:00
MoonDroid 262c4fb9a1 chore: Moved haptics preference option up 2025-06-07 22:24:40 +07:00
JackXson-Real 1d9e34359c OptionsState now remembers selection 2025-06-06 17:21:54 -07:00
sector-a fabc16d265
Add haptics preference 2025-06-06 04:10:25 +07:00
MoonDroid 4081f329d2 chore: Remove test purchase flow from OptionsState 2025-06-04 23:42:14 +07:00
EliteMasterEric a62d2b94a9 Fix several merge conflicts causing builds to fail. 2025-06-01 18:33:34 -04:00
Hundrec be7313453f Make it 500, actually 2025-05-30 19:47:24 -07:00
Hundrec c9c284787e Raise max fps cap to 360 2025-05-30 19:47:24 -07:00
Eric 93e4f799f4
Remove JPEG (#1065)
Co-authored-by: Lasercar <64717068+Lasercar@users.noreply.github.com>
2025-05-30 19:46:34 -07:00
Hyper_ 0b7a94b1cc Remove V-Sync option from in PreferencesMenu on web builds 2025-05-30 19:43:26 -07:00
MAJigsaw77 24e535c90a Update extension-admob. 2025-05-10 10:19:53 -07:00
MAJigsaw77 83d198493c Implement IAP on iOS.
Co-Authored-By: MoonDroid <zdgzackda@gmail.com>
2025-05-06 18:08:26 -04:00
sector-a e9b1d5fc04 Make downscroll unavailable if Arrows scheme is selected 2025-05-06 18:08:26 -04:00
sector-a 13a2b192b9 Add available to menu items 2025-05-06 18:08:26 -04:00
KarimAkra fffea09270 Chore: rename Desktop with Native in places where the stuff apply for both Mobile & Desktop 2025-05-06 18:08:26 -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
MoonDroid 53794ab4cc Fix compiling for desktop platforms by adding missing conditionals in some classes. 2025-04-19 16:09:19 +07:00
MAJigsaw77 b755ed8d98 Implement extension-iapcore and testing for it. 2025-04-18 18:28:09 +03:00
KarimAkra e78d3ecf8f remove VSync option from mobile 2025-04-18 14:47:56 +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
Cameron Taylor ee906ae8c0 fix: make the sound tray volume be less loud (#990) 2025-04-17 19:59:59 -04:00
Kade 7eebce432d [PUBLIC PR] Prevent softlock caused by removing all keybinds for a UI control (#988)
* prevent removing last keybind for UI controls

* add popup to alert you cannot remove keybind

* ensure controls list is unique

* Use public submodule URLs (would be nice if this was automatic but oh well)

---------

Co-authored-by: VioletSnowLeopard <ngzeretzke@gmail.com>
Co-authored-by: EliteMasterEric <ericmyllyoja@gmail.com>
2025-04-17 19:59:59 -04:00
sector-a 4d88df2120 Don't create Launch in Fullscreen preference item on mobile 2025-04-17 20:37:43 +03:00
sector-a dc000b33eb Add FEATURE_HAPTICS 2025-04-17 19:51:36 +03:00
sector-a 995f6c5adb Do not create screenshot options if FEATURE_SCREENSHOTS is disabled 2025-04-17 13:11:57 +03:00
MAJigsaw77 97f8de0de4 Fixed notch position with createPrefItemEnum. 2025-04-17 13:03:27 +03:00
sector-a 418f7d71f9 Small fixes 2025-04-17 13:03:27 +03:00
sector-a ff144cf30b Fix a typo in options desc 2025-04-17 12:49:17 +03:00
KarimAkra e197b7325a Fixed the Preferences Menu options not aligning correctly on notched displays 2025-04-17 00:33:07 +03:00
Mihai Alexandru 5c0de03a74 Adjust the preferences options x to follow the cutout. 2025-04-17 00:31:18 +03:00
sector-a 64877bc999 Rename MobileControlsSchemeMenu to ControlsSchemeMenu 2025-04-16 23:41:11 +03:00
Kolo 855deb5828 set enabled when prompt gone 2025-04-16 16:06:39 -04: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 f970ea6acf Move TouchUtil and SwipeUtil to funkin.util 2025-04-16 15:00:02 +03:00
sector-a 4b797d3526 allow input offset on mobile and gameover input delay 2025-04-16 13:39:04 +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 9dc48978f8 Massive Touch Controls Overhaul
Co-Authored-By: MoonDroid <81515012+moondroidcoder@users.noreply.github.com>

This overhaul includes:

* Flicks on menus
* Changing options by sliding the finger over screen
* Changing options by pressing the option itself
* Touch Pointers
* And more!

Co-Authored-By: MoonDroid <81515012+moondroidcoder@users.noreply.github.com>
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
2025-04-15 21:36:28 +03:00
KarimAkra 944141292d Move part of the code from the old repository
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
Co-Authored-By: mcagabe19 <egzozu.be.bas@gmail.com>
Co-Authored-By: Mihai Alexandru <77043862+majigsaw77@users.noreply.github.com>
Co-Authored-By: MoonDroid <81515012+moondroidcoder@users.noreply.github.com>
Co-Authored-By: luckydog7 <59097731+luckydog7@users.noreply.github.com>
2025-04-15 21:32:39 +03:00
kade-github 7e90423495 Pre-Processor to disable VSync on MacOS 2025-04-14 23:27:34 -04:00
kade-github 6e2a077d6b Fixes from merge 2025-04-14 21:42:22 -04:00
EliteMasterEric 1ee8246b48 Added a preference to enable VSync. 2025-04-14 21:40:58 -04:00
Cameron Taylor c394520019 small cleanups / tidying of FunkinSoundTray.hx 2025-04-10 18:43:54 -04:00
Cameron Taylor 2d93baf968 properly save mute preferences by doing the save on show() in the soundtray 2025-04-10 18:43:54 -04:00
Cameron Taylor 52be941b45 Auto Pause -> Pause on Unfocus (was changed before but prob bad merge somewhere reverted it?) 2025-04-02 13:55:54 -04:00
EliteMasterEric 0d8b04dd56 Add an option to destroy save data in the options menu. 2025-03-30 19:17:08 -04:00
Cameron Taylor 6e463e0188 debug: add simple result screen debug mode 2025-03-25 14:48:31 -04:00
Cameron Taylor 319419c541 refactor: refactor some of the Page menu handling out of OptionsState 2025-03-24 19:20:25 -04:00
Lasercar e9891c4d00 Fancy preview is back!
Also now saves on window close/crash.
Also standardised the option descriptions.
2025-03-24 17:32:49 -04:00
Lasercar 8fcd145d53 Option to only show the preview when a screenshot is saved
Enabled by default, the idea is that the less tech savy players won't bother changing the option to false and end up reporting that they lost screenshots after changing states
2025-03-24 17:32:49 -04:00
Lasercar c776900df0 screenshot options 2025-03-24 17:32:49 -04:00
EliteMasterEric 4e05d16cb6 Merge branch 'public-develop' into public-develop-merge 2025-03-10 20:46:33 -04:00
EliteMasterEric 87b1fc92f8 Renamed the new controls (I had to edit the margins to make the name fit) 2025-02-17 23:25:09 -05:00
Abnormal 36df61ba9e the checkbox is now grouped together with the rest 2025-02-17 21:29:18 -05:00
Abnormal ee53ccd327 feat: Add a setting that automatically launches the game in fullscreen 2025-02-17 21:29:18 -05:00
Cameron Taylor 0a911ae607 remove a buncho unused imports 2025-02-17 19:25:33 -05:00
Abnormal 9b774e3264 format a few files 2025-02-14 18:13:05 -05:00
fabs a6388962dd Merge branch 'public-develop' into rewrite/master 2025-01-27 22:31:38 +00:00
anysad a17b0e8b3c
[ENHANCEMENT] Preference Descriptions + Other Tweaks (#3872)
* updated preference menu

* update comment
2025-01-17 14:47:47 -05:00
EliteMasterEric 1212c694e8 Add a new option to put a transparent background on the strumline 2024-11-23 14:42:46 -05:00
EliteMasterEric b75a550c5b Nice little login prompt for desktop users. Scores/medals work nicely 2024-11-04 15:05:33 -05:00
EliteMasterEric e9e639500a Newly revamped Newgrounds integration, with working medals and leaderboards 2024-11-04 15:05:33 -05:00
lemz1 b2647fe09f fix: disable flickering when changing FPS in the options menu 2024-10-10 13:01:39 -04:00
Kn1ghtNight e66290c55f fix: anti alias / smooth the volume sound tray 2024-10-08 14:29:03 -04:00
EliteMasterEric 8d02a3f984 A bunch of controls fixes 2024-09-25 08:39:57 -04:00
Cameron Taylor 073dbaa023 Merge remote-tracking branch 'origin/bugfix/input-offsets-crash' into rewrite/master 2024-09-23 18:48:22 -04:00
EliteMasterEric 0bf1bead03 Fix some issues causing the Input Offsets view to crash on web. 2024-09-22 12:14:15 -04:00
EliteMasterEric c7238fcfd1 Stop the volume tray from hiding as long as the game is muted 2024-09-22 00:45:30 -04:00
EliteMasterEric 29a7005d8a Fix a bug where you can hear the game a little when setting the volume to 0 ticks 2024-09-22 00:44:57 -04:00
Cameron Taylor d02e834460 Merge branch 'rewrite/master' into abnormalpoof/assets-getpath 2024-09-20 18:13:13 -04:00
EliteMasterEric 1beb21e57a Replace all instances of openfl/lime Assets with funkin.Assets 2024-09-18 05:04:32 -04:00
EliteMasterEric 7b7d5deed5 Tweaks to framerate preference 2024-09-18 03:13:21 -04:00
lemz 224d930ae6 Update PreferencesMenu.hx 2024-09-17 00:17:56 +02:00
lemz e7674ec31c
Merge branch 'develop' into fps-setting 2024-09-17 00:13:49 +02:00
Cameron Taylor 721cecd271 add preference option for framerate capping 2024-09-12 15:38:44 -04:00
Cameron Taylor e2c287e112 logarithmic volume control 2024-09-09 13:01:19 -04:00
Cameron Taylor d423753de0
Merge branch 'rewrite/master' into flooferland/new-settings-types 2024-07-11 19:48:51 -04:00
AppleHair 34a19ef583 [BUGFIX] Fixed cancelMenu sound not playing after switching state. 2024-07-10 18:08:55 -04:00
lemz 927e37b35b use new numberpreferenceitem 2024-07-02 17:18:46 +02:00
FlooferLand! fbc78adb65 Added new settings items 2024-07-01 15:41:08 -04:00
lemz f3e04114eb use new offsets 2024-06-25 17:05:15 +02:00
lemz 3b3b9d97ba use different implementation 2024-06-23 21:03:30 +02:00
lemz e3159745fb
Merge branch 'develop' into fps-setting 2024-06-13 09:02:27 +02:00
EliteMasterEric 09aa8fbf52 Rebindable controls for the Freeplay menu 2024-06-09 02:22:03 -04:00
lemz e46108fa15
Merge branch 'develop' into fps-setting 2024-06-08 13:03:45 +02:00