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

233 commits

Author SHA1 Message Date
Cameron Taylor
3652550b1a Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into feature/chart-editor-offsets-part-1 2023-12-07 18:14:10 -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
eebb2e874f Merge branch 'rewrite/master' into bugfix/chart-editor-notif-in-bg 2023-11-29 16:42:40 -05:00
EliteMasterEric
ed10d2c5d0 Multiple chart editor bug fixes +tweaks 2023-11-28 20:36:59 -05:00
EliteMasterEric
47f39b072a Convert chart editor to macro-based UIState 2023-11-24 00:42:07 -05:00
Cameron Taylor
0e21220e24 Merge pull request #215 from FunkinCrew/feature/rebind-debug-keys 
Debug Controls, plus a chart loading fix
 2023-11-16 02:20:53 -05:00
EliteMasterEric
2140158786 Debug controls, plus a chart loading fix 2023-11-16 00:02:42 -05:00
EliteMasterEric
b8504c8e3a Merge remote-tracking branch 'origin/rewrite/master' into bugfix/senpai-naughty 2023-11-15 00:47:47 -05:00
Cameron Taylor
12d5cf796b Merge branch 'rewrite/master' into feature/chart-editor-haxeui-update 2023-11-14 16:10:35 -05:00
Cameron Taylor
dbeb2a1a1e Merge branch 'rewrite/master' into bugfix/cleanup 2023-11-14 15:31:54 -05:00
EliteMasterEric
ca3e00c1cd Merge branch 'rewrite/master' into feature/chart-editor-haxeui-update 2023-11-10 16:37:55 -05:00
EliteMasterEric
a9dfd4adcf Fix a bug where multiple vocal tracks would play at once 2023-11-09 17:00:46 -05:00
EliteMasterEric
ce97a002cb Reorganize a whole bunch of classes and perform syntax cleanup. 2023-11-07 04:04:22 -05:00
EliteMasterEric
21ba81c799 Fix a bug where returning to a week in Story Mode would not play dialog 2023-11-06 17:51:56 -05: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
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
e14e6448ac More event type refactors 2023-10-25 01:13:06 -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
EliteMasterEric
cdab8753ea Lots of reported bugs fixed. 2023-10-18 01:02:10 -04:00
Cameron Taylor
d4e6befc28 submodule merge fix 2023-10-17 21:40:20 -04:00
Cameron Taylor
08845915ea fixed cutscene skipping too fast from disabling inputs 2023-10-17 21:26:32 -04:00
Cameron Taylor
a129e6219d Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/master 2023-10-17 17:20:08 -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
Cameron Taylor
732fe59c3e Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/precise-inputs-gamepad 2023-10-16 16:47:51 -04:00
Cameron Taylor
865f771c4a Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/preferences-rewrite 2023-10-15 20:54:22 -04:00
EliteMasterEric
8589c10c75 Fixes to Pause screen and Results screen 2023-10-11 17:33:55 -04:00
EliteMasterEric
989d1c3175 Merge rewrite/master, fix high score retrieval 2023-10-10 23:32:01 -04:00
EliteMasterEric
e967b1e7f3 Fix vocals not changing when switching difficulties. 2023-10-09 14:19:52 -04:00
EliteMasterEric
74b925d2c6 Assert the difficulty exists (and throw an error if it doesn't) before performing reset. 2023-10-09 14:13:14 -04:00
Cameron Taylor
5617f8f63e Merge pull request #165 from FunkinCrew/rewrite/feature/chart-editor-variation-button 
Chart Editor: Add Variation Button
 2023-10-09 05:20:11 -04:00
EliteMasterEric
4a4708fe23 That is the fastest I have ever fixed a bug holy shit. 2023-10-06 11:42:39 -04:00
EliteMasterEric
5931345c71 Rewrite precise inputs to work on gamepad 2023-10-05 02:21:01 -04:00
EliteMasterEric
380d30d63f Rewrote code for preferences to use Save data. 2023-10-04 11:40:55 -04:00
EliteMasterEric
490b2f18d0 Rewrite save data functionality (now with type safety and migration) 2023-10-03 19:14:46 -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
86c105aff8 Merge remote-tracking branch 'origin/master' into bugfix-squash/song-data-parser-rework 2023-09-18 21:58:22 -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
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
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
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
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
050086fb36 Fixed camera focus on game over. 2023-08-03 11:40:19 -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
EliteMasterEric
3c218ec01c Done with BPM change fixes, currently working on rendering efficiency 2023-07-22 20:16:43 -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
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
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
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
bb8b0b59b1 Video cutscenes in Week 7 no longer broken 2023-07-02 16:46:40 -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
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
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
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
EliteMasterEric
3d8dd8d604 More conductor rework changes 2023-06-15 00:29:40 -04:00
EliteMasterEric
b783271451 ComboCounter->ComboMilestone 2023-06-15 00:11:20 -04:00
Cameron Taylor
b564ad087b vocals fix... lol! 2023-06-13 01:04:29 -04:00
EliteMasterEric
2d04b1c5f1 Merge branch 'master' into bugfix/character-data 2023-06-09 15:34:56 -04:00
EliteMasterEric
e68f9ca9a1 Validated formatting of 203 HX files. 2023-06-08 16:30:45 -04:00
EliteMasterEric
1d3c4d61a6 Syntax fixes to get the branch to build 2023-06-06 17:38:31 -04:00
EliteMasterEric
9f8d1dbac2 Playstate fixes WIP (TODO: fix compile errors) 2023-06-02 15:35:01 -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
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
a599dbea11 Reworked Story Menu (data driven) 2023-05-17 16:42:58 -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
1a5b68acd8 substate loading type beat 2023-04-05 00:56:02 -04:00