Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-30 11:26:53 -05:00
Code Issues Projects Releases Packages Wiki Activity
2247 commits 30 branches 20 tags 3 GiB
Commit graph

326 commits

Author SHA1 Message Date
Cameron Taylor
eea614b4f5 samples stability 2023-11-29 05:49:59 -05:00
Cameron Taylor
73810a5059 Merge branch 'rewrite/master' of https://github.com/funkincrew/funkin-secret into feature/chart-waveform 2023-11-29 04:44:37 -05:00
Cameron Taylor
0899c60e8d Merge pull request #234 from FunkinCrew/polish/welcome-screen 
more info on playbar
 2023-11-29 04:25:11 -05:00
Cameron Taylor
87b1cabbac Merge branch 'rewrite/master' into bugfix/platform-fixes 2023-11-29 01:46:10 -05:00
Cameron Taylor
ca9f42fedf waveform in progres 2023-11-29 01:43:59 -05:00
EliteMasterEric
99ed8b94d7 Target the current time change rather than the first one. 2023-11-28 21:44:09 -05:00
EliteMasterEric
90fc00f9bb Additional web fixes, Github CI should be happy now. 2023-11-28 21:19:07 -05:00
EliteMasterEric
ed10d2c5d0 Multiple chart editor bug fixes +tweaks 2023-11-28 20:36:59 -05:00
Cameron Taylor
21b79c0b83 bpm in playbar 2023-11-28 04:30:29 -05:00
Cameron Taylor
d9d5744f1e difficulty playbar 2023-11-28 04:05:17 -05:00
Cameron Taylor
aee8df4fcb default note snapps 2023-11-27 23:29:48 -05:00
Cameron Taylor
e44559d056 last modified 2023-11-27 20:37:10 -05:00
Cameron Taylor
41384ddf0d playtesting fix 2023-11-25 03:50:22 -05:00
Cameron Taylor
f3a38e0232 fixing the stop 2023-11-25 02:48:43 -05:00
Cameron Taylor
64a4512980 charting song polish + recents menu fix 2023-11-25 02:18:39 -05:00
EliteMasterEric
290c568cb5 Disable notification actions while playtest is open. 2023-11-24 16:11:53 -05:00
EliteMasterEric
a2cee82779 Fixing up a rough Git merge 2023-11-24 00:58:12 -05:00
EliteMasterEric
4e1945b373 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/chart-editor-macro-rework 2023-11-24 00:49:51 -05:00
EliteMasterEric
47f39b072a Convert chart editor to macro-based UIState 2023-11-24 00:42:07 -05:00
EliteMasterEric
bab7d6cf53 Reworks to dialogs 2023-11-24 00:41:38 -05:00
Cameron Taylor
811640ef6a Merge branch 'rewrite/master' into feature/chart-editor-backup-popup 2023-11-23 20:08:13 -05:00
Cameron Taylor
645b9b579a don't close backup dialog if opening folder 2023-11-23 18:35:57 -05:00
Cameron Taylor
ecdb89c3a6 Merge pull request #228 from FunkinCrew/polish/chart-intro-screen 
Polish/chart intro screen
 2023-11-22 20:45:35 -05:00
Cameron Taylor
dbaaf639ac Merge branch 'rewrite/master' into feature/chart-editor-backup-popup 2023-11-22 20:27:37 -05:00
EliteMasterEric
668fbd3b37 Fixes for autosave notification 2023-11-22 20:25:25 -05:00
Cameron Taylor
d66141c15a playhead dragging 2023-11-22 19:53:56 -05:00
EliteMasterEric
4ace7c9cf4 Add "Go to Backups" menu item 2023-11-22 19:42:28 -05:00
EliteMasterEric
700ebb6a83 Add action buttons for notifications 2023-11-22 19:41:52 -05:00
EliteMasterEric
97b259d1c2 Finalized backup handling 2023-11-22 19:17:35 -05:00
EliteMasterEric
780220c2d4 Move notification handling into its own class. 2023-11-22 19:16:38 -05:00
Cameron Taylor
cdfb3fb172 dialog cursor fix 2023-11-21 18:45:31 -05:00
Cameron Taylor
63f65149f7 skip transition into chart editor 2023-11-21 16:09:13 -05:00
Cameron Taylor
25a66ddbfe open recent on welcome screen 2023-11-21 15:23:24 -05:00
Cameron Taylor
620cd50c1d Chart Editor: Sustain Note polish (#223) 
* light lerp polish on ghost sustains

* small hold fix

* small number tweak

---------

Co-authored-by: Eric <ericmyllyoja@gmail.com>
 2023-11-21 15:10:18 -05:00
Cameron Taylor
b121a6bc65 Merge pull request #225 from FunkinCrew/debugging/folder-opening 
open log on debug menu
 2023-11-21 15:10:08 -05:00
EliteMasterEric
27234ddd67 Work in progress on backup popup 2023-11-21 13:31:02 -05:00
Eric
95b43cce55 Several UI tweaks and usability fixes. (#224) 
Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-11-21 02:12:34 -05:00
Cameron Taylor
98aa59f85a open log on debug menu 2023-11-21 01:37:49 -05:00
Eric
e2250b18ff [BUGFIX] Chart Editor Event Handling (#220) 
* Fix a bug causing editing or removal of song events to not happen properly.

* Fix an exception thrown as the application closes.

* Fix an issue with moving events in the chart causing a crash.

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-11-21 01:00:06 -05:00
Eric
daf1ba85dc Fix crash on completing song after playtesting (#217) 
Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-11-20 11:27:58 -05:00
Eric
a1da5a5758 Bugfix/chart editor fixins (#222) 
* Rewrite crash log file to contain more information

* Detect host platform.

* Suppress shouldHandleCursor spam

* Fix bug where previous song's vocals are kept on new songs

* Fix an issue where note snapping could go negative.

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-11-20 11:26:58 -05:00
EliteMasterEric
2140158786 Debug controls, plus a chart loading fix 2023-11-16 00:02:42 -05:00
Cameron Taylor
4335e5a4dc Merge branch 'rewrite/master' into bugfix/chart-editor-preview-inst 2023-11-15 21:32:11 -05:00
EliteMasterEric
398b2e386e Remove wonky Spectrogram code 2023-11-15 11:30:38 -05:00
Cameron Taylor
16eda2a717 Merge branch 'rewrite/master' into bugfix/chart-editor-preview-inst 2023-11-15 01:14:19 -05:00
Cameron Taylor
aecd587ef0 Merge branch 'rewrite/master' into feature/chart-editor-open-recent 2023-11-15 01:10:26 -05:00
Cameron Taylor
e4c248896a Merge branch 'rewrite/master' into feature/chart-editor-haxeui-update 2023-11-14 17:08:38 -05:00
Cameron Taylor
124a400e8b Merge branch 'rewrite/master' into rewrite/bugfix/chart-editor-event-placement 2023-11-14 17:05:07 -05:00
Cameron Taylor
12d5cf796b Merge branch 'rewrite/master' into feature/chart-editor-haxeui-update 2023-11-14 16:10:35 -05:00
EliteMasterEric
c7f35bed5d Fix a bug where completing a song in Preview would mute music. 2023-11-13 18:56:07 -05:00
EliteMasterEric
ca3e00c1cd Merge branch 'rewrite/master' into feature/chart-editor-haxeui-update 2023-11-10 16:37:55 -05:00
EliteMasterEric
ce97a002cb Reorganize a whole bunch of classes and perform syntax cleanup. 2023-11-07 04:04:22 -05:00
EliteMasterEric
66ae60e9e4 Updated syntax after merge 2023-11-05 01:19:47 -04:00
EliteMasterEric
a0ae4c418d Merge remote-tracking branch 'origin/rewrite/master' into rewrite/bugfix/chart-editor-event-placement 2023-11-05 00:14:44 -04:00
EliteMasterEric
de5edb3cc2 Fix variation metadata and error message in 
ChartEditorImportExportHandler
 2023-11-05 00:08:18 -04:00
EliteMasterEric
27de7dc036 Update notification expiry time constant in 
ChartEditorState and ChartEditorDialogHandler
 2023-11-05 00:08:06 -04:00
EliteMasterEric
efd29dafbf Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-haxeui-update 2023-11-04 23:51:15 -04:00
Cameron Taylor
cf63f7d6b6 Merge branch 'rewrite/master' into feature/chart-editor-new-font 2023-11-04 16:09:34 -04:00
EliteMasterEric
2b468ad926 Fix issue where changing width of dropdown would cause a crash 2023-11-02 17:40:00 -04:00
EliteMasterEric
73107dbc07 Update HaxeUI cursor handling, and remove Funkin components 2023-10-31 14:43:01 -04:00
EliteMasterEric
d5cf9bfc22 New shortcut handler 2023-10-28 19:56:34 -04:00
EliteMasterEric
b2dd58b904 Resolve several bugs related to event note placement. 2023-10-27 01:42:05 -04:00
EliteMasterEric
eec3ac3ced Clean up several messy chunks of code, and add support for dragging notes and events. 2023-10-26 05:46:22 -04:00
EliteMasterEric
8d875949b9 Clean up several messy chunks of code, and add support for dragging selected notes. 2023-10-26 05:45:53 -04:00
EliteMasterEric
acce2ac811 Move ScriptEventType to its own module. 2023-10-25 01:12:46 -04:00
EliteMasterEric
33a1b81737 Fixes for quicksave 2023-10-24 15:50:02 -04:00
EliteMasterEric
a9e253a530 Save handling (with window title!) 2023-10-23 12:22:29 -04:00
EliteMasterEric
8664aed4cc Implement "Open Recent" menu 2023-10-22 15:43:39 -04:00
EliteMasterEric
ffd0a98393 FNFC file rework (includes command line quicklaunch) 2023-10-21 01:04:50 -04:00
Cameron Taylor
902ad4be3a Merge branch 'rewrite/master' into rewrite/bugfix/chart-editor-more-fixes 2023-10-18 19:47:50 -04:00
Cameron Taylor
25c24a9bc8 Merge branch 'rewrite/master' into rewrite/bugfix/chart-editor-various-fixes 2023-10-18 19:32:31 -04:00
EliteMasterEric
26f83b5a81 Fix _time of nullable compile error. 2023-10-18 16:02:56 -04:00
EliteMasterEric
fa358e455e Merge branch 'rewrite/master' into charting-sfx 2023-10-18 15:50:12 -04:00
EliteMasterEric
cdab8753ea Lots of reported bugs fixed. 2023-10-18 01:02:10 -04:00
EliteMasterEric
6bf6b8ef11 Merge branch 'rewrite/master' into rewrite/bugfix/chart-editor-various-fixes 2023-10-18 00:04:04 -04:00
EliteMasterEric
d47c5f5765 Merge branch 'rewrite/bugfix/chart-editor-various-fixes' into rewrite/master 2023-10-17 21:21:46 -04:00
EliteMasterEric
92a4a41d20 Fix an issue where chart editor theme continues when exiting 2023-10-17 17:59:01 -04:00
EliteMasterEric
4e0934dbd1 Fix issues with changing BPMs of songs. 2023-10-17 16:57:06 -04:00
EliteMasterEric
f51592963e Fixes for a few bugs in the chart editor. 2023-10-17 02:42:52 -04:00
Cameron Taylor
937082fecf Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/snapped-paste 2023-10-15 19:23:06 -04:00
EliteMasterEric
022b93bc43 Merge branch 'rewrite/master' into rewrite/feature/chart-editor-erect-template 2023-10-15 18:42:38 -04:00
EliteMasterEric
098dedd41e Fix "Could not locate metadataDialog" 2023-10-15 00:22:25 -04:00
EliteMasterEric
dd38dbbadf Tweaked the numbers on scrolling 2023-10-14 23:57:40 -04:00
EliteMasterEric
0f08b1133e Rename some sounds used by the chart editor 2023-10-14 22:49:24 -04:00
Cameron Taylor
9ff4885173 charting sound effects in progress! 2023-10-11 19:39:52 -04:00
Cameron Taylor
6e2441b540 Merge pull request #184 from FunkinCrew/rewrite/bugfix/glowup-autosave 
Fix exit button in Chart Editor menu
 2023-10-11 06:32:00 -04:00
EliteMasterEric
05044d9af3 Override F4 behavior 2023-10-11 00:39:16 -04:00
EliteMasterEric
d7a15dc713 Fix exit button in Chart Editor menu 2023-10-11 00:30:41 -04:00
EliteMasterEric
299a3a1a25 Merge branch 'rewrite/master' into rewrite/feature/chart-editor-wasd 2023-10-10 23:38:38 -04:00
EliteMasterEric
4b23eaea59 Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/chart-editor-erect-template 2023-10-09 12:15:05 -04:00
EliteMasterEric
e33c825a1f Merge branch 'rewrite/master' into rewrite/feature/chart-editor-variation-button 2023-10-06 23:11:11 -04:00
EliteMasterEric
7c653a9e9b Merge branch 'rewrite/master' into rewrite/feature/chart-editor-wasd 2023-10-06 22:54:12 -04:00
EliteMasterEric
b6752531bf Add chart editor theme 2023-09-29 22:29:32 -04:00
EliteMasterEric
6c99f7161d Working Input Style, note snapping in menu, W/S to scroll 2023-09-29 21:49:07 -04:00
EliteMasterEric
8580cf1640 Snapped/unsnapped pasting, plus fixes for selection box and event rendering. 2023-09-26 20:36:41 -04:00
EliteMasterEric
2fcb906edf Fixed volume sliders, Load Instrumental button, and fixed hitsounds. 2023-09-26 17:46:07 -04:00
EliteMasterEric
42bb50882d "Add Variation" button, SongMetadata format changes, bug fixes, resolve metadata loading issues. 2023-09-25 23:24:07 -04:00
EliteMasterEric
dc728133d1 Merge remote-tracking branch 'origin/master' into feature/chart-editor-performance-revamp 2023-09-20 19:41:17 -04:00
Cameron Taylor
cbbdba031d Merge pull request #150 from FunkinCrew/bugfix-squash/song-data-parser-rework 
Chart Editor: Song Data Parser Rework
 2023-09-19 19:54:28 -04:00
Cameron Taylor
f6bcd8bf05 Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into feature/chart-note-snapping-ui 2023-09-19 19:25:42 -04:00
Cameron Taylor
a2e43b8e4e Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into feature/ghost-hold-notes 2023-09-19 19:16:02 -04:00
EliteMasterEric
86c105aff8 Merge remote-tracking branch 'origin/master' into bugfix-squash/song-data-parser-rework 2023-09-18 21:58:22 -04:00
EliteMasterEric
06269e95fd Fix to crash in freeplay (swapped two args oops!) 2023-09-18 20:02:17 -04:00
EliteMasterEric
0d84559606 HTML5 should build now 2023-09-18 17:19:31 -04:00
EliteMasterEric
09b03efeea Merge branch 'master' into bugfix/chart-editor-null-safety 2023-09-18 16:52:47 -04:00
Cameron Taylor
35239909d0 woops fix conditional 2023-09-18 15:48:40 -04:00
Cameron Taylor
446dc30277 Merge branch 'master' into bugfix-squashed/macos-file-browse 2023-09-18 15:40:52 -04:00
EliteMasterEric
8dd07d2763 I discovered a new profiling tool and stayed up until 5 AM optimizing shit. 2023-09-13 14:51:12 -04:00
Cameron Taylor
5d7efcd6b9 Merge pull request #142 from FunkinCrew/bugfix/chart-editor-playbar-buttons 
Fixed a bug where the playbar buttons wouldn't work
 2023-09-13 00:09:37 -04:00
Cameron Taylor
fc3d2a17b6 Merge pull request #143 from FunkinCrew/feature/chart-editor-snap 
Chart Editor: Configure Snapping (+ important bug fix!)
 2023-09-12 23:56:05 -04:00
EliteMasterEric
b42e4ceb67 Fix cursor modes on toolboxes. 2023-09-12 23:37:07 -04:00
Cameron Taylor
2b3f99547a Merge pull request #144 from FunkinCrew/feature/chart-editor-beat-lines 
Darkened beat dividers on chart grid.
 2023-09-12 22:41:46 -04:00
Cameron Taylor
ff34771ca3 Merge branch 'master' into feature/chart-editor-file-keybinds 2023-09-12 22:37:37 -04:00
Cameron Taylor
e02dee2601 fixed N -> O typo? 2023-09-12 22:34:49 -04:00
EliteMasterEric
a02058b260 Merge branch 'feature/improved-cursor' into develop 2023-09-12 19:52:08 -04:00
EliteMasterEric
7083f6e7ce Additional cursor and playbar fixes. 2023-09-12 19:43:19 -04:00
EliteMasterEric
fa28932dea Implementing custom cursor modes for better interface readability. 2023-09-12 19:42:39 -04:00
EliteMasterEric
71e1fccce1 Merge remote-tracking branch 'origin/master' into bugfix/chart-editor-playbar-buttons 2023-09-12 18:51:16 -04:00
EliteMasterEric
2f16b9af96 Merge remote-tracking branch 'origin/feature/chart-editor-snap' into develop 2023-09-12 01:02:08 -04:00
EliteMasterEric
a63246ff51 Remove notification on snapping change. 2023-09-12 00:25:05 -04:00
EliteMasterEric
74bd9084b6 Merge remote-tracking branch 'origin/feature/ghost-hold-notes' into develop 2023-09-11 19:42:25 -04:00
EliteMasterEric
abcec3c5f6 Render a ghost hold note when dragging to place (plus fix for hold notes on different note quants) 2023-09-11 19:42:10 -04:00
EliteMasterEric
430c937811 Merge remote-tracking branch 'origin/feature/chart-editor-snap' into develop 2023-09-11 18:29:29 -04:00
EliteMasterEric
d3f5a81b13 Fix a bug where ghost note would be properly snapped but placed note would not. 2023-09-11 18:29:08 -04:00
EliteMasterEric
1524f6a96e Merge branch 'bugfix-squashed/macos-file-browse' into develop 2023-09-11 17:52:04 -04:00
EliteMasterEric
2dad5953fd I hope someone got fired for that blunder. 2023-09-11 17:42:46 -04:00
EliteMasterEric
2ea030d5a2 Merge remote-tracking branch 'origin/bugfix-squash/playbar-scrollarea-height' into HEAD 2023-09-08 18:25:40 -04:00
EliteMasterEric
1acce31123 Merge remote-tracking branch 'origin/feature/chart-note-snapping-ui' into HEAD 2023-09-08 18:25:20 -04:00
EliteMasterEric
a3e3341a1a Merge branch 'bugfix-squash/chart-editor-template-bpm' into HEAD 2023-09-08 18:24:21 -04:00
EliteMasterEric
ef1cb10bb3 Merge remote-tracking branch 'origin/bugfix-squash/song-data-parser-rework' into HEAD 2023-09-08 18:23:55 -04:00
EliteMasterEric
e8952d101a Merge remote-tracking branch 'origin/bugfix-squashed/macos-file-browse' into HEAD 2023-09-08 18:23:01 -04:00
EliteMasterEric
acadec80de Merge remote-tracking branch 'origin/feature/chart-editor-file-keybinds' into HEAD 2023-09-08 18:21:25 -04:00
EliteMasterEric
15741843fc Merge remote-tracking branch 'origin/feature/chart-editor-beat-lines' into HEAD 2023-09-08 18:21:08 -04:00
EliteMasterEric
f46c8821c8 Merge remote-tracking branch 'origin/feature/chart-editor-snap' into HEAD 2023-09-08 18:20:52 -04:00
EliteMasterEric
f8ae4b2a62 Merge remote-tracking branch 'origin/bugfix/chart-editor-playbar-buttons' into HEAD 2023-09-08 18:20:46 -04:00
EliteMasterEric
c24fa3c154 Fix issue where playbar scroll area wasn't scaled to the grid. 2023-09-08 18:07:08 -04:00
EliteMasterEric
7a161e4cec Improved UI for note snapping (and notif on difficulty change) 2023-09-08 18:04:25 -04:00
EliteMasterEric
8431e18d37 Fixed issue where ChartEditorState was not copying SongMetadata properly 2023-09-08 18:00:48 -04:00
EliteMasterEric
f4bc682ea1 Remove funkin.play.song.SongData and refactor app to match. 2023-09-08 17:46:44 -04:00
EliteMasterEric
2c3e513d5b Fixed bugs with saving charts on Mac 
Added FILE_DROP_SUPPORTED compilation flag and edited UI text to match.
 2023-09-08 17:41:20 -04:00
Cameron Taylor
96a0b2fe87 Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into feature/chart-editor-snap 2023-09-04 23:30:02 -04:00
EliteMasterEric
2b092abd8a Added missing File menu keybinds 2023-09-04 15:33:08 -04:00
EliteMasterEric
3a47eed3b9 Darkened beat dividers on chart grid. 2023-09-01 00:56:10 -04:00
EliteMasterEric
97b640f30b Note snapping yay! 2023-08-31 23:48:15 -04:00
EliteMasterEric
2f26a97dcb WIP on chart editor snapping 2023-08-31 21:56:49 -04:00
EliteMasterEric
bc5b34cdd2 Fixed a bug where the playbar buttons wouldn't work while the cursor was over the UI. 2023-08-31 19:14:01 -04:00
EliteMasterEric
c813e23203 Merge remote-tracking branch 'origin/master' into bugfix/chart-editor-null-safety 2023-08-31 18:47:31 -04:00
EliteMasterEric
c78c6439a6 Filled out null safety checks. 2023-08-31 18:47:23 -04:00
Eric
279277b18c Unit Tests: Coverage Reporting and Github Actions Integration (#131) 
* Initial test suite

* Fix some build warnings

* Implemented working unit tests with coverage

* Reduced some warnings

* Fix a mac-specific issue

* Add 2 additional unit test classes.

* Multiple new unit tests

* Some fixins

* Remove auto-generated file

* WIP on hiding ignored tests

* Added list of debug hotkeys

* Remove old website

* Remove empty file

* Add more unit tests

* Fix bug where arrows would nudge BF

* Fix bug where ctrl/alt would flash capsules

* Fixed bug where bf-old easter egg broke

* Remove duplicate lines

* More test-related stuff

* Some code cleanup

* Add mocking and a test assets folder

* More TESTS!

* Update Hmm...

* Update artist on Monster

* More minor fixes to individual functions

* 1.38% unit test coverage!

* Even more tests? :O

* More unit test work

* Rework migration for BaseRegistry

* gameover fix

* Fix an issue with Lime

* Fix issues with version parsing on data files

* 100 total unit tests!

* Added even MORE unit tests!

* Additional test tweaks :3

* Fixed tests on windows by updating libraries.

* A bunch of smaller syntax tweaks.

* New crash handler catches and logs critical errors!

* Chart editor now has null safety enabled.

* Null safety on all tests

* New Level data test

* Generate proper code coverage reports!

* Disable null safety on ChartEditorState for unit testing

* Update openfl to use latest fixes for crash reporting

* Added unit test to Github Workflow

* Updated unit tests to compile with null safety enabled by inlining assertions.

* Added coverage gutters as a recommended extension

* Impreovements to tests involving exceptions

* Disable a few incomplete tests.

* Add scripts for building unit coverage reports on linux

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-08-30 18:31:59 -04:00
Eric
3828179218 Chart Editor: Several bug fixes (#139) 
* Fix a crash bug caused by unhandled null value.

* Fix bug where note preview wouldn't update on song load

* Fix note preview not updating when loading inst, fixed BF health icon positioning
 2023-08-30 18:29:09 -04:00