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

553 commits

Author SHA1 Message Date
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
EliteMasterEric
e157c23ea7 Apply @:nullSafety to chart editor classes. 2023-08-30 02:24:35 -04:00
Eric
21f44edf1d New crash handler + Additional null safety for ChartEditorState (#130) 
* A bunch of smaller syntax tweaks.

* New crash handler catches and logs critical errors!

* Chart editor now has null safety enabled.

* Fix -W build issue.

* Actually update hmm.json to use the crash handling branch

* Fix issues causing crash handler to trigger
 2023-08-28 15:03:29 -04:00
Eric
42d8d55067 Unit Test Suite (#119) 
* 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.

* Set versions for flixel-ui and hamcrest

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-08-22 04:27:30 -04:00
EliteMasterEric
a548a43759 Note preview graph renders nicely and is fully interactable! 2023-08-16 03:40:44 -04:00
EliteMasterEric
8732adc144 Difficulty selection now updates metadata toolbox 2023-08-15 16:08:12 -04:00
EliteMasterEric
d03a2f0157 WIP on improving the difficulty toolbox 2023-08-14 23:13:12 -04:00
EliteMasterEric
c6a1f5ffea Work on fixing issues with difficulty/variation handling in charts 2023-08-11 14:00:38 -04:00
EliteMasterEric
6096f12307 Fix an issue where new songs on specific stages would crash 2023-08-10 14:21:10 -04:00
EliteMasterEric
de6972cb90 Fix issue where stage wasn't loaded properly, and metronome would play in song preview. 2023-08-09 18:11:50 -04:00
EliteMasterEric
b9c25d6ed9 Fix crashing, broken countdown, broken miss muting in song preview 2023-08-04 17:25:13 -04:00
EliteMasterEric
a0a8d47216 Imported music now plays properly in chart editor state 2023-08-04 16:15:07 -04:00
EliteMasterEric
4852515c42 Fix bug where pressing ENTER in UI would cause song to try to preview. Fix bug where trying to preview a newly created song would crash. 2023-08-04 11:18:00 -04:00
EliteMasterEric
3a31c9731c Fixed several bugs with Play State (mostly restarting the song) 2023-08-02 18:08:49 -04:00
EliteMasterEric
0136202c36 Janky fix 2023-08-02 10:15:54 -04:00
EliteMasterEric
005ffafe23 Merge remote-tracking branch 'origin/master' into feature/chart-editor-song-preview 2023-08-01 16:03:34 -04:00
EliteMasterEric
979a5ad493 Merge branch 'master' into feature/chart-editor-bpm 2023-08-01 14:08:41 -04:00
EliteMasterEric
d0ef34ced6 Merge branch 'master' into feature/new-input-system-yay 2023-07-26 22:00:14 -04:00
EliteMasterEric
b974e6d6d7 Fix issues with playtest and backwards time travel 2023-07-26 21:34:38 -04:00
EliteMasterEric
2048e65bf2 Added ability to start song at a specific timestamp 2023-07-26 20:03:31 -04:00
EliteMasterEric
5ff546bacc First iteration of song playtesting from editor! 2023-07-26 16:52:58 -04:00
EliteMasterEric
a6daf3b0d6 Resolved lag issues caused by creating too many notes in the pool. 2023-07-25 23:11:12 -04:00
EliteMasterEric
3c218ec01c Done with BPM change fixes, currently working on rendering efficiency 2023-07-22 20:16:43 -04:00
Cameron Taylor
85af96d654 Merge branch 'master' into feature/chart-editor-importer 2023-07-22 14:43:05 -04:00
EliteMasterEric
aaad06c97d Merge branch 'feature/new-input-system-yay' into feature/chart-editor-bpm 2023-07-19 21:19:21 -04:00
EliteMasterEric
16e3bfe85e Fix for BPM changes, plus working on hold note rendering 2023-07-19 21:16:39 -04:00
EliteMasterEric
c56517f94f Sort the template view 2023-07-19 01:30:43 -04:00
EliteMasterEric
140afd3c31 Redo note positioning 2023-07-19 01:30:36 -04:00
EliteMasterEric
ce0be2374d Event notes have different sprites for each type. 2023-07-19 01:29:13 -04:00
EliteMasterEric
16bcf2c767 Rework note sprites to pull note style data 2023-07-13 20:27:45 -04:00
EliteMasterEric
70584c6e88 Make funkin.util.Constants auto-imported 2023-07-13 01:13:26 -04:00
EliteMasterEric
54a9b09155 Merge branch 'master' into bugfix/conductor-monster 2023-07-06 12:35:49 -04:00
EliteMasterEric
3bf7955ffa Conductor fix 2023-07-03 13:16:02 -04:00
EliteMasterEric
b764656a4e Merge branch 'master' into feature/chart-editor-importer 2023-07-03 13:09:40 -04:00
EliteMasterEric
1ef17770e9 crochet->lengthMs 2023-07-02 16:16:49 -04:00
EliteMasterEric
25c70564bd WIP on new note rendering, inputs. 2023-06-22 01:41:01 -04:00
EliteMasterEric
28ddadffff Week 6 dialogue support + bug fixes 2023-06-16 17:37:56 -04:00
EliteMasterEric
506e4bf680 Propagate Conductor rework to dependent classes. 2023-06-15 00:15:57 -04:00
EliteMasterEric
2d04b1c5f1 Merge branch 'master' into bugfix/character-data 2023-06-09 15:34:56 -04:00
EliteMasterEric
6f846751c7 Typo fix 2023-06-09 15:32:44 -04:00
EliteMasterEric
038d258233 Chart editor changes (support for legacy import) 2023-06-09 15:28:14 -04:00
EliteMasterEric
6f802f7658 Merge branch 'bugfix/formatting-cleanup' into feature/chart-editor-importer 2023-06-08 17:13:56 -04:00
EliteMasterEric
26998c9164 More chart editor changes 2023-06-08 17:07:35 -04:00
EliteMasterEric
c3577b32ef Port changes to ChartEditorState 2023-06-08 16:53:52 -04:00
EliteMasterEric
3005aa1f3b Added legacy importer 2023-06-08 16:48:34 -04:00
EliteMasterEric
91a9c385b3 WIP of note preview 2023-06-08 16:47:48 -04:00
EliteMasterEric
e68f9ca9a1 Validated formatting of 203 HX files. 2023-06-08 16:30:45 -04:00
EliteMasterEric
c9fb6bc51f Further typo fixes 2023-06-02 15:25:13 -04:00
EliteMasterEric
4d539fdda2 Substate -> SubState (capitalization fix) 2023-06-01 18:52:58 -04:00
EliteMasterEric
317c127730 Deprecation warning fixes (no actual logic changes tho) 2023-05-25 18:33:39 -04:00
Cameron Taylor
67a56f7416 loaded up teehee 2023-04-06 01:39:27 -04:00
Cameron Taylor
1a5b68acd8 substate loading type beat 2023-04-05 00:56:02 -04:00
EliteMasterEric
fe92d00a04 Numerous chart editor fixes. 2023-02-28 21:06:09 -05:00
EliteMasterEric
20e6c7a2be Fix 5 or 6 issues with charting 2023-02-28 13:17:28 -05:00
EliteMasterEric
2ed4752399 Fixed bug where playbar wasn't showing 2023-02-02 18:26:03 -05:00
EliteMasterEric
634258535c Applied new code style to source/ and assets/data/ 2023-01-22 22:25:45 -05:00
EliteMasterEric
e922c026a9 Merge branch 'feature/chart-editor-events' 2023-01-22 20:03:08 -05:00
EliteMasterEric
6d7913786e Working events in chart editor 2023-01-22 19:55:30 -05:00
Cameron Taylor
6ddc735445 2hot stuff in progress wahoo 2023-01-11 00:42:03 -05:00
EliteMasterEric
6b3c15348b Autosave and save-on-quit for chart editor 2023-01-02 17:40:53 -05:00
EliteMasterEric
b3b7fb49c2 Difficulty selector and player previews 2022-12-17 15:19:42 -05:00
EliteMasterEric
a2d803cc83 Note quant snapping 2022-12-14 15:33:30 -05:00
Eric Myllyoja
234dc0ac19 Vocal group work 2022-12-13 17:38:55 -05:00
Eric Myllyoja
19b2f3799a Chart wizard plus shader fixes 2022-12-08 19:33:47 -05:00
Eric Myllyoja
fbf92acf23 Work on Upload Vocals dialog 2022-12-01 17:32:10 -05:00
Eric Myllyoja
3f6cbb61d4 WIP on new chart wizard 2022-11-25 20:48:05 -05:00
Eric Myllyoja
20ac91bbd9 WIP on splash screen 2022-11-24 19:09:47 -05:00
Eric Myllyoja
49edef40cc Tried to get spectogram working 2022-11-09 21:33:39 -05:00
Eric Myllyoja
ee89815981 Several QOL features for chart editor, custom cursor logic 2022-11-08 16:32:00 -05:00
Eric Myllyoja
6e8feecef1 Many improvements to chart system and song format logic 2022-10-26 01:14:29 -04:00
MasterEric
fc4f398157 Playbar fixes 2022-10-14 23:01:41 -04:00
Eric Myllyoja
a423424715 Notifications and more 2022-10-13 21:32:19 -04:00
Eric Myllyoja
cedb224783 More chart editor progress (selection) 2022-10-12 21:42:40 -04:00
Eric Myllyoja
7d21d80915 Clipboard rework 2022-10-11 03:14:57 -04:00
Eric Myllyoja
175908f827 Updated chartformat v7 2022-10-10 20:04:09 -04:00
Eric Myllyoja
36a49affee Chart editor basic difficulty switching 2022-10-07 00:37:21 -04:00
Eric Myllyoja
eb3ad49a30 Work in progress on HaxeUI chart editor 2022-09-07 19:07:08 -04:00