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

142 commits

Author SHA1 Message Date
Cameron Taylor
03cbba4a4e Merge branch 'rewrite/master' into feature/freeplay-ost-text 2024-04-01 22:21:29 -04:00
EliteMasterEric
35f99b49a4 Merge branch 'rewrite/master' into input-offsets 2024-03-28 20:23:31 -04:00
EliteMasterEric
6ab6458e2a Merge remote-tracking branch 'origin/rewrite/master' into feature/credits 2024-03-28 03:00:45 -04:00
EliteMasterEric
b13c6563df Fix issues with Freeplay OST text and add animations. 2024-03-28 01:46:50 -04:00
EliteMasterEric
0e93f2ab27 Improve error logging when the game can't find a chart file. 2024-03-26 21:30:08 -04:00
EliteMasterEric
1e888658f7 First implementation of credits state. 2024-03-26 12:33:54 -04:00
EliteMasterEric
dc638a1303 Fix a bunch of merge bugs. 2024-03-23 15:34:37 -04:00
EliteMasterEric
d50ff73d3c Registries now get added to the Flixel console (and get lazy instantiated so they don't start before the game does) 2024-03-22 02:47:21 -04:00
Cameron Taylor
f7acee94cd Merge branch 'rewrite/master' into feature/freeplay-album-art 2024-03-21 23:37:20 -07: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
36a9c29720 Work in progress on custom album art for freeplay 2024-03-20 14:37:24 -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
be8f5699b5 2hot stutter actually fixed! 2024-03-11 23:42:32 -04:00
Eric
e76a94b682 Merge branch 'rewrite/master' into bugfix/2hot-explosion-polymod 2024-03-05 14:11:54 -05:00
EliteMasterEric
9212ea9c90 Script fixes for 2hot explosions breaking Polymod 2024-03-05 02:29:44 -05:00
Cameron Taylor
d2b124efca some highscore tallies debugging stuf in progress 2024-03-04 20:47:23 -05:00
EliteMasterEric
0294ea0b79 Implemented FlxAnimate characters into Blazin'. 2024-03-01 08:13:06 -05:00
EliteMasterEric
90360de0d0 Working Blazin cutscene and fixed time travel 2024-02-26 19:03:04 -05:00
EliteMasterEric
fb9fd57210 Improve json parsing error handling. 2024-02-23 03:16:51 -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
Cameron Taylor
4bfab35b29 Merge branch 'rewrite/master' into feature/dialogue-data-refactor 2024-02-10 02:25:06 -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
31cd5b3414 Rework Conversation data parsing 2024-02-07 18:45:13 -05:00
EliteMasterEric
fa556dc1f2 Rewrite conversation JSON parsing code. 2024-02-07 09:21:44 -05:00
EliteMasterEric
82b63c02e1 Reworks to make Pico mode actually work. 2024-02-05 21:35:58 -05:00
Cameron Taylor
201e109d64 Merge branch 'rewrite/master' into bugfix/copy-prompt-fixes 2024-02-05 13:03:32 -05:00
EliteMasterEric
387ff4e816 Replace multiple conditions with array. 2024-02-02 22:38:34 -05:00
Jenny Crowe
7137c13382 Copy command now pulses events in selection even if no notes are in the selection. "Copied" prompt now includes events in the text. 2024-01-26 19:36:10 -07:00
Jenny Crowe
4743076314 Added % as a unit to not include a space for when displaying in the event tooltip 2024-01-26 19:01:05 -07:00
Jenny Crowe
bfb032dc7f Added units to other song events. 2024-01-26 18:51:36 -07:00
Jenny Crowe
e111e91a9c Editor: Added ability to set units for event properties. Fixed bug where event icon tooltip wouldn't show an enum text value correctly. 2024-01-24 20:31:25 -07:00
Cameron Taylor
fa00140d23 stringify moved to SongEventSchema 2024-01-18 04:25:15 -05:00
Cameron Taylor
210088a25d Merge branch 'rewrite/master' into feature/chart-editor-event-tooltips 2024-01-18 04:25:04 -05:00
EliteMasterEric
80c7bcdfdf Rewrite Stage data handling to use the Registry pattern, and add support for solid colors. 2024-01-16 17:08:25 -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
2539b90ab8 Merge branch 'rewrite/master' into feature/chart-editor-selection-tweak 2024-01-12 04:43:17 -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
4a0a330eb4 Redo logic around note selection, add new buttons for selecting individual sides. 2024-01-04 08:20:34 -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
e23c1464f6 Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offsets-part-1 2023-12-07 16:32:12 -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
EliteMasterEric
ed10d2c5d0 Multiple chart editor bug fixes +tweaks 2023-11-28 20:36:59 -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
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
73107dbc07 Update HaxeUI cursor handling, and remove Funkin components 2023-10-31 14:43:01 -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
dc728133d1 Merge remote-tracking branch 'origin/master' into feature/chart-editor-performance-revamp 2023-09-20 19:41:17 -04:00
EliteMasterEric
29c22a422f Fixed a JSON parser issue causing event data to be parsed wrong! 2023-09-18 20:14:43 -04:00
EliteMasterEric
06269e95fd Fix to crash in freeplay (swapped two args oops!) 2023-09-18 20:02:17 -04:00
EliteMasterEric
b56768d9b5 Fix an issue where the game would try and fail to load metadata for a newly created song in the Chart Editor. 2023-09-18 17:59:55 -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
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
00cfeeff72 Created the Note Style class and data registry 2023-07-13 20:25:44 -04:00
EliteMasterEric
883ab87931 Moved AnimationData into the data package 2023-07-13 20:25:01 -04:00
EliteMasterEric
e68f9ca9a1 Validated formatting of 203 HX files. 2023-06-08 16:30:45 -04:00
EliteMasterEric
a599dbea11 Reworked Story Menu (data driven) 2023-05-17 16:42:58 -04:00
EliteMasterEric
021f7a0a1c Work in progress on story menu data storage rework 2023-05-16 22:09:53 -04:00