1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-09-08 06:57:44 +00:00
Commit graph

444 commits

Author SHA1 Message Date
Cameron Taylor 2b4a42ac0a Merge branch 'hundrec/chart-editor-ms-display' into rewrite/master 2025-06-03 03:17:47 -04:00
Lasercar dc56ccada5 ctrl click on hold note null reference fix 2025-05-30 19:49:58 -07:00
Lasercar 1959a5250f Difficulty no longer always set to normal 2025-05-30 19:49:00 -07:00
Lasercar 82af988dce chart editor target song variation parameter 2025-05-30 19:49:00 -07:00
Lasercar e3fca16793 chart editor target song difficulty parameter 2025-05-30 19:49:00 -07:00
anysad c7abb19698 fix playhead width 2025-05-30 19:45:32 -07:00
Hundrec 7c7dc11f18 Prevent the playhead from scrolling before song start 2025-05-30 19:45:02 -07:00
Hundrec 26dc895a27 Fix chart editor playbar ms display 2025-05-29 00:12:19 -04:00
Eric 44c32cb0fc
More public 0.6.4 fixes (#1016)
Co-authored-by: Hyper_ <40342021+NotHyper-474@users.noreply.github.com>
Co-authored-by: Lasercar <64717068+Lasercar@users.noreply.github.com>
Co-authored-by: Lasercar <B_l_u_t_a_c_k@hotmail.com.au>
Co-authored-by: anysad <anysadiscool@gmail.com>
Co-authored-by: Hundrec <hundrecard@gmail.com>
Co-authored-by: VioletSnowLeopard <ngzeretzke@gmail.com>
Co-authored-by: unknown <47027981+ACrazyTown@users.noreply.github.com>
Co-authored-by: kade-github <26305836+Kade-github@users.noreply.github.com>
Co-authored-by: Abnormal <86753001+AbnormalPoof@users.noreply.github.com>
Co-authored-by: CrusherNotDrip <90648119+CrusherNotDrip@users.noreply.github.com>
Co-authored-by: cyn0x8 <cyn0x8+git@gmail.com>
2025-05-08 10:28:39 -07: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
cyn0x8 a74369c77e fixes + stronger sandboxing 2025-05-02 16:40:50 -05:00
Hyper_ 142ea6db0c fix: Force UI Camera resize 2025-05-01 22:32:02 -03:00
Lasercar 8074d57186 Don't add the default difficulty to song metadata
It'll now only add the current difficulty to the metadata if it doesn't exist in it when saved.
2025-04-29 18:01:23 -04:00
Hyper_ f20b938f3f fix: Pad number with 1 decimal place with zero
Merge pull request #1000 from FunkinCrew/hyper/chart-editor-display-beat

[PUBLIC PR] Display current beat and step in the Chart Editor
2025-04-22 19:02:56 -04:00
Hyper_ 85915eae8c Implement suggestion: Fractional beat display 2025-04-22 19:02:09 -04:00
Hyper_ 83bb3bb507 feat: Show current beat and step next to song position 2025-04-22 19:02:09 -04:00
cyn0x8 95ade2a08b FileUtil overhaul + sandboxing 2025-04-22 19:00:24 -04:00
Cameron Taylor 6b835931c5 fix: changing variations in chart editor properly updates the display / BPM 2025-03-06 18:17:32 -05:00
Cameron Taylor 9bf83f9159 fix performance when using selection in Chart Editor 2025-03-06 18:09:00 -05:00
Cameron Taylor 9e7b43ef4f fix: On MacOS, properly use Command key instead of Control key in Chart Editor 2025-03-05 16:57:54 -05:00
Cameron Taylor 0a911ae607 remove a buncho unused imports 2025-02-17 19:25:33 -05:00
CheemsAndFriends b28b1d8810 Fix middle click funky stuff 2024-11-23 15:21:28 -05:00
Cameron Taylor 0d8e4a5330
fix: re-enable precise chart editor scrolling, and also fix smooth scroll playhead/playbar playback (#3806) 2024-10-30 12:41:28 -04:00
Cameron Taylor 20d9016984 feat: Added smoother scrolling when using the Chart Editor
smoother drag / movement in chart editor

playbarHead movement fixie
2024-10-26 15:54:15 -04:00
EliteMasterEric dff4135fc9 Update save data format and error handling. 2024-10-18 19:11:27 -04:00
amyspark-ng ✨ 777978f5a5 fix: stopped allowing F1 to create more than one help dialog window in the Charting Editor 2024-10-04 12:17:36 -04:00
Eric f1b6e6c4e4
Merge pull request #3537 from afreetoplaynoob/patch-1
Enhancement: Properly format the chart editor playbar
2024-10-03 23:55:33 -04:00
Hyper_ 5141ac13df Remove duplicate import 2024-10-03 21:25:34 -04:00
afreetoplaynoob 79eb7d633c
Properly format the chart editor playbar
Minor change, but this makes the song time in the chart editor follow a proper time format.
2024-10-02 08:32:21 -03:00
Cameron Taylor 7a3d983bba Merge branch 'feature/discord-rpc-resurrected' into rewrite/master 2024-09-27 17:47:59 -04:00
EliteMasterEric 28d50a4567 Merge branch 'rewrite/master' into nothyper474/chart-selection 2024-09-22 01:10:56 -04:00
Eric 6a113addca
Merge branch 'develop' into bugfix/chart-selection 2024-09-22 01:09:37 -04:00
EliteMasterEric 35aa8731d0 Better status messages, buttons, updated album art, basic chart editor support 2024-09-19 11:13:05 -04:00
EliteMasterEric 811caf6b70 Suppress a spammy log trace 2024-09-16 21:54:33 -04:00
Kade 9624b57e44
This does fix it now 2024-09-16 17:23:49 -07:00
Kade 7d2b946e9c
depreciated screen X/Y to view X/Y 2024-09-16 17:13:14 -07:00
Kade 5a877a14a0
only show last two digits
digit
2024-09-16 17:13:13 -07:00
Kade 535ac0e528
add milliseconds to the playbar in charting state
remove laggy redundant traces

Revert "remove laggy redundant traces"

This reverts commit 204113840473dd5069f5d508d50e15e21104b45a.
2024-09-16 17:13:13 -07:00
FabsTheFabs e0a4818e5a registry updates 2024-09-07 00:52:38 +01:00
FabsTheFabs d049478c65 registry updates 2024-09-03 19:16:46 +01:00
EliteMasterEric 200b3c963b Updated compile defines to use feature flag system 2024-08-26 18:01:36 -04:00
FabsTheFabs 9d85d423c6 add stage to registry and chart editor 2024-08-19 04:29:22 +01:00
Cameron Taylor cce6434570 Merge branch 'rewrite/master' into feature/erect-stages 2024-08-07 19:43:37 -04:00
Hyper_ d43042fd36 Fix out of bounds note selection 2024-08-05 20:02:23 -03:00
FabsTheFabs 3b7e656793 add stage names to registry + chart editor 2024-07-31 14:36:06 +01:00
Cameron Taylor 4164329ca9 Merge branch 'rewrite/master' into lemz1/note-kind-scripts 2024-07-22 22:20:58 -04:00
FabsTheFabs 73fc855f8e new stage names 2024-07-18 05:23:31 +01:00
EliteMasterEric ace762413e Fix an issue where display would break on invalid note styles. 2024-07-12 16:39:42 -04:00
lemz f9bccb057a use suffixes instead of pixel boolean 2024-07-12 02:13:22 -04:00
lemz 44d9785317 editing them works now
still need to implement String and do some testing
2024-07-12 02:13:21 -04:00
lemz c41d846df5 store params in chart
chart editor still doesnt fully work
2024-07-12 02:13:20 -04:00
lemz 928de7b8eb check for pixel style if necessary 2024-07-12 02:13:16 -04:00
lemz bb97549171 fixed a bit 2024-07-12 02:13:14 -04:00
lemz ca2cbb44f5 display custom note style in chart editor 2024-07-12 02:13:14 -04:00
lemz ca69e7b850 custom note styles in chart editor 2024-07-12 02:13:13 -04:00
gamerbross 90155bcfbf ChartEditor Live Input Code Refactor + 6 key fix 2024-07-11 22:24:38 -04:00
Cameron Taylor 4691e3d249 Merge branch 'bugfix/chart-editor-event-toolbox-crash' into rewrite/master 2024-06-10 12:26:47 -04:00
Cameron Taylor 6fd030cb30 Merge branch 'patch-1' into rewrite/master 2024-06-07 11:38:57 -04:00
EliteMasterEric 6d133f007d Fix a bug where the event data toolbox wouldn't rebuild, and it would crash. 2024-06-05 19:25:53 -04:00
Eric 2380058820
Merge pull request #2328 from nebulazorua/new-judge-applying
New judge application logic
2024-05-30 16:10:17 -04:00
Cameron Taylor 75b4baefca Merge branch 'gamerbross/chart-editor-sustains' into develop-0.4.0 2024-05-29 16:54:19 -04:00
gamerbross 9a18e3fde6 Fix Charting Dragging Sustain Trails 2024-05-20 01:38:52 +02:00
EliteMasterEric 228ac66cc2 Credit the song's charter in the pause menu. 2024-05-19 01:48:51 -04:00
EliteMasterEric a243b167b2 Fix up more credits 2024-05-09 22:37:01 -04:00
nebulazorua 2eaea3cdc5 Apply judgements through a seperate function to applyScore
Also adds more to the HitNoteScriptEvent, such as the noteDiff and also isComboBreak.
noteDiff is important as it lets you create stuff like notes with reduced hitboxes (i.e mines/"hurt notes") or millisecond hit displays. isComboBreak lets you set whether the judge combo broke, so you could in theory create custom judgements in scripts now with these changes (killer reimplementation in scripts? more likely than you'd think!)
2024-05-08 20:26:17 +08:00
EliteMasterEric b06a35ea2f Add , and . hotkeys to chart editor. 2024-05-02 03:38:27 -04:00
Cameron Taylor 035db7f00a Merge branch 'rewrite/master' into bugfix/draw-crash 2024-04-19 14:03:58 -04:00
Cameron Taylor 22e411d43f Merge branch 'rewrite/master' into feature/chart-editor-gamepad-support 2024-04-19 13:57:42 -04:00
EliteMasterEric 6f5c3a043f Fix crash caused when game tries to render disposed sprites during a Sticker transition. 2024-04-10 14:45:07 -04:00
EliteMasterEric 6a131555f8 Merge branch 'rewrite/master' into feature/chart-editor-gamepad-support 2024-03-28 20:15:32 -04:00
EliteMasterEric 463e946b17 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/buncha-2hot-fixes 2024-03-27 01:40:22 -04:00
Cameron Taylor ccfb9ca65b Merge branch 'rewrite/master' into feature/high-erect 2024-03-25 16:02:09 -04:00
EliteMasterEric 6407770ed6 Rework every class to use FunkinSound. 2024-03-23 17:50:48 -04:00
EliteMasterEric aea9213eea Make sure the BPM label gets updated properly 2024-03-22 03:04:33 -04:00
EliteMasterEric 5e0de6d1ce Fix some issues with events unintentionally sharing data after being edited via the toolbox. 2024-03-21 23:57:26 -04:00
EliteMasterEric d56c33cd17 Fix a dozen tiny issues with 2hot's audio and visuals (and some script crashes!). 2024-03-16 00:55:57 -04:00
Cameron Taylor 1211dbb6e8 Merge branch 'rewrite/master' into feature/chart-editor-song-scripts 2024-03-13 21:26:50 -07:00
EliteMasterEric 66085ff867 Song scripts can now be (optionally) enabled in the Chart Editor playtest 2024-03-12 21:34:50 -04:00
EliteMasterEric bbaf8dfb3e Debugger popup fixes 2024-03-12 17:57:52 -04:00
Cameron Taylor 25cb73316c Merge branch 'rewrite/master' into bugfix/html5-array-clone 2024-03-10 13:46:49 -04:00
EliteMasterEric f671cc8569 Remove DynamicAccessTools entirely. 2024-03-06 14:13:48 -05:00
EliteMasterEric 2fa1d18dce Fix build 2024-03-06 12:29:54 -05:00
Mike Welsh a516e9199f Remove DynamicTools; fix pause menu on HTML5
Calls intended for `ArrayTools.clone` were being routed to
`DynamicTools.clone` due to the order of `using` statements in
`imports.hx`. This caused the pause menu to break due to arrays
becoming fubar (missing length property).

Using `DynamicTools` is a little dangerous, so remove it in favor
of calling `Reflect.copy` directly.
2024-03-05 23:21:57 -08:00
Cameron Taylor 1ebfeb3a89 Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into feature/script-event-note-incoming 2024-03-05 23:57:53 -05:00
EliteMasterEric 1b1834e98b Implement a botplay checkbox in the chart editor 2024-03-05 22:27:07 -05:00
EliteMasterEric 059e1c0e13 Implement onNoteIncoming script event. 2024-03-05 21:48:04 -05:00
EliteMasterEric 73cf6b9fd2 Rewrite save data to fix scripted story levels. Add a "pre-transition death delay" 2024-03-04 16:37:42 -05:00
EliteMasterEric f7a3d43e54 Fixes to animation looping and holds 2024-03-02 22:46:13 -05:00
EliteMasterEric 684eb919b5 Make the playback rate option explicit so it doesn't break in the future. 2024-02-29 18:49:20 -05:00
EliteMasterEric 1d70ff95f9 Several chart editor fixes (more precise playback speed, live input mode loads properly from save) 2024-02-28 21:19:21 -05:00
EliteMasterEric 11bb69002b Merge remote-tracking branch 'origin/rewrite/master' into feature/2hot-death-animation 2024-02-22 21:01:07 -05:00
EliteMasterEric 0b49a88cdd Move the crash keybind into a global plugin. 2024-02-22 01:47:35 -05:00
EliteMasterEric 36c0c61946 Merge remote-tracking branch 'origin/rewrite/master' into feature/2hot-death-animation 2024-02-20 18:44:51 -05:00
Jenny Crowe 7d7cf32f44 Chart editor grid now updates when changing the song BPM. HItsound volumes converted to two separate sliders. 2024-02-19 18:18:32 -07:00
EliteMasterEric 44623071cd Redo event stuff for abot and game over audio logic 2024-02-18 03:02:36 -05:00
EliteMasterEric 98e6d4091e Revamp note kind handling in the chart editor. 2024-02-16 22:01:47 -05:00
EliteMasterEric 2dbc0cda6e Fix a missing import. 2024-02-13 03:18:51 -05:00
EliteMasterEric c901763ad8 Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-gamepad-support 2024-02-13 03:12:57 -05:00
EliteMasterEric bd4103fd11 Merge remote-tracking branch 'origin/rewrite/master' into feature/hashlink-hot-reload 2024-02-13 03:06:20 -05:00
EliteMasterEric fa4b896d9a Merge branch 'rewrite/master' into feature/hashlink-hot-reload 2024-02-13 02:23:14 -05:00