1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-27 07:27:12 +00:00
Commit graph

50 commits

Author SHA1 Message Date
EliteMasterEric 9088570b92 Make sure JSON data uses latest version/generatedBy when writing. 2024-05-31 19:21:21 -04:00
EliteMasterEric 98eda8ef55 Give timeFormat a default value (fixes the Stress issues!) 2024-05-31 18:09:07 -04:00
EliteMasterEric 228ac66cc2 Credit the song's charter in the pause menu. 2024-05-19 01:48:51 -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
Cameron Taylor d2b124efca some highscore tallies debugging stuf in progress 2024-03-04 20:47:23 -05:00
EliteMasterEric 44623071cd Redo event stuff for abot and game over audio logic 2024-02-18 03:02:36 -05:00
EliteMasterEric 8a9a7f3b97 Additional chart editor fixes. 2024-02-17 02:13:11 -05:00
EliteMasterEric de8fe2e271 Merge branch 'feature/chart-editor-note-kind' into feature/2hot-death-animation 2024-02-16 22:46:06 -05:00
EliteMasterEric 98e6d4091e Revamp note kind handling in the chart editor. 2024-02-16 22:01:47 -05:00
EliteMasterEric c896300b63 NoteData stringifies nicer now. 2024-02-15 17:23:43 -05:00
Cameron Taylor 8c54a62ed6 Merge branch 'rewrite/master' into feature/freeplay-pico-character 2024-02-13 00:41:03 -05:00
Cameron Taylor 66188fbd52 Merge branch 'rewrite/master' into feature/chart-editor-freeplay-difficulty 2024-02-10 02:32:23 -05:00
EliteMasterEric 091f8eb724 Merge branch 'rewrite/master' into feature/freeplay-pico-character 2024-02-09 23:13:40 -05:00
EliteMasterEric 4bf9f68658 Finalize freeplay preview toolbox 2024-02-09 14:58:57 -05:00
EliteMasterEric 4491465bf9 Implement difficulty rank into Metadata toolbox. 2024-02-08 19:22:28 -05:00
EliteMasterEric 82b63c02e1 Reworks to make Pico mode actually work. 2024-02-05 21:35:58 -05:00
Cameron Taylor 210088a25d Merge branch 'rewrite/master' into feature/chart-editor-event-tooltips 2024-01-18 04:25:04 -05:00
EliteMasterEric 549d461172 Fix an issue where Song offsets would be null rather than zero. 2024-01-14 06:46:58 -05:00
Cameron Taylor e87c895131 Merge branch 'rewrite/master' into feature/chart-editor-drag-edit-holds 2024-01-12 08:13:30 -05:00
Cameron Taylor 7f83daf23b null fixy 2024-01-12 08:04:28 -05:00
EliteMasterEric 025fd326bd Click and drag on a sustain to edit it. 2024-01-12 06:13:34 -05:00
Cameron Taylor da4e77bf44 Merge branch 'rewrite/master' into feature/chart-editor-context-menus 2024-01-05 20:11:38 -05:00
Cameron Taylor 1e07b6ae22 Merge branch 'rewrite/master' into bugfix/chart-editor-modifies-freeplay 2024-01-05 17:41:07 -05:00
Cameron Taylor ab316017f7 removed beatTime nullability? 2024-01-05 17:22:01 -05:00
EliteMasterEric 336810b628 Tooltips when hovering over chart events 2024-01-04 10:00:39 -05:00
EliteMasterEric edc6f85e21 Finish up event editing (selecting an existing event now shows its data in the event data toolbox) 2024-01-03 21:10:14 -05:00
EliteMasterEric bbaa9aa4af Work in progress on context menus and song event editing. 2024-01-03 19:53:17 -05:00
EliteMasterEric a1002c4756 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/conductor-rewrite 2024-01-02 14:14:26 -05:00
EliteMasterEric 4ff5bd21df Fixes to the FNF Legacy JSON parser 2023-12-19 01:23:42 -05:00
EliteMasterEric ca489b5609 Rewrite the Conductor to be a singleton instance. 2023-12-14 16:56:20 -05:00
EliteMasterEric b3236e6134 Fix a bug where modifying a copied template song's BPM in the chart editor would modify BPM in Freeplay. 2023-12-14 00:47:04 -05:00
EliteMasterEric 66611c5d2f Fixes to FlxSound when pausing before starting 2023-12-06 22:03:36 -05:00
EliteMasterEric 1716ffc57f Implement instrumental and vocal offsets into the PlayState. 2023-12-05 02:44:57 -05:00
Eric 421358e069 Nightmare difficulty sprites + a options change (#219)
* Made song variations array optional (defaulting to empty)

* Add support for animated difficulties in Freeplay menu

* Disable funny music thing; disable flashing nightmare graphic when turned off

* Update assets folder

* assets update

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
2023-11-20 11:12:50 -05:00
Cameron Taylor 38ffc37bb2 Merge branch 'rewrite/master' into bugfix/week-5-scripts 2023-11-15 19:44:45 -05:00
Cameron Taylor e4c248896a Merge branch 'rewrite/master' into feature/chart-editor-haxeui-update 2023-11-14 17:08:38 -05:00
EliteMasterEric 3e1146aadf Fix bug where getDirection didn't work in scripts. 2023-11-07 18:32:00 -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 efd29dafbf Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-haxeui-update 2023-11-04 23:51:15 -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 ffd0a98393 FNFC file rework (includes command line quicklaunch) 2023-10-21 01:04:50 -04:00
EliteMasterEric cdab8753ea Lots of reported bugs fixed. 2023-10-18 01:02:10 -04:00
Cameron Taylor afcb677fac index on rewrite/bugfix/pause-and-results-fixes: 9b8fc872 song diff menu sort 2023-10-17 00:38:28 -04:00
EliteMasterEric be4fd74d40 Resolve metadata loading issues. 2023-09-25 23:24:18 -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 8dd07d2763 I discovered a new profiling tool and stayed up until 5 AM optimizing shit. 2023-09-13 14:51:12 -04:00
EliteMasterEric 8431e18d37 Fixed issue where ChartEditorState was not copying SongMetadata properly 2023-09-08 18:00:48 -04:00
EliteMasterEric 7e1c11bb25 New song data parser 2023-09-08 17:45:47 -04:00