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

2029 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cameron Taylor eea614b4f5 samples stability 2023-11-29 05:49:59 -05:00
Cameron Taylor 73810a5059 Merge branch 'rewrite/master' of https://github.com/funkincrew/funkin-secret into feature/chart-waveform 2023-11-29 04:44:37 -05:00
Cameron Taylor 0899c60e8d Merge pull request #234 from FunkinCrew/polish/welcome-screen 
more info on playbar
 2023-11-29 04:25:11 -05:00
Cameron Taylor f691de6452 Merge pull request #236 from FunkinCrew/bugfix/platform-fixes 
HTML5 and MacOS platform fixes
 2023-11-29 01:48:14 -05:00
Cameron Taylor 87b1cabbac Merge branch 'rewrite/master' into bugfix/platform-fixes 2023-11-29 01:46:10 -05:00
Cameron Taylor ca9f42fedf waveform in progres 2023-11-29 01:43:59 -05:00
EliteMasterEric 99ed8b94d7 Target the current time change rather than the first one. 2023-11-28 21:44:09 -05:00
EliteMasterEric 90fc00f9bb Additional web fixes, Github CI should be happy now. 2023-11-28 21:19:07 -05:00
EliteMasterEric 9a2f235bed Platform-specific fixes for HTML5 and MacOS 2023-11-28 20:52:45 -05:00
Cameron Taylor 21b79c0b83 bpm in playbar 2023-11-28 04:30:29 -05:00
Cameron Taylor d9d5744f1e difficulty playbar 2023-11-28 04:05:17 -05:00
Cameron Taylor aee8df4fcb default note snapps 2023-11-27 23:29:48 -05:00
Cameron Taylor e44559d056 last modified 2023-11-27 20:37:10 -05:00
Eric 0704e9530b Merge pull request #232 from FunkinCrew/polish/charting-music-bg 
charting song polish + recents menu fix
 2023-11-27 19:35:11 -05:00
Cameron Taylor 6421b5d57d Merge branch 'rewrite/master' into polish/charting-music-bg 2023-11-27 17:50:27 -05:00
Cameron Taylor 1054662faa Merge pull request #233 from FunkinCrew/rewrite/ci-verify-submodule-commits 
fix(ci): submodules shallow cloning might run into issues when updating them
 2023-11-27 15:22:48 -05:00
Hazel 8c5c706013 update submod 2023-11-27 18:20:03 +00:00
Hazel 3cff8873ce possibly fix submodule issues 2023-11-27 18:07:25 +00:00
Hazel e28c498dd8 huh 2023-11-27 18:06:29 +00:00
Cameron Taylor 41384ddf0d playtesting fix 2023-11-25 03:50:22 -05:00
Cameron Taylor f3a38e0232 fixing the stop 2023-11-25 02:48:43 -05:00
Eric d03543c197 Merge pull request #227 from FunkinCrew/rewrite/ci-verify-submodule-commits 
ci: verify whether submodules are functional before attempting build
 2023-11-25 02:40:48 -05:00
Cameron Taylor 99e3bc81ec Merge branch 'rewrite/master' into rewrite/ci-verify-submodule-commits 2023-11-25 02:37:51 -05:00
Cameron Taylor 64a4512980 charting song polish + recents menu fix 2023-11-25 02:18:39 -05:00
Cameron Taylor 418751d7a4 Merge pull request #231 from FunkinCrew/bugfix/chart-editor-macro-rework 
Chart Editor: Macro Rework + QA Bug Fixes
 2023-11-25 01:01:18 -05:00
Cameron Taylor 7f42c7930a assets update real lol! 2023-11-25 00:55:26 -05:00
Cameron Taylor 56fe099382 assets merging 2023-11-25 00:51:34 -05:00
EliteMasterEric a2cee82779 Fixing up a rough Git merge 2023-11-24 00:58:12 -05:00
EliteMasterEric 4e1945b373 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/chart-editor-macro-rework 2023-11-24 00:49:51 -05:00
EliteMasterEric 47f39b072a Convert chart editor to macro-based UIState 2023-11-24 00:42:07 -05:00
EliteMasterEric bab7d6cf53 Reworks to dialogs 2023-11-24 00:41:38 -05:00
Cameron Taylor 1315f7e182 Merge pull request #230 from FunkinCrew/feature/chart-editor-backup-popup 
Chart Editor: Backup Popup
 2023-11-23 20:11:56 -05:00
Cameron Taylor 811640ef6a Merge branch 'rewrite/master' into feature/chart-editor-backup-popup 2023-11-23 20:08:13 -05:00
Cameron Taylor ebae2512ab assets merge update 2023-11-23 20:06:58 -05:00
Cameron Taylor a2ce1fdd5e opening and selecting specific file 2023-11-23 19:54:34 -05:00
Cameron Taylor 2d33461a24 windows file slash fix for opening folders 2023-11-23 19:48:28 -05:00
Cameron Taylor 645b9b579a don't close backup dialog if opening folder 2023-11-23 18:35:57 -05:00
Cameron Taylor ecdb89c3a6 Merge pull request #228 from FunkinCrew/polish/chart-intro-screen 
Polish/chart intro screen
 2023-11-22 20:45:35 -05:00
Cameron Taylor ce11c6bde5 Merge pull request #229 from FunkinCrew/polish/playbarhead-drag 
playhead dragging
 2023-11-22 20:44:15 -05:00
Cameron Taylor dbaaf639ac Merge branch 'rewrite/master' into feature/chart-editor-backup-popup 2023-11-22 20:27:37 -05:00
EliteMasterEric 668fbd3b37 Fixes for autosave notification 2023-11-22 20:25:25 -05:00
Cameron Taylor d66141c15a playhead dragging 2023-11-22 19:53:56 -05:00
EliteMasterEric 4ace7c9cf4 Add "Go to Backups" menu item 2023-11-22 19:42:28 -05:00
EliteMasterEric 700ebb6a83 Add action buttons for notifications 2023-11-22 19:41:52 -05:00
EliteMasterEric 97b259d1c2 Finalized backup handling 2023-11-22 19:17:35 -05:00
EliteMasterEric 780220c2d4 Move notification handling into its own class. 2023-11-22 19:16:38 -05:00
Cameron Taylor 21d7046774 dropdown assets update 2023-11-21 19:33:29 -05:00
Cameron Taylor cdfb3fb172 dialog cursor fix 2023-11-21 18:45:31 -05:00
Cameron Taylor 63f65149f7 skip transition into chart editor 2023-11-21 16:09:13 -05:00
Cameron Taylor 25a66ddbfe open recent on welcome screen 2023-11-21 15:23:24 -05:00