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
2261 commits 30 branches 20 tags 3 GiB
Commit graph

361 commits

Author SHA1 Message Date
EliteMasterEric
06269e95fd Fix to crash in freeplay (swapped two args oops!) 2023-09-18 20:02:17 -04:00
EliteMasterEric
09b03efeea Merge branch 'master' into bugfix/chart-editor-null-safety 2023-09-18 16:52:47 -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
a02058b260 Merge branch 'feature/improved-cursor' into develop 2023-09-12 19:52:08 -04:00
EliteMasterEric
fa28932dea Implementing custom cursor modes for better interface readability. 2023-09-12 19:42:39 -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
f4bc682ea1 Remove funkin.play.song.SongData and refactor app to match. 2023-09-08 17:46:44 -04:00
EliteMasterEric
c78c6439a6 Filled out null safety checks. 2023-08-31 18:47:23 -04:00
Eric
cb81371b4a Fix an occasional bug where "default" will be used over "" causing a crash on song load. (#135) 2023-08-28 15:07:51 -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
74dac9d830 Fix a story mode bug where charts would sometimes not be loaded for the second and third song. (#134) 2023-08-22 23:18:37 -04:00
Eric
235969e9a7 Fixed an issue where the Week 6 countdown was anti-aliased. (#133) 2023-08-22 22:45:58 -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
c6a1f5ffea Work on fixing issues with difficulty/variation handling in charts 2023-08-11 14:00:38 -04:00
EliteMasterEric
68c85d9214 Made the currently-unused Divisions field optional. 2023-08-10 15:34:40 -04:00
EliteMasterEric
34abee594d Fix bug where onUpdate was called twice per frame 2023-08-09 18:11:19 -04:00
EliteMasterEric
859b543118 Merge branch 'bugfix/play-state-fix' into feature/chart-editor-song-preview 2023-08-09 17:53:25 -04:00
EliteMasterEric
3e02f7fca9 Fix a bug where beatState sometimes gets called before create 2023-08-09 00:28:09 -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
3e093510af Fixed a bug where beat hit events were called multiple times during the conductor 2023-08-04 12:35:01 -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
13671cf290 Make sure timestamps are consistent with use of Int64. 2023-08-04 11:13:41 -04:00
EliteMasterEric
49622f2441 Fix build issues caused by int64 handling 2023-08-03 22:22:29 -04:00
EliteMasterEric
29466af4b7 Fix issue where strumline would stay pressed when resetting. 2023-08-03 12:19:36 -04:00
EliteMasterEric
050086fb36 Fixed camera focus on game over. 2023-08-03 11:40:19 -04:00
Cameron Taylor
5bbf279208 gameover fix 2023-08-03 11:22:52 -04:00
EliteMasterEric
3a31c9731c Fixed several bugs with Play State (mostly restarting the song) 2023-08-02 18:08:49 -04:00
EliteMasterEric
b54c335886 Fix for Menu->Freeplay and Play->Pause transitions 2023-08-02 11:00:23 -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
c0745d4ad7 Hide warning 2023-07-31 14:08:48 -04:00
EliteMasterEric
4e67791249 Vwoosh notes on reset 2023-07-31 13:42:13 -04:00
EliteMasterEric
92a0c367b7 Typo fixes 2023-07-31 13:31:17 -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
03444161e8 Merge branch 'feature/new-input-system-yay' into feature/chart-editor-song-preview 2023-07-26 20:03:37 -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
6af5259a10 Fix an issue where sustain sprites were not killed when the song was reset. 2023-07-25 21:39:19 -04:00
Cameron Taylor
211ccc2e47 Merge pull request #107 from FunkinCrew/feature/offset-editor-tweaks 
Tweaks and improvements to the animation editor
 2023-07-24 16:26:04 -04:00
EliteMasterEric
3c218ec01c Done with BPM change fixes, currently working on rendering efficiency 2023-07-22 20:16:43 -04:00
Cameron Taylor
f634a099c3 actual songdata git merge proper lol 2023-07-22 14:43:28 -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
ae76b24a65 New time calculation functions 2023-07-19 01:30:23 -04:00
EliteMasterEric
adda3020a9 Alphabetical sort 2023-07-19 01:29:43 -04:00
EliteMasterEric
16bcf2c767 Rework note sprites to pull note style data 2023-07-13 20:27:45 -04:00
EliteMasterEric
ba53957191 Fixed an issue where dialogue scripts were not being reloaded 2023-07-13 20:26:56 -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
70584c6e88 Make funkin.util.Constants auto-imported 2023-07-13 01:13:26 -04:00
EliteMasterEric
24c9786166 Merge branch 'master' into feature/new-input-system-yay 2023-07-10 18:16:16 -04:00
EliteMasterEric
17a8610640 Added colors to hold note covers 2023-07-10 18:14:34 -04:00
EliteMasterEric
796a51325f Hold note covers are in and properly positioned 2023-07-08 01:03:46 -04:00
EliteMasterEric
54a9b09155 Merge branch 'master' into bugfix/conductor-monster 2023-07-06 12:35:49 -04:00
EliteMasterEric
a3929db7a8 Merge branch 'master' into feature/offset-editor-tweaks 2023-07-06 01:00:32 -04:00
EliteMasterEric
8e071221ff Work in progress on hold covers 2023-07-05 22:11:58 -04:00
EliteMasterEric
b615fbf82a WIP on hold covers 2023-07-04 16:38:10 -04:00
EliteMasterEric
f932422d74 Merge branch 'master' into feature/week-6-dialogue 2023-07-03 13:18:53 -04:00
EliteMasterEric
b764656a4e Merge branch 'master' into feature/chart-editor-importer 2023-07-03 13:09:40 -04:00
EliteMasterEric
90bd5af376 Merge branch 'master' into feature/offset-editor-tweaks 2023-07-03 12:22:33 -04:00
EliteMasterEric
bb8b0b59b1 Video cutscenes in Week 7 no longer broken 2023-07-02 16:46:40 -04:00
EliteMasterEric
49ce962e34 Make metadata file loading actually work 2023-07-02 16:17:25 -04:00
EliteMasterEric
cddc50bbe5 Rework quickWatch 2023-07-02 16:17:04 -04:00
EliteMasterEric
8685054696 Freaky Menu uses metadata.json for BPM data. 2023-07-02 15:34:34 -04:00
EliteMasterEric
66f56dbf2c system->sound 2023-07-02 15:34:07 -04:00
EliteMasterEric
085d7aaa9d Fix for note splashes 2023-06-27 21:29:50 -04:00
EliteMasterEric
d91c341bd2 Fixed a bug where you could hold notes forever 2023-06-27 18:06:33 -04:00
EliteMasterEric
2f7708c106 Hold notes pretty much done! yay! 2023-06-27 17:22:51 -04:00
Cameron Taylor
740c547293 Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret into feature/week-7-cutscenes 2023-06-27 17:07:35 -04:00
EliteMasterEric
a672db7b0e Messing around with logic for hold note misses/health gain 2023-06-27 13:43:42 -04:00
EliteMasterEric
47d8d9e4db Work in progress on redoing hold note rendering 2023-06-26 20:40:26 -04:00
EliteMasterEric
0fac918428 Reworked anti-aliasing code (sprites now default to true) 2023-06-25 12:36:00 -04:00
EliteMasterEric
2cae781984 Sustains are kinda working? 2023-06-22 19:28:39 -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
Cameron Taylor
092dcb5a35 counter fix thing 2023-06-15 14:31:49 -04:00
EliteMasterEric
9a541c5769 Merge branch 'death-alt' of https://github.com/FunkinCrew/Funkin-secret into death-alt 2023-06-15 03:49:24 -04:00
EliteMasterEric
02632a623c Disable fakeout happening 100% of the time. 2023-06-15 03:48:52 -04:00
Cameron Taylor
aabf36a788 Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into death-alt 2023-06-15 03:27:03 -04:00
EliteMasterEric
594cec62ad Results screen now moves to Story menu if we are in story mode 2023-06-15 00:30:20 -04:00
EliteMasterEric
3d8dd8d604 More conductor rework changes 2023-06-15 00:29:40 -04:00
EliteMasterEric
3c558ce192 Pixel fixes 2023-06-15 00:29:18 -04:00
EliteMasterEric
506e4bf680 Propagate Conductor rework to dependent classes. 2023-06-15 00:15:57 -04:00
EliteMasterEric
b783271451 ComboCounter->ComboMilestone 2023-06-15 00:11:20 -04:00
EliteMasterEric
338342ad5e Tweaks and improvements to the animation editor 2023-06-13 17:13:14 -04:00
Cameron Taylor
b564ad087b vocals fix... lol! 2023-06-13 01:04:29 -04:00
EliteMasterEric
b847212375 Migrator fixes 2023-06-10 03:59:25 -04:00
EliteMasterEric
ba20e5c39c Merge remote-tracking branch 'origin/recapitalizing' into bugfix/character-data 2023-06-09 15:46:40 -04:00
Cameron Taylor
a7eb91ce29 the SubState... 2023-06-09 15:44:29 -04:00
EliteMasterEric
2d04b1c5f1 Merge branch 'master' into bugfix/character-data 2023-06-09 15:34:56 -04:00
EliteMasterEric
038d258233 Chart editor changes (support for legacy import) 2023-06-09 15:28:14 -04:00
EliteMasterEric
2200b6a24a File renames 2023-06-09 15:27:23 -04:00
Cameron Taylor
27a9ef211e Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into bugfix/formatting-cleanup 2023-06-09 14:12:37 -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
3005aa1f3b Added legacy importer 2023-06-08 16:48:34 -04:00
EliteMasterEric
e68f9ca9a1 Validated formatting of 203 HX files. 2023-06-08 16:30:45 -04:00
EliteMasterEric
a2b08e3e34 Update hxCodec 2023-06-06 17:38:40 -04:00
EliteMasterEric
1d3c4d61a6 Syntax fixes to get the branch to build 2023-06-06 17:38:31 -04:00
Cameron Taylor
7a04a2d774 blueball check 2023-06-04 01:19:08 -04:00
Cameron Taylor
2d772a526b no skipping easter egg!! 2023-06-02 15:56:40 -04:00
EliteMasterEric
9f8d1dbac2 Playstate fixes WIP (TODO: fix compile errors) 2023-06-02 15:35:01 -04:00
EliteMasterEric
4851ff5c27 Internal rework to song events 2023-06-02 14:35:28 -04:00
EliteMasterEric
57caeef802 Work on re-enabling cutscenes 2023-06-02 14:35:08 -04:00
EliteMasterEric
4d539fdda2 Substate -> SubState (capitalization fix) 2023-06-01 18:52:58 -04:00
EliteMasterEric
09318c258b Remove old story menu state 2023-06-01 15:59:56 -04:00
Eric
b49a2857e5 Revert guaranteed fakeout 2023-06-01 00:33:30 -04:00
EliteMasterEric
374f03dae3 Fakeout death now uses HScript 2023-06-01 00:31:32 -04:00
Cameron Taylor
2d16aab488 snds effects 2023-05-31 03:28:53 -04:00
Cameron Taylor
dbab5a912d death alt easter egg 2023-05-31 03:03:10 -04:00
EliteMasterEric
a2ddeec5bb Daddy Dearest animation fixes 2023-05-30 16:20:57 -04:00
EliteMasterEric
4efafe8a78 Health icon refactors/fixes 2023-05-26 17:10:35 -04:00
EliteMasterEric
872f7c93e8 Added onAdd event so GF character can fix position in Tutorial 2023-05-26 17:10:08 -04:00
EliteMasterEric
dc932eb8d7 A few bug fixes related to vocal tracks 2023-05-25 19:36:32 -04:00
EliteMasterEric
2af4a51b15 Merge branch 'master' into feature/split-vocals 2023-05-25 18:39:41 -04:00
EliteMasterEric
2f10de3594 New refactor to VoicesGroup to make multiple vocal tracks actually work 2023-05-25 18:34:26 -04:00
EliteMasterEric
317c127730 Deprecation warning fixes (no actual logic changes tho) 2023-05-25 18:33:39 -04:00
EliteMasterEric
09654170ed Erect mixes play properly when selected 2023-05-22 13:47:01 -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
Cameron Taylor
03cab4a326 Merge pull request #81 from FunkinCrew/results-anims 
different result screen in progress
 2023-04-24 17:59:20 -04:00
Cameron Taylor
e802aa885b gf shit fix 2023-04-21 17:39:27 -04:00
Cameron Taylor
03f48289e1 Merge pull request #84 from FunkinCrew/bugfix/songeventscriptevent 
Fixed an issue where SongEventScriptEvent would not be dispatched
 2023-04-20 16:56:05 -04:00
EliteMasterEric
337802a6bf Fixed an issue where SongEventScriptEvent would not be dispatched 2023-04-20 13:48:15 -04:00
Cameron Taylor
6fe747eac1 true perfect 2023-04-19 04:08:03 -04:00
Cameron Taylor
b4468a45c3 no more shit loops! 2023-04-19 03:00:52 -04:00
Cameron Taylor
2fefb657ec excellent looping issue 2023-04-19 02:51:47 -04:00
Cameron Taylor
7c225bea18 no forced shit mode 2023-04-17 17:59:47 -04:00
Cameron Taylor
e872dddd15 looping fix 2023-04-17 17:59:22 -04:00
Cameron Taylor
b1dfbb2ef2 shit one 2023-04-17 11:02:45 -04:00
Cameron Taylor
c2e340ef19 variation and hmm fix 2023-04-16 18:57:18 -04:00
Cameron Taylor
f411cdac88 different result screen in progress 2023-04-16 15:33:20 -04:00
Cameron Taylor
1a5b68acd8 substate loading type beat 2023-04-05 00:56:02 -04:00
Ravy
c68ed233f9 make game use rfc format for spitting inputs 2023-03-18 19:47:23 +00:00
Cameron Taylor
f32330914e score fix for ravy teehe 2023-03-09 12:39:56 -05:00
Cameron Taylor
bf7a42d143 Merge pull request #20 from FunkinCrew/chart-editor-fixes-with-dave 
Chart editor fixes with dave
 2023-03-08 13:24:39 -05:00
Cameron Taylor
f9a7e309fb score change 2023-03-02 04:20:03 -05:00
EliteMasterEric
75b4c732db Mac fix, doh! 2023-03-01 18:22:28 -05:00
EliteMasterEric
fe92d00a04 Numerous chart editor fixes. 2023-02-28 21:06:09 -05:00
Cameron Taylor
9ef5974e52 build fix? 2023-02-22 15:30:58 -05:00
Cameron Taylor
9ff3d4355d Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret 2023-02-22 15:01:07 -05:00
Cameron Taylor
dd73539294 inputSpitter for ravy 2023-02-22 14:46:46 -05:00
EliteMasterEric
e035adab72 Merge branch 'feature/flxanimate' 2023-02-21 21:01:22 -05:00
EliteMasterEric
cdd8cd2ed2 Basic working tankman sprites and cutscenes 2023-02-21 20:58:15 -05:00
Cameron Taylor
ca443411be stage edit funny moments 2023-02-03 18:10:06 -05:00
Cameron Taylor
0f9d0a6c98 stage editor in progress 2023-01-27 02:38:37 -05:00
EliteMasterEric
634258535c Applied new code style to source/ and assets/data/ 2023-01-22 22:25:45 -05:00
EliteMasterEric
6d7913786e Working events in chart editor 2023-01-22 19:55:30 -05:00