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

1295 commits

Author SHA1 Message Date
sector-a 76c0dea92b
Move results and death haptics to scripts. 2025-07-25 17:23:04 +03:00
Karim Akra 2d7a2202f5
Fix song restarting bug (for good??).
Co-authored-by: Mihai Alexandru <77043862+MAJigsaw77@users.noreply.github.com>
2025-07-25 16:45:55 +03:00
MAJigsaw77 9fa70775b9 Use funkin.Assets instead of openfl.utils.Assets. 2025-07-25 16:15:51 +03:00
sector-a 2833827fbf Change the way game searches for pixel icons 2025-07-25 16:15:51 +03:00
Hyper_ 01620fda9b The most deranged line loss of all time 2025-07-22 06:41:46 +08:00
Hundrec c353cc54a1 god effing damnit 2025-07-18 15:45:53 +08:00
MoonDroid beb64528fb Properly manage swipe threshold on states. 2025-07-18 02:08:46 +08:00
Karim Akra 01428dd5cf
Fixed a tiny issue that caused cutscenes to softlock (#1432) 2025-07-17 12:51:06 +03:00
MoonDroid e30a4ebb7b Merge branch 'master' into feature/haptics-intensity-pref 2025-07-17 04:08:51 +07:00
MoonDroid ad3bf2d2d2 Update haptic values to compensate for default 1 multiplier 2025-07-17 03:04:54 +07:00
kade-github 1b1c2a124b STOP MAKING IT PRIVATE!!! 2025-07-17 03:58:03 +08:00
sector-a 8a99fa4184
Add toggling the old icon by touching the player icon
Co-authored-by: MoonDroid <81515012+moondroidcoder@users.noreply.github.com>
2025-07-17 02:22:17 +07:00
Karim Akra 006f1dce0a Fixed the crash in 2hot and blazin 2025-07-17 03:01:25 +08:00
Karim Akra 11cb409bd2 Fixed the crash in game over 2025-07-16 00:41:43 +03:00
EliteMasterEric aad0a0afb6 Fix a crash related to pausing stage sounds on HTML5 2025-07-11 17:22:52 -05:00
Karim Akra f8516cfb4d Fix sustain trail notes being flipped on upscroll in keyboards on mobile 2025-07-09 13:36:43 -07:00
Hundrec 3987445bd6 Bump resync threshold to 40 again... 2025-07-09 19:14:49 +08:00
kade-github a6b3eb0b81 right lined 2025-07-09 05:20:34 -05:00
Abnormal e309bac626 fix compiling error 2025-07-09 00:02:53 -04:00
luckydog7 8c6324641e fixed bug when notes are offset when touching in keyboard mode 2025-07-09 03:11:13 +07:00
Karim Akra 6b7b5d0bf7 fixed controls few menus with keyboard 2025-07-09 03:11:13 +07:00
Karim Akra a74dcbc6f9 Fix keyboard & gamepad support on menus and playstate 2025-07-09 03:11:13 +07:00
Kolo 7e76cf6634 maz................................................................. 2025-07-07 18:27:40 -07:00
VioletSnowLeopard e7c4b1ba38 start gameover retry music after stopping death quotes 2025-07-07 11:16:09 -04:00
Abnormal 3b897417fb small scripted class additions...... 2025-07-07 10:47:09 -04:00
Kolo 7bb2336972 spare some script class pie for sparrow dawg 2025-07-07 10:47:09 -04:00
Abnormal e2722434e0
fix: Fix playback rate being busted on mobile
Co-authored-by: MoonDroid <81515012+moondroidcoder@users.noreply.github.com>
2025-07-06 15:56:03 +07:00
Hundrec ae6562f42b
change resync threshold back to 30 2025-07-04 03:39:38 +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
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 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 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 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
Abnormal 73ec37a473
Move resync threshold to a constant variable 2025-06-28 10:50:59 +03: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
MoonDroid 97620e6038 chore: Reduce margin of error of desyncs to 30 2025-06-27 03:59:02 -04:00
MoonDroid bc4c944d4d Call GC after results if there is no stickers. 2025-06-27 07:28:53 +07:00
VioletSnowLeopard 57d0871b5c null safe registries in funkin.data 2025-06-26 16:48:31 +08:00
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
Lasercar 9b06bd6b11 NuN safety 2025-06-23 16:05:43 -04:00
MoonDroid 4ca42c3975 fix: Add missing import
hi kade
2025-06-19 17:07:34 +07: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
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
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
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
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
Abnormal e82b578eb8 fix a crash when returning to the chart editor on release builds 2025-06-16 23:41:45 -05: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
MAJigsaw77 839ff43123 Merge branch 'master' into bugfix/fix-menus-widescreen-alignment 2025-06-14 21:30:03 +03: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
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
MAJigsaw77 1a07e082c9 fix: freeze when restarting a video cutscene. 2025-06-12 12:47:36 +03:00
Kolo a776ce1a81 stage editor bugfixes + features :D 2025-06-12 00:47:24 -06: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
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
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 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
Mihai Alexandru a0ae4de5e8
mobile: make changing difficulties add to ad counter 2025-06-12 05:29:37 +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
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