cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-12 08:25:13 +00:00
Code Issues Releases Wiki Activity
2553 commits 30 branches 20 tags 3 GiB
Commit graph

2553 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cameron Taylor 2539b90ab8 Merge branch 'rewrite/master' into feature/chart-editor-selection-tweak 2024-01-12 04:43:17 -05:00
Cameron Taylor d19924ae41 assets submod update 2024-01-12 04:18:04 -05:00
EliteMasterEric c05131e6a9 Additional freeplay cleanup 2024-01-11 00:52:42 -05:00
EliteMasterEric 315aeea998 Update assets submodule 2024-01-11 00:31:18 -05:00
EliteMasterEric 462eece09a Use proper difficulty rating data, proper clear percentage 2024-01-11 00:30:00 -05:00
EliteMasterEric fc12f956f6 Fix alignment of character pixel icons in freeplay menu 2024-01-10 20:58:29 -05:00
EliteMasterEric 06964ce1e3 Fix HTML5 build issue 2024-01-10 20:58:06 -05:00
EliteMasterEric eea9ac1883 Update to include linux fix (???) 2024-01-10 20:27:40 -05:00
EliteMasterEric 9947425a9e Merge remote-tracking branch 'origin/rewrite/master' into bugfix/controller-overflow 2024-01-10 00:23:36 -05:00
EliteMasterEric 043fb553f6 Fix an issue causing an overflow error when using gamepad (WINDOWS ONLY) 2024-01-10 00:20:00 -05:00
EliteMasterEric 59999aa8fd Fix an issue with release builds 2024-01-10 00:16:51 -05:00
Eric 90dd067aa0 Merge pull request #272 from FunkinCrew/ninjamuffin99-patch-1 
Update Project.xml
 2024-01-09 20:47:20 -05:00
Cameron Taylor 27d5a6d5a5 Update Project.xml 2024-01-09 19:31:39 -05:00
Cameron Taylor 49984fb359 Merge pull request #271 from FunkinCrew/feature/crash-log-haxelibs 
Implement haxelib versions into crash logs
 2024-01-09 16:17:46 -05:00
EliteMasterEric 14df32d908 Implement haxelib versions into crash logs 2024-01-09 14:48:20 -05:00
Cameron Taylor e507cbd327 Merge pull request #269 from FunkinCrew/feature/chart-editor-measure-numbers 
Measure numbers next to ticks and support for initial time signature.
 2024-01-05 20:41:07 -05:00
Cameron Taylor ac902c19c5 beats per measure conductor instance fix 2024-01-05 20:38:46 -05:00
Cameron Taylor ff88c53f7c steps per measure instance conductor fix 2024-01-05 20:38:20 -05:00
Cameron Taylor 350ce19783 conductor instnace small fix lol! 2024-01-05 20:37:13 -05:00
Cameron Taylor 8f7c449194 Merge branch 'rewrite/master' into feature/chart-editor-measure-numbers 2024-01-05 20:35:15 -05:00
Cameron Taylor dcc79d56a3 assets submod update 2024-01-05 20:33:15 -05:00
Cameron Taylor b6b0f9fa46 Merge pull request #266 from FunkinCrew/feature/chart-editor-context-menus 
Chart Editor: Context menus and song event editing.
 2024-01-05 20:31:13 -05:00
Cameron Taylor cc7577a333 fix conductor instance stuf on watchPlugin 2024-01-05 20:25:54 -05:00
Cameron Taylor 97ea4b0891 re-add debug_refreshModules? 2024-01-05 20:23:15 -05:00
Cameron Taylor da4e77bf44 Merge branch 'rewrite/master' into feature/chart-editor-context-menus 2024-01-05 20:11:38 -05:00
Cameron Taylor e25f3bc073 assets/art submomd 2024-01-05 20:07:41 -05:00
Cameron Taylor 595f5a68c2 Merge pull request #250 from FunkinCrew/bugfix/chart-editor-modifies-freeplay 
Fix a bug where modifying a copied template song's BPM in the chart editor would modify BPM in Freeplay.
 2024-01-05 17:41:43 -05:00
Cameron Taylor 1e07b6ae22 Merge branch 'rewrite/master' into bugfix/chart-editor-modifies-freeplay 2024-01-05 17:41:07 -05:00
Cameron Taylor dcb5c496a4 Merge pull request #251 from FunkinCrew/bugfix/conductor-rewrite 
Conductor rewrite plus notification bugfix
 2024-01-05 17:31:11 -05:00
Cameron Taylor ab316017f7 removed beatTime nullability? 2024-01-05 17:22:01 -05:00
Cameron Taylor 65aee1dd13 Merge branch 'rewrite/master' into bugfix/conductor-rewrite 2024-01-05 15:32:42 -05:00
Cameron Taylor 56aa6f1dd8 submod update 2024-01-05 15:29:15 -05:00
EliteMasterEric a3123cd64c Measure numbers next to ticks and support for initial time signature. 2024-01-05 02:35:41 -05:00
EliteMasterEric 336810b628 Tooltips when hovering over chart events 2024-01-04 10:00:39 -05:00
EliteMasterEric 4a0a330eb4 Redo logic around note selection, add new buttons for selecting individual sides. 2024-01-04 08:20:34 -05:00
EliteMasterEric 4c353101ae Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-context-menus 2024-01-04 01:55:00 -05:00
EliteMasterEric a35e0121f5 Update assets submodule 2024-01-03 21:10:30 -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
Eric e1b92e8829 Merge pull request #265 from FunkinCrew/note-move-fix 
disable note vwoosh, and fix gameover song not looping
 2024-01-03 20:13:25 -05:00
Eric 7b219d1a38 Merge branch 'rewrite/master' into note-move-fix 2024-01-03 20:13:06 -05:00
EliteMasterEric 07bd2e44cd Fix a funny bug when restarting after game over 2024-01-03 20:12:46 -05:00
Eric be64417785 Merge pull request #249 from FunkinCrew/no-debugger 
debugger popup
 2024-01-03 20:01:25 -05:00
EliteMasterEric 7684757dbb Merge remote-tracking branch 'origin/rewrite/master' into no-debugger 2024-01-03 19:54:41 -05:00
EliteMasterEric bbaa9aa4af Work in progress on context menus and song event editing. 2024-01-03 19:53:17 -05:00
Cameron Taylor 97dea7403d Merge pull request #263 from FunkinCrew/bugfix/note-sustain-rendering 
Fix an issue where hold notes early in a song would not render properly.
 2024-01-03 10:39:59 -05:00
Cameron Taylor 7932094042 Merge branch 'rewrite/master' into note-move-fix 2024-01-03 10:36:11 -05:00
Cameron Taylor 622041b54b Merge pull request #264 from FunkinCrew/feature/chart-editor-jenny-tweaks 
Chart Editor: Clean up difficulty label behavior
 2024-01-03 10:35:52 -05:00
Cameron Taylor 200f5702ef disable note vwoosh, and fix gameover song not looping 2024-01-03 02:51:52 -05:00
EliteMasterEric a1002c4756 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/conductor-rewrite 2024-01-02 14:14:26 -05:00
EliteMasterEric ddfecf2cfc Clean up difficulty label behavior 2024-01-02 14:07:07 -05:00