1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-15 19:33:36 +00:00
Commit graph

84 commits

Author SHA1 Message Date
EliteMasterEric 07092269b8 Merge branch 'rewrite/master' into input-offsets 2024-04-04 18:45:16 -04:00
EliteMasterEric 35f99b49a4 Merge branch 'rewrite/master' into input-offsets 2024-03-28 20:23:31 -04:00
EliteMasterEric 463e946b17 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/buncha-2hot-fixes 2024-03-27 01:40:22 -04:00
EliteMasterEric 6407770ed6 Rework every class to use FunkinSound. 2024-03-23 17:50:48 -04:00
EliteMasterEric dc638a1303 Fix a bunch of merge bugs. 2024-03-23 15:34:37 -04:00
EliteMasterEric 36a9c29720 Work in progress on custom album art for freeplay 2024-03-20 14:37:24 -04:00
EliteMasterEric d56c33cd17 Fix a dozen tiny issues with 2hot's audio and visuals (and some script crashes!). 2024-03-16 00:55:57 -04:00
EliteMasterEric 059e1c0e13 Implement onNoteIncoming script event. 2024-03-05 21:48:04 -05:00
EliteMasterEric 9212ea9c90 Script fixes for 2hot explosions breaking Polymod 2024-03-05 02:29:44 -05:00
EliteMasterEric 73cf6b9fd2 Rewrite save data to fix scripted story levels. Add a "pre-transition death delay" 2024-03-04 16:37:42 -05:00
EliteMasterEric 0294ea0b79 Implemented FlxAnimate characters into Blazin'. 2024-03-01 08:13:06 -05:00
EliteMasterEric 44623071cd Redo event stuff for abot and game over audio logic 2024-02-18 03:02:36 -05:00
EliteMasterEric 5ec0939263 Bunch of changes to NoteScriptEvent and death logic 2024-02-15 17:25:28 -05:00
EliteMasterEric 60cde55950 Add scripted FunkinSprite 2024-02-12 16:50:18 -05:00
EliteMasterEric eea8dde455 Merge branch 'rewrite/master' into rewrite/weekend-1-gameplay-shaderdev 2024-02-10 02:30:50 -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 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 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
Cameron Taylor 4815bed2cb abot in progresss 2023-12-18 20:15:40 -05:00
EliteMasterEric ce97a002cb Reorganize a whole bunch of classes and perform syntax cleanup. 2023-11-07 04:04:22 -05: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 acce2ac811 Move ScriptEventType to its own module. 2023-10-25 01:12:46 -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 f4bc682ea1 Remove funkin.play.song.SongData and refactor app to match. 2023-09-08 17:46:44 -04:00
Eric bb09cc19e7 HTML5: Several fixes to asset loading (#136)
* Update Polymod to fix async script loading.

* Got into the Main Menu but playstate doesn't work

* Got into PlayState but GF script breaks!

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
2023-09-04 22:18:45 -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 9b66bc186a alphabetical -> alphabetically 2023-08-01 15:25:46 -04:00
EliteMasterEric 979a5ad493 Merge branch 'master' into feature/chart-editor-bpm 2023-08-01 14:08:41 -04:00
Cameron Taylor d750af4396 directory fix and hmm lock 2023-07-31 15:40:47 -04:00
EliteMasterEric 624d4f5111 Fix asset redirection 2023-07-31 15:04:18 -04:00
EliteMasterEric d0ef34ced6 Merge branch 'master' into feature/new-input-system-yay 2023-07-26 22:00:14 -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 adda3020a9 Alphabetical sort 2023-07-19 01:29:43 -04:00
EliteMasterEric d251d71daa Asset redirect 2023-07-17 21:54:58 -04:00
EliteMasterEric ba53957191 Fixed an issue where dialogue scripts were not being reloaded 2023-07-13 20:26:56 -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 5729eb0413 Fix reloading song events 2023-06-15 00:28:52 -04:00
Cameron Taylor a42daecdc1 Delete ScriptedMusicBeatSubstate.hx 2023-06-13 01:31:41 -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 e68f9ca9a1 Validated formatting of 203 HX files. 2023-06-08 16:30:45 -04:00
EliteMasterEric 4851ff5c27 Internal rework to song events 2023-06-02 14:35:28 -04:00
EliteMasterEric b126ac28f4 state->State 2023-06-02 14:34:47 -04:00
EliteMasterEric 4d539fdda2 Substate -> SubState (capitalization fix) 2023-06-01 18:52:58 -04:00
EliteMasterEric 872f7c93e8 Added onAdd event so GF character can fix position in Tutorial 2023-05-26 17:10:08 -04:00
Cameron Taylor 503a0107c7 Merge pull request #98 from FunkinCrew/bugfix/character-crashes
Bugfix/character crashes
2023-05-26 13:44:59 -04:00
EliteMasterEric 010d5672bb Fix for FlxSound error; fix typo in Spirit class 2023-05-24 16:11:29 -04:00