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

4487 commits

Author SHA1 Message Date
Cameron Taylor 21e5501835 difficulty touch controls implementation 2025-07-06 15:23:18 +07:00
Cameron Taylor 125aa0a438 some cute guard clauses 2025-07-06 15:23:18 +07:00
Cameron Taylor 6591fd8f2a remove some unused/redundant variables 2025-07-06 15:23:18 +07:00
Cameron Taylor b205a0b931 top left freeplay text grab stuff take it out 2025-07-06 15:23:18 +07:00
Cameron Taylor 7a6326b178 freeplay backingCard proper null safety 2025-07-06 15:23:18 +07:00
Cameron Taylor df1dbeaef0 tidy: removed unused import in Freeplay 2025-07-06 15:23:18 +07:00
Cameron Taylor 91a16f6dc3 put DifficultySprite into it's own class lil cleanup in progres 2025-07-06 15:23:18 +07:00
Cameron Taylor acd10ffbe5 some lil null safety fix for SwipeUtil 2025-07-06 15:23:18 +07:00
MAJigsaw77 9036f94970 Remove traces from NumberPreferenceItem. 2025-07-05 21:18:04 +03:00
sector-a f00f631db8
Merge branch 'master' into feature/num-pref-dragging 2025-07-05 18:42:15 +03:00
sector-a d0b64fe4da Add dragging for the NumberPreferenceItem 2025-07-05 18:35:23 +03:00
kade-github f378c0adb6 comments and qol stuff 2025-07-04 18:53:58 -07:00
Hundrec ae6562f42b
change resync threshold back to 30 2025-07-04 03:39:38 +07:00
kade-github 313cf4b253 new music 2025-07-02 17:40:16 -05:00
Hundrec dbd52a5bf1 Nudge notification box away from playbar
Thanks Kolo and Lasercar!

Co-Authored-By: Kolo <67389779+koloindacrib@users.noreply.github.com>
Co-Authored-By: Lasercar <64717068+lasercar@users.noreply.github.com>
2025-07-02 14:33:10 -05:00
Mihai Alexandru 810162de27
mobile: update extension-iapcore to 1.0..3. (#1346) 2025-07-03 00:24:22 +07:00
Abnormal 95262b316a bring them back but for mobile 2025-07-01 14:11:39 +08:00
Abnormal 82bbb9d30d use delta time for the conductor update 2025-07-01 14:11:39 +08:00
kade-github 00a4f47e42 no offsets in the charting state 2025-06-30 18:37:00 +08:00
Abnormal d703609a0a remove conductor arguments from update() 2025-06-30 14:49:01 +08:00
kade-github 2c035d77cc the newline fix of the century 2025-06-30 00:00:02 -05:00
T5mpler 96d1324af1 Fix a bug where holding down a note after dropping a previous one would sometimes not make its cover show. 2025-06-29 22:30:29 -05:00
kade-github c414de48f2 non-negative offsets 2025-06-29 17:34:23 +08:00
kade-github 70fbd200bd video offsets 2025-06-29 10:04:25 +03:00
Kade ec10f273b6
Merge pull request #1298 from FunkinCrew/kade-github/new-offsets 2025-06-28 22:44:27 -07:00
MAJigsaw77 2f223f84f5 Add FEATURE_DEBUG_MENU and FEATURE_ANIMATION_EDITOR defines. 2025-06-29 07:45:07 +03:00
Abnormal 32f32ba0bd blacklist FlxSave 2025-06-28 20:52:41 -05:00
EliteMasterEric 25bf04d581 Implement a stub Discord API for builds where the client is disabled. 2025-06-28 19:23:34 -05:00
EliteMasterEric f036593037 Fix error messages from the game trying to pre-cache the note style 2025-06-28 19:23:34 -05:00
kade-github 9ec7a5068a
change RESYNC_THRESHOLD to 70 2025-06-28 16:17:56 -07:00
kade-github 55e1967423
Merge branch 'master' into kade-github/new-offsets 2025-06-28 13:55:32 -07:00
kade-github d3207de231
fixes 2025-06-28 13:47:28 -07:00
kade-github afc08e285c
Bug Fixes for Offsets 2025-06-28 13:47:28 -07:00
kade-github 28fc5109d4
Offset menu Final maybe 2025-06-28 13:47:27 -07:00
kade-github 2b5ba8dfa9
Offsets menu wip 2025-06-28 13:47:27 -07:00
kade-github 0ef1df33c9
calculate note y is in GRhythmUtil now 2025-06-28 13:47:07 -07:00
kade-github b3aa6a0b8d
Hit Window process in it's own file 2025-06-28 13:47:07 -07:00
Mihai Alexandru f6d9acb63a
Merge branch 'master' into resync-vocals-song-start 2025-06-28 14:32:01 +03:00
Mihai Alexandru 21bbef5542
Merge branch 'master' into pr-2655/lemz1/recycle-credits-lines 2025-06-28 14:18:23 +03:00
Mihai Alexandru 8aff75b308
Merge branch 'master' into touch-controls-define-gets-some-actual-use 2025-06-28 13:43:28 +03:00
Abnormal 58f101bf01 chore: Run Haxe Formatter on the source code 2025-06-28 18:41:49 +08:00
Hundrec c49666c4b4
Fix remaining smoothLerp deprecations 2025-06-28 13:18:24 +03:00
Abnormal 73ec37a473
Move resync threshold to a constant variable 2025-06-28 10:50:59 +03:00
Hundrec 8b6b91cc23 Fix build errors for MathUtil 2025-06-28 01:11:18 -05:00
cyn0x8 94eae116c7 MathUtil additions + lerp fix 2025-06-28 01:11:18 -05:00
MoonDroid faadf406c3
Merge pull request #1321 from FunkinCrew/moon/hacky-gc-calls 2025-06-28 12:09:11 +07:00
Abnormal d4c7339373 allow TouchUtil functions to be used outside of FEATURE_TOUCH_CONTROLS 2025-06-27 22:46:00 -05:00
Mihai Alexandru 377697a358
Limit gyro panning 2025-06-28 01:23:32 +07:00
MAJigsaw77 32701d9ab0 fix a tiny mistake 2025-06-27 03:59:02 -04:00
MoonDroid c897d89b35 fix: Properly check if touch overlaps difficulty to prevent double-swiping 2025-06-27 03:59:02 -04:00
MoonDroid cedf17fb99 fix: Fix temporary softlocking in main-menu 2025-06-27 03:59:02 -04:00
MoonDroid 97620e6038 chore: Reduce margin of error of desyncs to 30 2025-06-27 03:59:02 -04:00
MoonDroid 1d3b5eb246 Attempt to fix callback mishap for IAP
Co-authored-by: Mihai Alexandru <77043862+MAJigsaw77@users.noreply.github.com>
2025-06-27 03:59:02 -04:00
Abnormal 40c292127d add mobile platforms to platformutil 2025-06-27 01:33:58 -04:00
Hundrec e2efd2bc81 adjust song metadata trace 2025-06-26 22:39:26 -05:00
Lasercar 894d8cb463 Fix chart(er)
The charter is literally never ever set in the new or clone function of the songMetadata. HOW????
2025-06-26 22:39:26 -05:00
Abnormal 3fd80504e3 fix the most annoying chart editor bug ever 2025-06-27 10:17:48 +08:00
MoonDroid 42ec7f7796 Call GC only for IPhones above 12 2025-06-27 07:31:32 +07:00
MoonDroid bc4c944d4d Call GC after results if there is no stickers. 2025-06-27 07:28:53 +07:00
MoonDroid 715d2ba65f feat: Add DeviceUtil class 2025-06-27 06:44:35 +07:00
VioletSnowLeopard eb80a52841 fix null safety for CompiledClassList.get
Co-Authored-By: Hyper_ <40342021+NotHyper-474@users.noreply.github.com>
2025-06-26 16:48:31 +08:00
VioletSnowLeopard 57d0871b5c null safe registries in funkin.data 2025-06-26 16:48:31 +08:00
MAJigsaw77 5be5abf4c9 chore: fix multiple warnings. 2025-06-26 04:00:57 -04:00
EliteMasterEric ab89cd33f9 What a stupid change, what kind of dumbass made this? 2025-06-26 02:48:46 -05:00
Abnormal 4cc922c373 add the long awaited tap to enter for mobile.... 2025-06-26 02:10:47 -04:00
Abnormal 4557a681d1 This desync is Pissing me off... I'm the original Starwalker 2025-06-26 00:17:19 -05:00
Cameron Taylor 7db71574d1 TracyProfiler.hx more frame mark functions 2025-06-26 12:21:25 +08:00
Hyper_ 06a440f21c fix: (and refactor) Fix some issues with chart editor sustain trails
Fixes the sustain height not being updated when undoing/redoing length commands
Fixes hanging duplicate sustain trail when dragging the notes
Refactored the displayed hold note sprite kill checks and removed an unnecessary check
2025-06-25 23:21:02 -04:00
Lasercar 6dcec592f4 mute/ zero volume disables visualiser 2025-06-26 11:00:05 +08:00
Hundrec a0d3f8ec55 default gamepad freeplay jump binds
Co-Authored-By: MrMadera <90923803+mrmadera@users.noreply.github.com>
2025-06-25 21:17:11 -05:00
EliteMasterEric 9f9af722ca Fix a breaking build error on HTML5 2025-06-25 21:05:57 -05:00
Karim Akra b3d1adbd7f make menuItems nullable and initialize it inside of create() 2025-06-26 01:14:10 +03:00
MoonDroid cf0da45dd8 fix: Call camera reset BEFORE menuItems to prevent wonky touch hitboxes
sigh!!
2025-06-26 04:56:15 +07:00
MoonDroid 68695329cf Fix compile errors related to null-safety 2025-06-25 14:32:59 -05:00
lemz 1b68c3a8d6 squashed commits 2025-06-25 13:45:43 -05:00
EliteMasterEric 647ce880e1 Add a bunch more classes to null safety. 2025-06-25 13:42:24 -05:00
EliteMasterEric e9915e52fa Fix compile issues. 2025-06-25 09:07:48 -04:00
Hyper_ 18fe868233 chore: Add null-safety for some classes in funkin.ui 2025-06-25 09:07:48 -04:00
EliteMasterEric 0869362fa1 Fix a compilation issue. 2025-06-25 08:36:19 -04:00
Lasercar 87a09cae21 Null safe some graphics classes 2025-06-25 08:36:19 -04: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 720d279f89 okay well that didn't work 2025-06-24 17:39:38 -04:00
Abnormal 97754e5ed3 wonder if this fixes it 2025-06-24 17:39:38 -04:00
Abnormal e2e8c383cd hundrec's req changes
Co-authored-by: Kolo <67389779+KoloInDaCrib@users.noreply.github.com>
2025-06-24 17:39:38 -04:00
Kolo 19d1a8c593 remove the greed from weekend 1's title 2025-06-24 17:39:38 -04:00
Abnormal 8dd007a7c2 the evil is defeated 2025-06-24 17:17:31 -04:00
Abnormal 3747b94246 fix: Check if TERM starts with xterm instead of directly checking 2025-06-24 17:17:31 -04:00
VioletSnowLeopard 7cc9464573 refresh song list when changing difficulties 2025-06-24 16:35:12 -04:00
Abnormal 7b9bce3b4e fix: Fix pixel strumline being weird as shit on downscroll 2025-06-25 03:56:22 +08:00
Hundrec 91550181f5 Remove misses from Gold (Perfect) debug 2025-06-24 14:27:00 -05:00
Abnormal c5308ccbb9 feat: add perfect (gold) to results debug 2025-06-24 14:27:00 -05:00
anysad dcac362003 bye combomilestone comments 2025-06-23 23:31:06 -05:00
Hyper_ 905181c9af Add labels for current beat and step in ChartEditorState (replaces previous display) 2025-06-23 21:40:19 -05:00
Hyper_ 11d9998e5c Fix Debug Results not showing proper rank 2025-06-23 21:25:40 -05:00
Hyper_ 37dc66bc18 i hate these yanderedev ass if-elses but I just wanna fix this bug 2025-06-23 19:26:52 -04:00
MoonDroid 74627795d2 Fix compile-time error for desktop builds 2025-06-23 17:06:48 -05:00
sector-a 24c469dc31
Merge pull request #1287 from FunkinCrew/feature/increase-diff-hitbox
Hitbox changes for Freeplay's difficulty sprite
2025-06-24 00:28:18 +03:00
cyn0x8 eb6becc03f scriptable class changes 2025-06-23 17:24:36 -04:00
Abnormal fbd80ea41f kolo........................................................................................................................................
Co-authored-by: Kolo <67389779+KoloInDaCrib@users.noreply.github.com>
2025-06-23 17:13:07 -04:00
Kolo ccd0148e9b easy pico shall not be easy default....... 2025-06-23 17:13:07 -04:00
MoonDroid 3a7379e851 fix: Decrease boundaries for diff swipes and add a swipe check. 2025-06-24 03:58:34 +07:00
MoonDroid a7055efb27 fix: Prevent wacky multi-swipes on difficulty sprite 2025-06-24 03:57:46 +07:00
MoonDroid 98cd45453b fix: Increase hitbox vertically for difficulty sprite 2025-06-24 03:56:59 +07:00
Hyper_ c13167ece8 chore: Add null-safety for Leaderboards and Medals 2025-06-23 16:37:17 -04:00
VioletSnowLeopard 7d9a9f452d null safety for legacy importer 2025-06-23 16:34:17 -04:00
Abnormal c30b519bc4 chore: Add null safety for most of the classes in funkin.audio.* 2025-06-23 16:20:40 -04:00
Lasercar 9b06bd6b11 NuN safety 2025-06-23 16:05:43 -04:00
Lasercar f3db69cca8 Null safety
For real this time!
2025-06-23 15:45:27 -04:00
Lasercar 9174b83c93 Text Null Safety 2025-06-23 15:20:06 -04:00
anysad 74a8b8862e goodbye nulls! 2025-06-23 15:07:03 -04:00
Hyper_ 88ed66affa chore: Add null safety to various utility and plugin classes
And add a bit of error handling to CharSelectGF & CharSelectSubState

Co-Authored-By: Linus Torvalds <torvalds@linux-foundation.org>
2025-06-23 14:13:35 -04:00
Lasercar 3ac2a02291 funkin null safe 2025-06-23 13:49:32 -04:00
sector-a c1d4bba813
Merge pull request #1257 from FunkinCrew/mobile/button-fixes
Fix various menu button issues for Mobile
2025-06-23 17:06:39 +03:00
MoonDroid 80f3fb6150 fix: the stupid fucking alpha i fucking hate you i hope you DIE
i love you alpha -sigma
2025-06-23 20:57:50 +07:00
MoonDroid 94742eb9ba fix: Properly play the back button animation in Freeplay 2025-06-23 20:21:47 +07:00
MoonDroid 5c06d263b2 fix: Prevent the buttons to be pressed mid-transition to also prevent softlocking
I HATE THIS
2025-06-23 20:21:31 +07:00
Abnormal be60e52725 fix: Fix the stage editor crashing if an FNFS file is loaded through the Recent File section 2025-06-23 05:54:51 +08:00
Kolo f9c1f7a5f7 clear up styleSheet be4 entering 2025-06-23 03:02:19 +08:00
Lasercar 3d3e2bd378 Intro done right 2025-06-19 22:18:26 -05:00
Abnormal 9804111583 [insert the name of the person that added an extra check for onConfirm idk man]........................................................................................................................................................................................... 2025-06-19 22:15:01 -05:00
Kolo 0001017c00 the grand reopening 2025-06-19 17:57:12 -04:00
MoonDroid 4772dfdc13 Prevent overlapping transitions and checks for both backbutton and optionsbutton
Co-authored-by: Mihai Alexandru <77043862+MAJigsaw77@users.noreply.github.com>
2025-06-19 22:12:13 +07:00
MoonDroid 9e3efc0de7 fix: Prevent options back-queuing 2025-06-19 22:09:44 +07:00
MoonDroid c4d24e6d3e refactor: Rework both backButton and optionsButton for better callbacks and readability
Co-authored-by: Mihai Alexandru <77043862+MAJigsaw77@users.noreply.github.com>
2025-06-19 22:07:27 +07:00
MoonDroid fc82b79c9a fix: Prevent back queueing in Options 2025-06-19 17:08:50 +07:00
MoonDroid a98f6f9778 fix: Prevent queuing the back button in Main Menu 2025-06-19 17:08:02 +07:00
MoonDroid 4ca42c3975 fix: Add missing import
hi kade
2025-06-19 17:07:34 +07:00
MoonDroid 51127dfd87 refactor: Change how callbacks are called and added extra checks to avoid softlocking for BackButton 2025-06-19 17:07:18 +07:00
MoonDroid cae7c8a785 fix: Properly check if the state is busy or not for back button in Freeplay 2025-06-19 17:06:43 +07:00
CrusherNotDrip 204501779d This should be 0.0 2025-06-18 22:46:01 -05: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
Hyper_ cce8c18822 Reduce calls to hold note trail graphic update 2025-06-18 13:02:01 -07: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
MoonDroid 6114dfcedb
Merge pull request #1185 from FunkinCrew/feature/mobile-unlock-everything 2025-06-18 18:32:09 +07:00
MoonDroid 52d891c8ff fix: Prevent char select transition to be spam-triggered in Freeplay 2025-06-18 18:31:26 +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
JackXson-Real 39104fe77f "Auto Pause" -> "Pause on Unfocus" 2025-06-18 01:54:03 -05:00
Kolo 56a18e1cf6 2bugs2fix 2025-06-17 19:17:27 -04: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
Lasercar 5549fddec3 Get deselected 2025-06-17 16:50:08 -05:00
Lasercar 65461d839b Close the toolboxes 2025-06-17 16:50:08 -05:00
Lasercar fee29f69ec I.. quit (to the menu)! 2025-06-17 17:11:00 -04:00
Lasercar 539720f84d There's a reason it's called the MAIN menu 2025-06-17 17:11:00 -04:00
Lasercar 576f8e54ff Stage editor - Ctrl+N new stage
Also windows target configuration preset for straight to stage editor (not to be confused with the stage builder)
2025-06-17 17:11:00 -04:00
EliteMasterEric 49eff01afd Fixed locked characters not showing up properly when selected 2025-06-17 15:08:48 -04:00
EliteMasterEric c4aff95886 Fix inverted condition (whoops) 2025-06-17 15:08:48 -04:00
EliteMasterEric 9f41e22428 Always disable character unlock animations when UNLOCK_EVERYTHING is enabled 2025-06-17 15:08:48 -04:00
Lasercar 136a5dfad4 Fix Are you sure?
Also they now dance to Artistic Expression
2025-06-18 02:54:37 +08: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
MAJigsaw77 7d0772170f Merge branch 'master' into gyro-damping 2025-06-17 17:32:25 +03:00
Mihai Alexandru 24101d654d
Merge branch 'master' into bugfix/ios-simulator 2025-06-17 08:29:46 +03:00
Abnormal e82b578eb8 fix a crash when returning to the chart editor on release builds 2025-06-16 23:41:45 -05:00
Hundrec 3eace5a7c8
Adjust GCD MathUtil comments 2025-06-17 12:32:11 +08:00
Cameron Taylor 153f2be177 soften (and sorta limit?) the panning on main menu 2025-06-16 19:51:54 -04:00
Cameron Taylor 380f9e70d5 document the GCD function in MathUtil 2025-06-16 19:50:28 -04: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
Lasercar 4819a74c29 Charselect remember character 2025-06-16 16:08:17 -04:00
Eric f95258358c
Format and re-arrange project.hxp (#1233)
* Format and re-arrange project.hxp

* Remove merge conflict
2025-06-16 19:34:03 +00:00
Hyper_ c0e0523651 fix: Clear waveform data when destroying audio
This fixes an issue where recycled sounds would use the previous sound's waveform data.
2025-06-16 02:45:44 +08:00
MAJigsaw77 a69e08e986 Merge branch 'master' into back-button-tweaks 2025-06-14 22:06:18 +03:00
MAJigsaw77 839ff43123 Merge branch 'master' into bugfix/fix-menus-widescreen-alignment 2025-06-14 21:30:03 +03:00
Mihai Alexandru f1c15c8a84
Merge branch 'master' into gyro 2025-06-14 21:22:25 +03:00
EliteMasterEric d8a6abc48d Rename the variable to CENSOR_EXPLETIVES 2025-06-13 21:17:09 -04:00
EliteMasterEric 2cf29a67d9 Added a separate variable specifically for mobile censorship. 2025-06-13 21:16:42 -04:00
Abnormal e8cd87c1f1 Add FEATURE_NAUGHTYNESS and turn it off for mobile builds 2025-06-13 21:16:41 -04:00
Abnormal 075f03235d fix: Fix an issue where the album didn't update when switching variations 2025-06-13 21:09:10 -04:00
Cameron Taylor fcb5fe85ff gyroscope panning funzies on main menu 2025-06-13 20:47:09 -04:00
MoonDroid a9ba2a7a1c
Merge pull request #1213 from FunkinCrew/feature/various-haptic-changes 2025-06-13 11:12:48 +07:00
KarimAkra a2c0625137 Fixed title state aligment 2025-06-13 07:10:55 +03:00
KarimAkra d0d1d3c376 story menu state aligments 2025-06-13 07:10:43 +03:00
Karim Akra d0fe228e21
Scale the pico accept backing card for wide screen 2025-06-13 09:53:52 +07:00
MoonDroid 1b7dc5f1ac fix: Make backing out of options instant 2025-06-13 09:45:55 +07:00
MoonDroid ea0e4ee56d fix: Remove all callbacks when destroyed 2025-06-13 09:45:36 +07:00
MoonDroid 1b1d0a978d Play cancelMenu when backing out 2025-06-13 09:45:19 +07: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
KarimAkra ffbc8c80c8 nudge the speakers a bit to cover the curtain properly 2025-06-13 02:42:05 +03:00
Karim Akra aacb200638
Merge pull request #1207 from FunkinCrew/mobile/freeplay-tweaks
Couple of Freeplay tweaks for final release
2025-06-13 02:04:25 +03:00
KarimAkra b75cfcb833 Fixed last few issues with ios for notch and centering on character select 2025-06-13 01:18:22 +03:00
KarimAkra dc800dc48e added logicalSize to FullScreenScaleMode 2025-06-13 00:32:09 +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
luckydog7 068a995cdd
ios: tweaking audiosession to fix some bugs 2025-06-12 18:17:35 +07:00
MAJigsaw77 1a07e082c9 fix: freeze when restarting a video cutscene. 2025-06-12 12:47:36 +03:00
EliteMasterEric fb9bf59a7e Fix a null error caused by calling Constants.VERSION too early. 2025-06-12 03:33:34 -05:00
Kolo 15083a4776 delete logic fix + 2 new feats
feat 1: new objects now have the zIndex 1 higher than the last one (thanks hundrec)
feat 2: chars to test as are now saved (thanks imverybad)
2025-06-12 00:47:24 -06:00
Kolo 0dbffa6875 even more fixes and missing features 2025-06-12 00:47:24 -06:00
Kolo a776ce1a81 stage editor bugfixes + features :D 2025-06-12 00:47:24 -06:00
MoonDroid 738bd8b7c7 Increase arrows touch hitbox for Freeplay 2025-06-12 13:32:15 +07:00
MoonDroid d79f99475e Remove swipe right to exit on Freeplay 2025-06-12 13:31:46 +07: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
EliteMasterEric de0a56ec95 Temporarily disable the input offsets feature until we get it fully functioning again. 2025-06-11 20:15:55 -07:00
EliteMasterEric aefa8d149f Fix typos preventing builds on "master" branch 2025-06-11 20:29:51 -06:00
EliteMasterEric 29ee386dfe Update Polymod to allow mods with versions v0.6.3 or v0.7.0. 2025-06-11 19:21:00 -06:00
sector-a 0d965ba91c Fix pause button hiding 2025-06-12 04:06:56 +03:00
Kade a2c5758112
Merge branch 'master' into bugfix/html5-reflectutil-nullsafety 2025-06-11 17:36:11 -07:00
EliteMasterEric 01fd37e08b Remove the redundant TimerUtil class. 2025-06-11 17:35:01 -07:00
Lasercar 5eecef17a1 Try push unique the difficulties for the notes 2025-06-11 17:32:44 -07: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
Kolo 50d9584a38 another 20 trillion sandboxed classes 2025-06-11 17:31:40 -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
zackaryowo 760190d135 Update source/funkin/Conductor.hx
thank you https://github.com/cyn0x8 for reminding me FlxMath.bound exists

Co-Authored-By: cyn <cyn0x8+git@gmail.com>
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
Hundrec 8cae34eed7
[PUBLIC PR] Hyper's Stacked Notes Viewer (#1165)
Co-authored-by: Hundrec <hundrecard@gmail.com>
Co-authored-by: Hyper_ <survivaltemer@gmail.com>
Co-authored-by: lemz1 <ismael.amjad07@gmail.com>
Co-authored-by: Hyper_ <40342021+NotHyper-474@users.noreply.github.com>
Co-authored-by: Kade <26305836+Kade-github@users.noreply.github.com>
2025-06-11 16:24:30 -07:00
Mihai Alexandru a0ae4de5e8
mobile: make changing difficulties add to ad counter 2025-06-12 05:29:37 +07:00
Eric e7df920e74 Revert "rank anim only plays when entering freeplay or changing difficulties"
This reverts commit 55221646b8.
2025-06-11 16:29:17 -06:00
Mihai Alexandru 07958590a4
fix: iap not working correctly when upgrading 2025-06-12 05:18:19 +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
KarimAkra ea01052b18 Fixed static guy and some resolution dependant issues 2025-06-11 12:46:21 +03:00
EliteMasterEric 8e7de54aa0 Disable initial caching of "shared" assets on HTML5. 2025-06-11 05:08:37 -04:00
EliteMasterEric ea81e061d2 Fix null safety issues specific to HTML5 2025-06-11 05:08:37 -04: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
VioletSnowLeopard 55221646b8 rank anim only plays when entering freeplay or changing difficulties 2025-06-11 04:26:55 -04:00
Abnormal b80a8d60af fix: Fix the Stage Editor button in the Debug Menu not doing anything 2025-06-10 17:57:22 -04:00
Hyper_ d968fb271c Make sound effects pause with the game 2025-06-10 17:23:46 -04:00
Abnormal 70f0a54191 feat: Options Menu scrolling 2025-06-10 08:57:55 -07:00
Abnormal 29b94ea736 add cache to Assets 2025-06-10 08:57:14 -07:00
MoonDroid 8ca4d933aa
Merge pull request #1182 from FunkinCrew/mobile/admob-and-iapcore-fixes 2025-06-10 20:43:47 +07:00
MAJigsaw77 20e8a4566d mobile: make MAX_BEFORE_AD final. 2025-06-10 15:32:17 +03:00
MAJigsaw77 69c5c05039 mobile: adjust admob and iapcore variables a little. 2025-06-10 15:29:08 +03:00
MAJigsaw77 299a720575 mobile: multiiple fixes to admob and iapcore code. 2025-06-10 14:52:06 +03:00
Hyper_ cadfa3b7ce Polymod: Blacklist funkin.util.macro.*
It has `CompiledClassList` which allows access to `sys` and Newgrounds API functions.
2025-06-10 06:23:37 -05:00
MoonDroid 5342601f8b fix: Call the callbacks if the upgrade is purchased 2025-06-10 05:01:30 -06:00
MoonDroid 9303e4c272 Force FPS, pause on unfocus, and debug display to be a set value on mobile 2025-06-10 17:15:41 +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
MoonDroid 2450961b28 Add IAP functionality to the upgrade item in Main Menu 2025-06-10 17:13:04 +07:00
fabs aa8f5087b5 set upgraded to true on pc always 2025-06-09 21:43:28 +01:00
fabs edc668dad5 add options button to main menu + upgrade button tweaks 2025-06-09 21:21:09 +01:00
fabs 2771a13d5e tweak behavior for main menu items on mobile 2025-06-09 21:20:54 +01:00
fabs b63e02d9e7 make freeplay back button instant 2025-06-09 21:20:32 +01:00
fabs 9d3595c855 implement new back button + options button to musicbeatstates 2025-06-09 21:20:16 +01:00
fabs 250b5cb54f add options button 2025-06-09 21:19:48 +01:00
fabs e457b3e03b add instant option for back button 2025-06-09 21:19:36 +01:00
fabs 38e0cb6ab1 remove trace from sparkles 2025-06-09 21:19:11 +01:00
fabs db2644c0ff add upgrade button to main menu + simple logic 2025-06-09 17:49:37 +01:00
fabs f9aff5b11b upgrade sparkles.. 2025-06-09 17:49:27 +01:00
KarimAkra cc9797c452 adjust character select for wide screen
small bug, the static guy is off position sorry will fix it later i need ot go now TwT
2025-06-09 11:14:57 +03:00
MAJigsaw77 a97acfe18e mobile: move ad banner to the top left. 2025-06-09 01:31:19 -06:00
Hyper_ 65ed58350b Fix implementation of fastIndexOf causing duplicate notes in displayedNoteData 2025-06-08 23:59:33 -04:00
fabs 3360493444 implement extended assets 2025-06-09 03:14:57 +01: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 5a5f1f83f3
[PUBLIC PR + TWEAKS] Always display charSelectHint after unlocking character, and adjust message for mobile (#1157) 2025-06-09 08:02:23 +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
Lasercar 1c25713464 Use first difficulty as fallback 2025-06-08 16:57:34 -06:00
Hundrec 7cbc5b0dc7 Adjust character select hint message for mobile 2025-06-08 16:51:31 -06:00
Hundrec 7ccf75cd86 Always display charSelectHint after unlocking character 2025-06-08 16:49:09 -06:00
Mihai Alexandru eec304f42f
mobile: add RESTORE PURCHASES button on the options menu. 2025-06-09 05:41:16 +07:00
MoonDroid 7e4508f991 fix: Re-add the ability for the user to hold-scroll on Freeplay 2025-06-08 13:36:08 -06:00
MoonDroid f74d1655d5 fix: Change ACCEPT to ENTER
Having it on ACCEPT only speeds it up for a frame
2025-06-08 13:30:58 -06: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 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 f2280b1c0f fix: Move the backbutton correctly to the bottom right, remove forced color 2025-06-08 19:22:46 +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
Mihai Alexandru 96c788a420
mobile: don't initialize the VolumePlugin. 2025-06-08 17:19:51 +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 a9a4dad511 forgot these oooops 2025-06-08 04:09:27 +01:00
fabs dc04ff23d7 move back button + swap class names 2025-06-08 04:09:20 +01:00
fabs 72f7317db2 rework freeplay back button 2025-06-08 04:07:56 +01:00
fabs 57ebeb25e4 i feel like this makes more sense 2025-06-08 04:06:30 +01:00
fabs 7fd1d312d7 rename FunkinBackspace + back button rework 2025-06-08 04:05:52 +01:00
MoonDroid a7e46ed55b fix: Prevent difficulty sprite from just disappearing 2025-06-07 22:26:12 +07:00
MoonDroid 22c24f53f6 fix: Push the difficulty sprites slightly to the left for Story Menu 2025-06-07 22:25:47 +07:00
MoonDroid 262c4fb9a1 chore: Moved haptics preference option up 2025-06-07 22:24:40 +07: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
Karim Akra 1801c542a6
Merge pull request #1133 from FunkinCrew/chore/invert-freeplay-swipes
More inverted difficulty anim fixes
2025-06-07 15:05:08 +03:00
MoonDroid f854a6e07a
Merge pull request #1130 from FunkinCrew/Hyper/fix-countdown-stacking 2025-06-07 08:24:23 +07:00
VioletSnowLeopard e193f7392a set selected after changing difficulties or unfavoriting a song 2025-06-06 21:22:36 -04: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
Lasercar b008f88e0d I sawed this playbackspeed in half! 2025-06-06 21:05:56 -04:00
Lasercar a50a014de3 Whoops, didn't save and load the stuff properly 2025-06-06 21:05:56 -04:00
Lasercar f78ab4da1d Save chart editor vocal volume and playback speed
Also opponent hitsounds
2025-06-06 21:05:56 -04:00
EliteMasterEric 72a6b92daf Remove auto-rebuilding of HXCPP (it forces the game to clean build every time) 2025-06-06 20:46:50 -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
EliteMasterEric c6526527f1 Add HXCPP build to Prebuild, and add timer to Prebuild script 2025-06-06 20:45:23 -04:00
Abnormal e89f9f50dc fix: Remove spammy trace calls from DiscordClient 2025-06-06 20:33:31 -04:00
Hundrec 4eaa3842c6 apply these latencystate changes very important!!!
Co-Authored-By: Kade <26305836+Kade-github@users.noreply.github.com>
2025-06-06 17:21:54 -07:00
JackXson-Real 1d9e34359c OptionsState now remembers selection 2025-06-06 17:21:54 -07:00
JackXson-Real 5361df2544 latency state exits to options state 2025-06-06 17:21:54 -07:00
Hundrec 6222c389e3 Hide cursor when Title Screen starts 2025-06-06 20:03:51 -04:00
Eric 6265d751f8
Merge pull request #1125 from FunkinCrew/Hundrec/faves-week-sort
[PUBLIC PR] Sort Favorites by Week order, not alphabetically
2025-06-06 20:01:50 -04:00
Kolo d3d8aaae7b move da hold note trails 2025-06-06 19:16:29 -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 8b80478229 Fix squashed text for real this time 2025-06-06 15:54:19 -06:00
VioletSnowLeopard 0c62428fc8 fix song text remaining highlighted
unintentionally fixes song text squishing
2025-06-06 15:54:19 -06:00
EliteMasterEric 2904e660e9 Add confirmation sound and animation before transitioning to Chart Editor in Freeplay 2025-06-06 15:05:08 -06:00
EliteMasterEric e2b9cc9ed5 Provide difficulty and variation to Chart Editor when transitioning from Freeplay 2025-06-06 15:05:08 -06:00
EliteMasterEric 5ac9cee76c Fix Freeplay -> Chart Editor debug key not being processed properly 2025-06-06 15:05:08 -06:00
MoonDroid 62fa3ef934 Switch values for capsule swipes 2025-06-07 01:33:23 +07:00
MoonDroid aac09f86fe Merge branch 'master' into mob-96/week3-train-haptics 2025-06-07 01:28:15 +07:00
MoonDroid 2e0dfab9fb chore: Properly animate difficulty swipes and invert swipes for capsule/diff drags 2025-06-07 00:36:07 +07: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
Karim Akra 28363652ef
Added outline for circle hints 2025-06-06 12:57:50 +07:00
Ralty 183cec62dc Fix Lit Up being impossible to submit score into 2025-06-05 22:34:42 -06:00
Hundrec da0964a7b7 Remove alphabetical sort from Favorites 2025-06-05 21:53:33 -06: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
Cameron Taylor 1d88ec473e
Merge pull request #1114 from FunkinCrew/nothyper/tracy-framemark
[PUBLIC PR] Remove unnecessary Tracy frame mark
2025-06-05 02:25:38 -04:00
VioletSnowLeopard 34d5ed1169 Fix combo drop animations 2025-06-04 20:30:21 -04:00
Lasercar ab817bb1ea Fake rank now visible
Also fixes the song text clipping the rank area when getting a new rank
2025-06-04 19:56:36 -04:00
Lasercar 3bbb4b06c8 no character? 2025-06-04 19:38:04 -04:00
VioletSnowLeopard 067a04e069 Remove this unnecessary line
`curSelected` is always set to 0 directly above this
2025-06-04 19:26:35 -04:00
sector-a e9697e6f40 Make sharpness changeable 2025-06-05 01:34:09 +03:00
sector-a 0345107e71
Disable inst select menu on mobile 2025-06-05 05:17:33 +07:00
Lasercar 5177e1275e Add all tween types 2025-06-04 17:31:26 -04:00
Karim Akra be57d2fa3c
Merge pull request #1104 from FunkinCrew/menu-cleanup
Clean up Menu code and fix a few menu-related issues.
2025-06-04 22:27:53 +03:00
MoonDroid ff7b7b5d3e
Increase verticle hitbox for the default control scheme (#1103) 2025-06-04 22:24:17 +03:00
MoonDroid e7c42dae0c
fix: Invert difficulty change and its animations. (#1102) 2025-06-04 21:57:34 +03: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 113326089a
Merge pull request #1096 from FunkinCrew/feature/in-app-review 2025-06-05 00:05:31 +07:00
Karim Akra ed0abb8215
Use proper insets for IOS notch rectangle 2025-06-04 23:54:56 +07:00
MoonDroid 405fe21c53 fix: Further improve scrolling in Story Menu by preventing unintended diagonal scrolling behavior 2025-06-04 23:44:32 +07:00
MoonDroid 4081f329d2 chore: Remove test purchase flow from OptionsState 2025-06-04 23:42:14 +07:00
MoonDroid 402d5b730b refactor: lock scrolling in Main Menu, and prevent accidental tapping in Options Menu 2025-06-04 23:41:47 +07:00