cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-15 19:33:36 +00:00
Code Issues Releases Wiki Activity
2625 commits 30 branches 20 tags 6.8 GiB
Commit graph

258 commits

Author SHA1 Message Date
Cameron Taylor 96d02261c5 Merge branch 'rewrite/master' into feature/stage-solids 2024-01-17 21:40:26 -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 3d2e50906f I was in fact a dumbass. 2024-01-15 22:13:01 -05:00
EliteMasterEric e391c02015 Polish note display visuals, and scrap Killer judgement. 2024-01-15 22:10:42 -05:00
EliteMasterEric 313fd55e98 WIP 2024-01-15 14:20:44 -05:00
EliteMasterEric 043fb553f6 Fix an issue causing an overflow error when using gamepad (WINDOWS ONLY) 2024-01-10 00:20:00 -05:00
Cameron Taylor da4e77bf44 Merge branch 'rewrite/master' into feature/chart-editor-context-menus 2024-01-05 20:11:38 -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 a1002c4756 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/conductor-rewrite 2024-01-02 14:14:26 -05:00
Cameron Taylor 92e0022fed derp comma! 2024-01-01 19:13:51 -05:00
Cameron Taylor 11d21c1369 Merge branch 'rewrite/master' into bugfix/chart-editor-monday-fixes 2024-01-01 19:09:36 -05:00
EliteMasterEric 8fea7eb734 Fix a bug where the background of the game over screen is pink 2023-12-19 01:57:39 -05:00
EliteMasterEric ad02bf2ee0 Fix to GameOverSubstate exiting to Freeplay instead of Chart Editor 2023-12-19 01:27:58 -05:00
Cameron Taylor 48f916240f playstate import fixes and asset update 2023-12-18 21:33:29 -05:00
shr ab7ba485cb added GrabbableCamera 2023-12-18 20:15:40 -05:00
shr 26818e6d99 made it a library 2023-12-18 20:15:40 -05:00
shr 883ef13e65 finally did it 2023-12-18 20:15:40 -05:00
shr 56cecf98a0 fix typo 2023-12-18 20:15:40 -05:00
shr b88fbeb206 update draw() 2023-12-18 20:15:40 -05:00
shr 95b03debb3 still buggy 2023-12-18 20:15:40 -05:00
EliteMasterEric 88ca58f9e2 Fixes for updated HaxeUI and Flixel. 2023-12-15 21:09:01 -05:00
EliteMasterEric ca489b5609 Rewrite the Conductor to be a singleton instance. 2023-12-14 16:56:20 -05:00
EliteMasterEric 6060282f20 Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offsets-part-2 2023-12-08 16:12:56 -05:00
Cameron Taylor 8f30532ed4 offsets null fix quick 2023-12-08 01:57:46 -05:00
EliteMasterEric 7f0caeb026 Work in progress on offsets in Chart Editor state. 2023-12-08 01:15:22 -05:00
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