1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-09 00:04:42 +00:00
Commit graph

2061 commits

Author SHA1 Message Date
EliteMasterEric bdb3fe28bb Update assets 2023-11-05 00:35:23 -04:00
EliteMasterEric 4f34484689 Use correct location for js.html.Navigator. 2023-11-05 00:26:03 -04:00
EliteMasterEric a0ae4c418d Merge remote-tracking branch 'origin/rewrite/master' into rewrite/bugfix/chart-editor-event-placement 2023-11-05 00:14:44 -04:00
EliteMasterEric de5edb3cc2 Fix variation metadata and error message in
ChartEditorImportExportHandler
2023-11-05 00:08:18 -04:00
EliteMasterEric 27de7dc036 Update notification expiry time constant in
ChartEditorState and ChartEditorDialogHandler
2023-11-05 00:08:06 -04:00
EliteMasterEric a605f53e07 Updated git references for haxeui-core and
haxeui-flixel
2023-11-05 00:07:49 -04:00
EliteMasterEric efd29dafbf Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-haxeui-update 2023-11-04 23:51:15 -04:00
Cameron Taylor 8dfc59da68 assets update idk? 2023-11-04 16:11:50 -04:00
Cameron Taylor cf63f7d6b6 Merge branch 'rewrite/master' into feature/chart-editor-new-font 2023-11-04 16:09:34 -04:00
Cameron Taylor c3d772cc54 Merge pull request #201 from FunkinCrew/rewrite/feature/chart-editor-drag-notes
Chart Editor: Note Dragging + Code Refactors
2023-11-04 15:11:43 -04:00
Cameron Taylor 47fd6426a6 Merge branch 'rewrite/master' into rewrite/feature/chart-editor-drag-notes 2023-11-04 15:07:53 -04:00
Cameron Taylor a04ca577a4 Update action.yml 2023-11-04 12:36:09 -04:00
Cameron Taylor fb35724676 Merge pull request #194 from FunkinCrew/bugfix/freeplay-fixins
Freeplay: Several crashes fixed and working Random!
2023-11-04 11:59:26 -04:00
EliteMasterEric 2b468ad926 Fix issue where changing width of dropdown would cause a crash 2023-11-02 17:40:00 -04:00
EliteMasterEric 0dd9ba7fd2 Fix merge conflicts in FreeplayState 2023-11-01 23:20:47 -04:00
EliteMasterEric 4b92c145b4 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/freeplay-fixins 2023-11-01 23:11:50 -04:00
EliteMasterEric 15ffbf2fe7 Fixed a MacOS-specific issue 2023-11-01 23:09:52 -04:00
EliteMasterEric b9b1461ab5 WIP on refactoring some classes related to controls 2023-10-31 15:30:47 -04:00
EliteMasterEric 73107dbc07 Update HaxeUI cursor handling, and remove Funkin components 2023-10-31 14:43:01 -04:00
EliteMasterEric d5cf9bfc22 New shortcut handler 2023-10-28 19:56:34 -04:00
EliteMasterEric b2dd58b904 Resolve several bugs related to event note placement. 2023-10-27 01:42:05 -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 8d875949b9 Clean up several messy chunks of code, and add support for dragging selected notes. 2023-10-26 05:45:53 -04:00
EliteMasterEric e14e6448ac More event type refactors 2023-10-25 01:13:06 -04:00
EliteMasterEric acce2ac811 Move ScriptEventType to its own module. 2023-10-25 01:12:46 -04:00
EliteMasterEric 33a1b81737 Fixes for quicksave 2023-10-24 15:50:02 -04:00
EliteMasterEric 818ae6ddd9 Update assets 2023-10-23 12:23:06 -04:00
EliteMasterEric a9e253a530 Save handling (with window title!) 2023-10-23 12:22:29 -04:00
EliteMasterEric 8664aed4cc Implement "Open Recent" menu 2023-10-22 15:43:39 -04:00
EliteMasterEric ffd0a98393 FNFC file rework (includes command line quicklaunch) 2023-10-21 01:04:50 -04:00
EliteMasterEric 8042f6c5a8 Update HaxeUI again 2023-10-19 15:05:54 -04:00
Cameron Taylor 0a4e0861cc Merge pull request #198 from FunkinCrew/bugfix/quick-merge-fix
Quick merge fix
2023-10-19 01:30:03 -04:00
EliteMasterEric fb4a307195 Update hmm and HaxeUI 2023-10-19 01:24:20 -04:00
EliteMasterEric 92785166ef Remove duplicate pushUnique 2023-10-19 01:03:58 -04:00
EliteMasterEric 33644d0c7f Merge branch 'rewrite/master' into bugfix/freeplay-fixins 2023-10-19 00:46:25 -04:00
Cameron Taylor 041b5749d6 Merge pull request #188 from FunkinCrew/rewrite/bugfix/anim-editor-crash-fix
Hide AnimateAtlas characters in the animation editor.
2023-10-19 00:44:05 -04:00
Cameron Taylor a98d543974 Merge pull request #189 from FunkinCrew/rewrite/feature/remember-difficulty
Remember difficulty when returning to the Story menu
2023-10-18 23:59:35 -04:00
Cameron Taylor c4e2f61e2d Merge branch 'rewrite/master' into rewrite/feature/remember-difficulty 2023-10-18 23:59:21 -04:00
Cameron Taylor 5574a5d2c8 Merge pull request #197 from FunkinCrew/rewrite/bugfix/chart-editor-more-fixes
Chart Editor: Several crash/stability bugs fixed
2023-10-18 19:48:15 -04:00
Cameron Taylor 902ad4be3a Merge branch 'rewrite/master' into rewrite/bugfix/chart-editor-more-fixes 2023-10-18 19:47:50 -04:00
Cameron Taylor 8a4c32bd95 Merge pull request #195 from FunkinCrew/rewrite/bugfix/chart-editor-various-fixes
Fixes for a few bugs in the chart editor.
2023-10-18 19:32:45 -04:00
Cameron Taylor 25c24a9bc8 Merge branch 'rewrite/master' into rewrite/bugfix/chart-editor-various-fixes 2023-10-18 19:32:31 -04:00
Cameron Taylor 256a9e7a23 remote submodule stuff 2023-10-18 19:30:50 -04:00
Cameron Taylor 8f23537bac assets submod merge 2023-10-18 18:37:00 -04:00
Cameron Taylor 58f3c5c186 Merge pull request #190 from FunkinCrew/charting-sfx
charting sound effects in progress!
2023-10-18 17:28:56 -04:00
EliteMasterEric 8d87f51f72 Update assets folder 2023-10-18 16:05:16 -04:00
EliteMasterEric 26f83b5a81 Fix _time of nullable compile error. 2023-10-18 16:02:56 -04:00
EliteMasterEric f016a9ab10 Merge assets folder 2023-10-18 15:55:43 -04:00
EliteMasterEric 73022207fa Merge hitsound audios 2023-10-18 15:52:44 -04:00
EliteMasterEric fa358e455e Merge branch 'rewrite/master' into charting-sfx 2023-10-18 15:50:12 -04:00