1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-09-05 05:07:39 +00:00
Commit graph

514 commits

Author SHA1 Message Date
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 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
KarimAkra 5dd26101f2 Added environment config for getting android keystore & admob IDs 2025-04-17 14:22:45 +03:00
sector-a ed5b7fbb31 Do not initialize NewgroundsMedalPlugin if newgrounds feature is disabled 2025-04-17 13:03:27 +03:00
MAJigsaw77 e838fef8e6 Update to extension-haptics and update extension-admob aswell. 2025-04-17 12:55:12 +03:00
sector-a b03eef01ca Add sharpness for vibrations (iOS only) 2025-04-17 12:13:47 +03:00
sector-a 3a084accc9 Force amplitude to be bigger on iOS 2025-04-17 12:06:01 +03:00
sector-a 6b3fb46ae5 Forgot some few vars 2025-04-17 01:03:58 +03:00
zacksgamerz 1a75c094b3 Refactored Tweening for TouchPointerPlugin, and added skipTween argument to removeAll() 2025-04-17 01:02:28 +03:00
Mihai Alexandru 824767af66 Replace the traditional lime Haptics with funkin.haptic
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
2025-04-17 01:01:26 +03:00
sector-a a80e3df799 Add vibrateByPreset method for calling vibrations using VibrationPresets 2025-04-17 00:42:35 +03:00
zacksgamerz b81ff3c136 Fixed an issue where the touch pointer would permanently persist after switching states. Re-arranged imports in TouchPointerPlugin. 2025-04-17 00:38:35 +03:00
zacksgamerz ef35ba759e Added pointer fade out to each individual touch pointer. Changed the color of the touch pointer and added a "screen" blendmode. 2025-04-17 00:32:29 +03:00
zacksgamerz 86d050a11f Refactor swipe threshold calculation to use SwipeUtil across multiple states. 2025-04-17 00:31:19 +03:00
KarimAkra 6a064dc7f7 Fixed an issue with the game looking off on invalid aspect ratios 2025-04-17 00:28:11 +03:00
zacksgamerz cbc3b6c0b5 Enhance documentation and reorganize imports for the TouchPointerPlugin class 2025-04-17 00:25:56 +03:00
zacksgamerz 3e71f12871 Remove unused strength calculation in HapticUtil 2025-04-17 00:25:56 +03:00
zacksgamerz 195e3082df Remove gamepad rumble in HapticUtil since it got reverted in openfl & flixel. 2025-04-16 23:42:51 +03:00
Mihai Alexandru 5d2bd38f72 Attempt to implement controller rumble to HapticUtil
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-16 23:31:49 +03:00
KarimAkra 51b82a0a7c Fixed minor issues with swipes and Pointer Plugin 2025-04-16 16:07:59 +03:00
KarimAkra 8119dcca8e Fixed a tiny mistake in TouchPointerPlugin to make it use the instance variable 2025-04-16 16:05:43 +03:00
KarimAkra a289fb7f54 Fixed common issues with the Pointer Plugin 2025-04-16 16:05:20 +03:00
zacksgamerz 6f9b8f0284 Add TouchPointerPlugin integration and update pointer group initialization 2025-04-16 16:04:58 +03:00
zacksgamerz 46d10ede43 Comment out pointer group addition and fix variable assignments in TouchPointer 2025-04-16 16:04:38 +03:00
zacksgamerz 16884ba28e Implement TouchPointerPlugin and remove old legacy TouchPointer code. 2025-04-16 16:04:22 +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
zacksgamerz 18dcb8f446 Replaced all old flick checks, swipe checks, etc. with the proper checks from Flixel. Updated flixel ref. Removed justFlicked checks as they are unused.
Replace swipeThreshold updates with the one in FlxTouchManager

Temporarily remove swipeThreshold sets for testing.

Proper SwipeUtil refactoring. Completely replaced all flick and movement checks with the one in Flixel. Rewrote most of the documentation to be more accurate.

Invert flick checks as it already comes inverted from FlxFlick.

Define fixes for SwipeUtil

Fixed null safety issues on compiling.
2025-04-16 15:22:10 +03:00
KarimAkra ea9938a318 rename DISABLE_ADMOB_ADS to FEATURE_ADMOB_ADS 2025-04-16 15:06:07 +03:00
sector-a f970ea6acf Move TouchUtil and SwipeUtil to funkin.util 2025-04-16 15:00:02 +03:00
EliteMasterEric 963e2ecd63 Edit RegistryMacro to automatically populate baseGameEntryIds list. 2025-04-15 20:25:18 -04:00
lemz1 14975212a9 macro
registry macro

Merge branch 'lemz1/registry-entry-data' into lemz1/registry-macro-stufff
2025-04-15 20:25:18 -04:00
Hyper_ 3ad14bac32 fix: Double check if events are the same when doing indexOf
This is basically copy-pasted from SongNoteDataArrayTools lol
2025-04-15 19:47:39 -04: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
KarimAkra e5f3223e76 Refactor FullScreenScaleMode
Co-Authored-By: Mihai Alexandru <77043862+majigsaw77@users.noreply.github.com>
Co-Authored-By: Karim Akra <144803230+karimakra@users.noreply.github.com>
2025-04-15 23:50:40 +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
KarimAkra 193d293dea Added HapticUtil and some vibrations to some menus & scenes!
Added vibrations to:

* TitleState on beat hits during into
* Freeplay when a new rank is slammed to the capsule
* Some vibrations on ResultState (such as when the tally counter increases...)

Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
2025-04-15 21:36:54 +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
KarimAkra ad4b1ce51b Adjusted freeplay to work on wide-screens
fixed some backing cards and the capsule ranking position
2025-04-15 21:34:00 +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
Cameron Taylor 0d5b7d4ed4 also conditional for WindowUtils.setVSyncMode() for mac 2025-04-14 23:27:34 -04:00
kade-github 3944816021 Error handling from wiki 2025-04-14 21:42:24 -04:00
kade-github db00feff93 Vsync does work now 2025-04-14 21:42:24 -04:00
EliteMasterEric 1ee8246b48 Added a preference to enable VSync. 2025-04-14 21:40:58 -04:00
EliteMasterEric 01bf3bee11 Dropping hold notes should no longer cost health by default. 2025-04-14 19:32:55 -04:00
EliteMasterEric b00589367c Make hold drop penalty threshold match the hit window. 2025-04-14 19:32:55 -04:00
EliteMasterEric 577421a782 Scoring rework: Penalize the player (deducting health and score) for dropping a hold note before it's finished. 2025-04-14 19:32:54 -04:00
EliteMasterEric 72e9fb641e Scoring rework: Reduce health given by hold notes by 20%. 2025-04-14 19:32:16 -04:00
EliteMasterEric 550bf95c76 Split miss penalty and ghost miss penalty into two variables (but make them equal for now). 2025-04-14 19:32:16 -04:00
EliteMasterEric 6390725ef0 Redo data format for sticker packs to make it simpler and allow for song-specific selections. 2025-04-14 19:25:42 -04:00
Cameron Taylor 36997e8b30 variations loading via fnfc fix in progress 2025-03-27 18:00:24 -04:00
EliteMasterEric 0bc938d0fa Implement support for Newgrounds Events 2025-03-27 15:49:09 -04:00
EliteMasterEric 96e29b7921 Tweaks to medals and leaderboards (split Erect/character remixes, fix test medals not working etc) 2025-03-27 15:48:53 -04:00
Cameron Taylor fa5a80df08 screenshot plugin fix for high dpi / larger window sizes 2025-03-24 17:42:35 -04:00
Lasercar e51b6147b5 unused code removed and comment cleanup 2025-03-24 17:32:49 -04:00
Lasercar 2a9712466e Fixed cursor & preview not being reset for state changes 2025-03-24 17:32:49 -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 5c47ed4a8c Set screenshotBeingSpammed to false after state change
Because the timer has been killed
2025-03-24 17:32:49 -04:00
Lasercar 6e4e7008f2 another whoops 2025-03-24 17:32:49 -04:00
Lasercar 79e31636e2 Save unsaved screenshots in buffer before state change 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 e30e6ee4ed comment cleanup 2025-03-24 17:32:49 -04:00
Lasercar bab920dc82 comment typo 2025-03-24 17:32:49 -04:00
Lasercar ab2dd75986 now it's actually asynchronous
Though with the caveat of unsaved screenshots not being saved after state change
2025-03-24 17:32:49 -04:00
Lasercar a8440062b8 fixed duplicate screenshot handling code 2025-03-24 17:32:49 -04:00
Lasercar 824cf7cf1b frame delayed screenshots + timer'd screenshot save 2025-03-24 17:32:49 -04:00
Lasercar 65786d8f1c small fix 2025-03-24 17:32:49 -04:00
Lasercar bcd29b5d67 idk 2025-03-24 17:32:49 -04:00
Lasercar 95847440b5 didn't reverse my test of the JPEG encoder 2025-03-24 17:32:49 -04:00
Lasercar c776900df0 screenshot options 2025-03-24 17:32:49 -04:00
Lasercar fc9b395138 forgot to uncomment the bit making the async loop null 2025-03-24 17:32:49 -04:00
Lasercar 7b54292bf7 another whoops 2025-03-24 17:32:49 -04:00
Lasercar 4ef0c18212 idk 2025-03-24 17:32:49 -04:00
Lasercar 8e4f9fe66b forgot a thing 2025-03-24 17:32:49 -04:00
Lasercar 92b24b91e7 asynchronous screenshot buffer saving 2025-03-24 17:32:49 -04:00
Lasercar 0db0d88256 Show a preview of last image in the image buffer 2025-03-24 17:32:49 -04:00
Lasercar 535ff2211a Popup no longer shows up in screenshots 2025-03-24 17:32:49 -04:00
Lasercar f7329e0687 Improved? screenshotting 2025-03-24 17:32:49 -04:00
Lasercar 868932cd13 screenshot preview in screenshot fix 2025-03-24 17:32:49 -04:00
Cameron Taylor 6b9e6c9ebc holdnotecover implementation stuff 2025-03-11 23:17:29 -04:00
Cameron Taylor 0a911ae607 remove a buncho unused imports 2025-02-17 19:25:33 -05:00
fabs db39b19e79 resolved merge conflicts with ReflectUtil 2025-01-27 22:36:43 +00:00
fabs a6388962dd Merge branch 'public-develop' into rewrite/master 2025-01-27 22:31:38 +00:00
EliteMasterEric 5e939bd769 Fix more build issues. 2025-01-23 19:19:05 -05:00
EliteMasterEric 0b309403e0 Fix compile error 2025-01-23 18:22:58 -05:00
EliteMasterEric c232224f04 Added more functions to ReflectUtil, and made it so importing Reflect imports it instead of throwing an error. 2025-01-23 18:16:30 -05:00
Abnormal 62166554e7
Add 6 more functions to ReflectUtil (#4019) 2025-01-23 17:21:46 -05:00
Abnormal ad45b72b1a
Update Constants.hx (#3853) 2025-01-17 15:45:01 -05:00
Abnormal e73be4a2b3
Update ReflectUtil.hx (#4008) 2025-01-17 14:46:53 -05:00
Abnormal 8188b19622 more reflectutil additions (#3809) 2025-01-17 12:17:48 -05:00
Abnormal 250f01f207 add setField (#3622) 2025-01-17 12:17:48 -05:00
Abnormal b5d95d59ff
more reflectutil additions (#3809) 2025-01-16 20:13:59 -05:00
Abnormal 9f23a7c54c
add setField (#3622) 2025-01-16 20:13:40 -05:00
EliteMasterEric 4554487ded Fix a build issue with HTML5 2025-01-16 14:37:18 -05:00
EliteMasterEric 04a7007f6e Move Tracy debug message into trace() 2025-01-13 14:33:21 -05:00
EliteMasterEric 6efd8b122f Fix an issue with the medal entry sound 2024-12-17 10:38:00 -05:00
CheemsAndFriends 65dc9d487d conditional for release with debug functions 2024-11-23 15:19:48 -05:00
Cameron Taylor a356e6e520 properly persist medal icons across states 2024-11-14 17:24:39 -05:00
CheemsAndFriends 673b4f8a6b Implement StartGame and FridayNight 2024-11-14 17:24:39 -05:00
EliteMasterEric e974718947 Disallow scripts from messing with medals.
Some cleanup and readd support for fetching URLs on web builds.

Link the missing medals

base64 medal stuff, and some debug crap

remove trace crap

update assets stuff

assets stuff

newgrounds username on titlescreen and replace things with NG.core instead of our own client singleton
2024-11-04 15:05:33 -05:00
CheemsAndFriends df094f15cf Medal stuff 2024-11-04 15:05:33 -05:00
EliteMasterEric 24ad7f4a39 Remove unused custom type resolver. 2024-10-18 19:11:27 -04:00
Kolo 0a5419d7fc the stage editor shit 2024-10-10 13:28:00 -04:00
Victor G 0d60929f18
Fix window not closing when specified 2024-10-05 21:24:24 +02:00
Burgerballs 165ad60155 fix: center preloader 'fnf' and 'dsp' text so it doesn't clip anymore 2024-10-04 12:09:33 -04:00
Cameron Taylor 29b6763290 fix(debug): no more fullscreening when typing "F" in the flixel debugger console 2024-10-03 22:49:07 -04:00
Cameron Taylor 7a3d983bba Merge branch 'feature/discord-rpc-resurrected' into rewrite/master 2024-09-27 17:47:59 -04:00
Cameron Taylor db0944712d Merge branch 'rewrite/master' into bugfix/mod-dev-fixes 2024-09-27 17:27:59 -04:00
EliteMasterEric 5630e74584 Rework Freeplay variation handling... again. 2024-09-27 14:26:08 -04:00
EliteMasterEric 378179d1f7 Change crash keybind to Ctrl-Alt-Shift-L 2024-09-27 12:20:36 -04:00
EliteMasterEric 8d02a3f984 A bunch of controls fixes 2024-09-25 08:39:57 -04:00
Cameron Taylor 78d0ad9956 Merge remote-tracking branch 'origin/feature/tracy' into rewrite/master 2024-09-23 17:41:01 -04:00
EliteMasterEric 52f5c24f96 Add frame market support, and enable on demand tracing. 2024-09-23 16:09:34 -04:00
Cameron Taylor 252b87c451
Merge pull request #763 from FunkinCrew/feature/tracy
Add Tracy support for performance profiling
2024-09-23 15:03:33 -04:00
Cameron Taylor e3a13bee8c
Merge pull request #773 from FunkinCrew/process-cleanup
close sys.io.Process stuff when we're done with them
2024-09-20 00:24:10 -04:00
EliteMasterEric 35aa8731d0 Better status messages, buttons, updated album art, basic chart editor support 2024-09-19 11:13:05 -04:00
Eric d81e09b1c3
Merge branch 'rewrite/master' into abnormalpoof/opening-urls 2024-09-19 03:46:46 -04:00
Cameron Taylor 472d41a893 close sys.io.Process stuff when we're done with them 2024-09-18 16:15:10 -04:00
EliteMasterEric 119148acf0 Define for enabling/disabling log trace 2024-09-18 02:11:31 -04:00
AbnormalPoof aae7dcdada fix crash when opening urls 2024-09-16 23:35:23 -05:00
EliteMasterEric 9f3af1ab94 Add a separate Gold Perfect animation for modders 2024-09-14 20:56:21 -04:00
Cameron Taylor af31be5436 makeship linky 2024-09-12 20:14:48 -04:00
Cameron Taylor 22b1a5d9c0 Merge branch 'rewrite/master' into feature/char-unlock-merging 2024-09-10 23:52:52 -04:00
FabsTheFabs 34e93fa95a color util (with just one function lol) 2024-09-10 07:25:11 +01:00
CheemsAndFriends 35af057f88 Fix scaleY not parsing 2024-09-09 17:41:25 +02:00
CheemsAndFriends 6961e6cc63 Add a buncho Gizmos 2024-09-09 08:23:46 +02:00
EliteMasterEric 7511de1e7a A bunch of Freeplay visual fixes 2024-09-01 03:28:56 -04:00
EliteMasterEric 382af3b485 Reimplement ghost tapping (disabled via compile define) 2024-08-28 05:42:14 -04:00
EliteMasterEric 200b3c963b Updated compile defines to use feature flag system 2024-08-26 18:01:36 -04:00
Cameron Taylor 5756eff7cf dont need null check, we just need to declare string type 2024-08-21 16:39:34 -04:00
Cameron Taylor e1d8e758bb completion server fixin? 2024-08-21 16:31:10 -04:00
anysad d3209e57b7 goodbye scripts, hello notestyles! 2024-07-28 02:34:12 -04:00
Cameron Taylor 5a26ece9d6
Merge branch 'rewrite/master' into gamerbross/chart-reload-f5 2024-07-11 19:59:15 -04:00
Eric 71947c581e
[PUBLIC PR] Fix a bug where the memory counter would overflow into the negatives (#662)
* get Float instead of Int in cpp (Float is 64-bit in so it works easier than Int64)

* use Math.fround instead of Math.round

---------

Co-authored-by: Karim Akra <144803230+KarimAkra@users.noreply.github.com>
2024-07-11 19:35:41 -04:00
gamerbross 7b9e4a0542 Fix F5 chart not reloading 2024-07-11 03:41:51 -04:00
Cameron Taylor a92334d5ae Merge branch 'rewrite/master' into char-select-cherrypick 2024-07-08 16:23:32 -04:00
Cameron Taylor 67b1c3864e Merge branch 'rewrite/master' into feature/character-anim-fixes 2024-07-04 15:07:07 -04:00
Cameron Taylor a7cfae8545 mer 2024-07-04 14:48:24 -04:00
FabsTheFabs 28068b1a86 updating more stuff 2024-07-01 22:17:55 -04:00
EliteMasterEric 84dd1cd3b9 Fix several character animation issues 2024-06-28 22:29:59 -04:00
Cameron Taylor 81cada675c fix for release, no bf printing directly to stdout! 2024-06-24 14:40:55 -04:00
EliteMasterEric 9b3a748f37 Working Pico DJ 2024-06-20 16:17:53 -04:00
EliteMasterEric 263039f52c Make Boyfriend DJ animations data driven 2024-06-18 20:07:27 -04:00
EliteMasterEric 60e741434c Implemented playable character registry, added Freeplay character filtering, added alt instrumental support 2024-06-18 17:56:24 -04:00
Cameron Taylor 817c216d06
Merge pull request #617 from FunkinCrew/bugfix/save-highest-rank
[FUNK-387] Save high scores and high ranks separately.
2024-06-11 12:04:38 -04:00
EliteMasterEric b30faad7d9 Save high scores and high ranks separately. 2024-06-11 00:40:43 -04:00
EliteMasterEric 09aa8fbf52 Rebindable controls for the Freeplay menu 2024-06-09 02:22:03 -04:00
Cameron Taylor 3aa3007dbb Merge branch 'fix-url-open' into rewrite/master 2024-06-06 20:12:28 -04:00