1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-27 23:46:45 +00:00
Commit graph

104 commits

Author SHA1 Message Date
Cameron Taylor ded413ab77
Merge branch 'rewrite/master' into gamerbross/chart-importer-suffix 2024-06-01 16:26:18 -04:00
EliteMasterEric 9088570b92 Make sure JSON data uses latest version/generatedBy when writing. 2024-05-31 19:21:21 -04:00
EliteMasterEric 98eda8ef55 Give timeFormat a default value (fixes the Stress issues!) 2024-05-31 18:09:07 -04:00
Cameron Taylor 4f34079b98 Merge branch 'audio-stream' into develop-0.4.0 2024-05-29 16:45:35 -04:00
Axuko 004ed32fad Remove alot of unused imoprts 2024-05-27 22:34:28 -07:00
gamerbross 4acfbfb76d Fix Legacy Chart Importer wrong instrumental 2024-05-25 01:21:37 +02:00
EliteMasterEric 13595fca70 Changelog entry for chart metadata 2024-05-19 01:49:06 -04:00
EliteMasterEric 228ac66cc2 Credit the song's charter in the pause menu. 2024-05-19 01:48:51 -04:00
EliteMasterEric a8a2dc83d3 Add a .visible attribute to story weeks. 2024-05-02 12:46:24 -04:00
EliteMasterEric b06a35ea2f Add , and . hotkeys to chart editor. 2024-05-02 03:38:27 -04:00
EliteMasterEric 1e5f90774c What if modded songs showed up in game with no extra work? 😳 2024-05-01 21:51:33 -04:00
EliteMasterEric 07092269b8 Merge branch 'rewrite/master' into input-offsets 2024-04-04 18:45:16 -04:00
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