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
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
KarimAkra b1b30ed09f Formatted some code for freeplay & fixed strumlines position on wide-screens 2025-04-15 21:35:19 +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
EliteMasterEric 4d9638f0ac Fix the clamping. 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 429f6f9bc0 Remove the unused input splitter. 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 9f3711bf43 Scoring rebalance: Misses are now worth -250 points (up from -10). 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
Abnormal 5be4f3bbb9 chore: Remove ComboMilestone 2025-04-14 15:28:14 -04:00
Cameron Taylor 62621881c0 data -> data.score 2025-04-02 16:18:58 -04:00
EliteMasterEric 17a4be66b9 Fix highscores not submitting to the website unless they are a personal best. 2025-04-02 13:33:06 -04:00
EliteMasterEric 54cd52db76 Fix an issue where story mode medals would not be awarded without a personal best. 2025-04-02 13:33:06 -04:00
EliteMasterEric e5e3453c1f Add Stress Pico + Char Select medals, and fix medals to work on release builds 2025-03-30 21:59:17 -04:00
EliteMasterEric 0bc938d0fa Implement support for Newgrounds Events 2025-03-27 15:49:09 -04:00
Lasercar 9c2ef02368 NuN GF 
Adds a none/null option for the character selector dropdown
Also fixes a few null references that happen when one or both characters are null in the playstate
 2025-03-24 15:00:01 -04:00
EliteMasterEric febe5e84a2 Don't display the rank animation in Freeplay if Practice Mode or Bot Play Mode were enabled. 2025-03-20 15:13:32 -04:00
EliteMasterEric d7c3b64e02 Disable note inputs when the song is over. 2025-03-20 15:13:32 -04:00
Cameron Taylor a72fce14d1 Merge branch 'public-develop' into rewrite/master 2025-03-17 22:20:28 -04:00
Lasercar e83b88d320 I'm so done with this stupid bug 
Eric wuz here!
 2025-03-17 06:44:21 -04:00
Kolo 3667c51c1e prevent unnecessary resync 2025-03-17 06:19:54 -04:00
Lasercar ea93ec90cb Fix strumline offset when downscroll 2025-03-15 13:20:39 +10:00
EliteMasterEric 6b404c4fcf Don't award Friday Night medal just for logging in, you have to beat a song. 2025-03-10 20:47:06 -04:00
EliteMasterEric 7231b3f645 New chart event: Set the character's health icon. 2025-03-07 21:56:44 -05:00
Cameron Taylor 6e55bcfc77 fixing for loading .fnfc files 2025-03-06 18:09:13 -05:00
fabs a6388962dd Merge branch 'public-develop' into rewrite/master 2025-01-27 22:31:38 +00:00
Kade 785c4be88b
[ENHANCEMENT] [MODDING] Several QOL modding changes (#4009) 
* Custom render distance strumline

* Custom note positions

* Custom vertices for holds

* Song Retry Event

Song retry event for pausesubstate.hx
Song retry event for playstate.hx
Song retry event for stage.hx
Song retry event for bopper.hx
Song retry event for song.hx
Scripted class event
Module event

* this should be cast

* Show notesplash toggle

* Formatting and EOF
 2025-01-17 15:37:00 -05:00
Til 22d41d21b8
i think this does it (#3955) 2025-01-17 15:33:16 -05:00
Til 19023645df use event.isComboBreak instead of isComboBreak (#3936) 2025-01-17 12:17:48 -05:00
Til 3aad825f86
use event.isComboBreak instead of isComboBreak (#3936) 2025-01-16 19:41:04 -05:00
EliteMasterEric 04a7007f6e Move Tracy debug message into trace() 2025-01-13 14:33:21 -05:00
EliteMasterEric e9e639500a Newly revamped Newgrounds integration, with working medals and leaderboards 2024-11-04 15:05:33 -05:00
Cameron Taylor 144ba00377 refactor: remove commented out code from draw() in PlayState.hx 2024-10-26 15:53:22 -04:00
Cameron Taylor 7159cad2c1 style: remove a buncho unused imports from PlayState.hx 2024-10-26 15:51:38 -04:00
EliteMasterEric a4ed55721f Fix duplicate combo counter on combo break 
Co-authored-by: Eric <ericmyllyoja@gmail.com>
Co-authored-by: Hundrec <hundrecard@gmail.com>
 2024-10-04 08:09:18 -04:00
Kolo 410cfe972d fix: fix the user song offsets being applied incorrectly 2024-10-03 21:25:34 -04:00
Victor G 45a5160b06 Fix PlayState compilation crashes 2024-10-03 21:25:34 -04:00
Cameron Taylor 7a3d983bba Merge branch 'feature/discord-rpc-resurrected' into rewrite/master 2024-09-27 17:47:59 -04:00
Cameron Taylor fb1b3cc1cd Merge branch 'bugfix/week-7-pico-stress' into rewrite/master 2024-09-27 17:00:54 -04:00
Cameron Taylor 9a57762a9c Merge remote-tracking branch 'origin/bugfix/web-screenshots' into rewrite/master 2024-09-27 16:56:12 -04:00
EliteMasterEric c4ed31b246 Fix a bug where force-ending a song could occasionally try to draw destroyed sprites. 2024-09-27 02:52:01 -04:00
EliteMasterEric 67126b33fa Suppress some spammy log calls 2024-09-25 10:02:18 -04:00
EliteMasterEric 998bbb213a Merge branch 'rewrite/master' into nebulazorua/classic-camera-fix 2024-09-25 08:48:20 -04:00
EliteMasterEric 8d02a3f984 A bunch of controls fixes 2024-09-25 08:39:57 -04:00
EliteMasterEric 5693d626b5 Update so that album art works. 2024-09-25 03:58:43 -04:00
Cameron Taylor 1c2a403dea Merge branch 'rewrite/master' into kadedev/fix-audio-offsets 2024-09-23 13:07:32 -04:00
EliteMasterEric 6c743b3b89 Remove some spammy trace calls. 2024-09-21 20:33:51 -04:00
EliteMasterEric 2c73b241e8 Rework offset+vocal sync handling to fix the "Swing Mode" bug 2024-09-21 06:33:47 -04:00
Kade f9186b67a7
less tolerance 2024-09-19 17:00:52 -07:00
Kade a8aeae4f7f
do not include offset in vocal (they're offset by inst) 
Fix a tiny little issue with vocal resync @ start
 2024-09-19 14:26:18 -07:00
Kade 4d73e0cc47
fix some interesting issues with this 
redundant trace removal
 2024-09-19 14:26:18 -07:00
Kade b03c8a9cf8
Limit the song time to 0 and the songs max length 
use the new bool to tell if we should start the song

add a public static bool to countdown: finished
 2024-09-19 14:26:18 -07:00
EliteMasterEric 35aa8731d0 Better status messages, buttons, updated album art, basic chart editor support 2024-09-19 11:13:05 -04:00
EliteMasterEric 8fd84f9d13 Functioning Discord Rich Presence! 2024-09-19 10:03:16 -04:00
EliteMasterEric b5ed7f40d4 Remove redundant character type assignment 2024-09-18 05:24:57 -04:00
Cameron Taylor 33aaabe190 lil console command helper for camera zoom 2024-09-05 01:22:45 -04:00
Cameron Taylor 930f5ff5a6 Merge branch 'feature/instrumental-select-hud' into rewrite/master 2024-09-03 11:25:34 -04:00
EliteMasterEric 89402f8bb8 Fix a bug where Bot Play could miss (via lag or the player mashing) and lose the song. 2024-08-28 05:47:34 -04:00
EliteMasterEric 382af3b485 Reimplement ghost tapping (disabled via compile define) 2024-08-28 05:42:14 -04:00
EliteMasterEric 469ff6690f Fix a crash when skipping in the song before it started. 2024-08-28 05:40:50 -04:00
EliteMasterEric 200b3c963b Updated compile defines to use feature flag system 2024-08-26 18:01:36 -04:00
Eric f5826e3a35
Merge branch 'rewrite/master' into applehair/storymode-valid-variation 2024-08-12 14:37:15 -04:00
Cameron Taylor e105f933ac Merge branch 'rewrite/master' into anysad/custom-countdowns 2024-08-09 23:00:03 -04:00
AppleHair eb78b754f8 A fix requested by Eric 2024-07-29 18:34:59 -04:00
AppleHair bef2e98222 [BUGFIX] Ensure the variation used for the next song is valid. 
When playing in story mode, `PlayState` assumes all the songs use the same variation, which is usually true, but not guaranteed. This PR makes `PlayState` use the `getFirstValidVariation` method to find the valid variation instead of using the `currentVariation` variable, which might not be valid.
 2024-07-29 18:34:59 -04:00
Cameron Taylor f1af005cf3 Merge branch 'rewrite/master' into burgerballs/song-resync-tweaks 2024-07-29 14:04:41 -04:00
EliteMasterEric 41bd0246ac Custom coutndown, judgements, and combo count now use the note style file instead of hardcoded paths. 2024-07-28 17:10:32 -04:00
anysad 0e7fad090b custom popups and countdowns yay!!! 2024-07-28 02:31:01 -04:00
EliteMasterEric f3624f7e76 Fixes for scripted song events, define vocal tracks per variation, display suffixed difficulties properly. 2024-07-28 01:42:09 -04:00
Burgerballs 1831daac38 Update PlayState.hx 2024-07-25 03:34:59 -04:00
Burgerballs 6e301bf648 Update PlayState.hx 2024-07-25 03:34:58 -04:00
Cameron Taylor 4164329ca9 Merge branch 'rewrite/master' into lemz1/note-kind-scripts 2024-07-22 22:20:58 -04:00
EliteMasterEric a071e90746 Added alt vocal offsets feature, disabled alt instrumentals on Pico mix (for now?) 2024-07-22 20:52:03 -04:00
Cameron Taylor bfa0bafc6f
Merge pull request #675 from FunkinCrew/bugfix/hud-hiding 
Several tiny bug fixes
 2024-07-19 19:10:28 -04:00
EliteMasterEric 7547875535 Allow hiding HUD on launcher builds. 2024-07-18 23:27:41 -04:00
Cameron Taylor f90c2bda99
Merge branch 'rewrite/master' into anysad/tutorial-hey-events 2024-07-18 15:08:10 -04:00
Cameron Taylor b0a842c2c7
Merge pull request #664 from FunkinCrew/gamerbross/chart-reload-f5 
[PUBLIC PR] Pressing F5 in play state now reloads the chart data from your assets folder
 2024-07-18 15:07:52 -04:00
EliteMasterEric d4cbe74939 Smaller fixes tied to note kinds 2024-07-12 21:40:46 -04:00
lemz b6eda8e498 remove note kind logic from playstate 2024-07-12 02:13:12 -04:00
lemz c83e505f5b onUpdate, etc. works now too 2024-07-12 02:13:11 -04:00
lemz 134b467876 rename stuff 2024-07-12 02:13:10 -04:00
lemz a7482410b9 add note kind scripts 2024-07-12 02:13:10 -04:00
gamerbross e6c9767800 Revert camCutscene rename 2024-07-11 22:48:21 -04:00
gamerbross 17f5a06256 Add camOther to fix zooms on pause and stickers 2024-07-11 22:48:20 -04:00
EliteMasterEric 4a7545a0db Remove empty function. 2024-07-11 21:45:06 -04:00
anysad 18b795d4f7 Add HEY! song events to Tutorial 2024-07-11 21:39:20 -04:00
Cameron Taylor 5a26ece9d6
Merge branch 'rewrite/master' into gamerbross/chart-reload-f5 2024-07-11 19:59:15 -04:00
Cameron Taylor 19fd8b5e4e Merge branch 'gamerbross/chart-editor-key' into rewrite/master 2024-07-11 19:45:10 -04:00
gamerbross 7b9e4a0542 Fix F5 chart not reloading 2024-07-11 03:41:51 -04:00
EliteMasterEric d8572cd323 Thank you loggo 2024-07-10 14:23:50 -04:00
Cameron Taylor 6e5c6a8f6d assets submod 2024-07-08 21:51:44 -04:00
Cameron Taylor c9c94a5fda note fadein fix 2024-07-04 15:55:19 -04:00
EliteMasterEric e32fcee77c Migrate results animations to JSON data so we can implement them per-character 2024-07-03 22:50:39 -04:00
AbnormalPoof 9d9d7a853c video cutscene autopause magic 2024-06-28 22:36:01 -04:00
gamerbross a7bdf23832 Fix chart reset when charting and pressing chart key 2024-06-26 20:52:32 -04:00
Cameron Taylor c05f053fe3 Merge branch 'rewrite/master' into bugfix/instrumental-id 2024-06-11 16:12:39 -04:00
EliteMasterEric b30faad7d9 Save high scores and high ranks separately. 2024-06-11 00:40:43 -04:00
Eric 9a8ba4183e
Merge branch 'develop' into patch-1 2024-06-07 21:08:09 -04:00
gamerbross cd485213db Pause Camera Follow when pausing 2024-06-08 02:26:17 +02:00
gamerbross ee6c4478a9 Use FlxG.camera instead of camGame 2024-06-08 02:02:54 +02:00
Hundrec 393355b512
Fix botplay sustain release bug 
Copied opponent's holdTimer code to the player's side
 2024-06-07 19:59:02 -04:00