1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-12 00:15:10 +00:00
Commit graph

2176 commits

Author SHA1 Message Date
Cameron Taylor c44e33c556 derp 2024-01-27 06:16:46 -05:00
Cameron Taylor df2c01b2ff crackhead activity in progress 2024-01-27 06:16:39 -05:00
Cameron Taylor 1dcd0debc7 conductor stuff 2024-01-16 05:37:06 -05:00
Cameron Taylor 53d3db2007 assets subjod 2024-01-16 04:06:56 -05:00
Cameron Taylor b11bf09687 save/load for inputOffsets 2024-01-09 19:57:33 -05:00
Cameron Taylor 3544f2a804 input offset get/set functions in conductor 2024-01-09 19:48:01 -05:00
Cameron Taylor d9a6bead77 inputOffset + audioVisualOffset in Save class 2024-01-09 19:41:25 -05:00
Cameron Taylor 5d0c1521d5 strumline refactor stuffy 2024-01-09 13:16:00 -05:00
Cameron Taylor e323f46569 conductor.instance fixes 2024-01-08 15:46:16 -05:00
Cameron Taylor 7058d9baa7 stuf in progres 2024-01-08 15:39:44 -05:00
Cameron Taylor d62042a99a skip transition into debug substate 2024-01-08 15:39:44 -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 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
EliteMasterEric b1c9332830 Fix an issue where hold notes early in a song would not render properly. 2024-01-02 01:33:10 -05:00
Cameron Taylor 43872bb213 Merge pull request #259 from FunkinCrew/bugfix/chart-editor-monday-fixes
Get bugfixin on a monday night yeah
2024-01-01 19:29:10 -05:00
Cameron Taylor 92e0022fed derp comma! 2024-01-01 19:13:51 -05:00
Cameron Taylor 11d21c1369 Merge branch 'rewrite/master' into bugfix/chart-editor-monday-fixes 2024-01-01 19:09:36 -05:00
Cameron Taylor 7afb862072 Merge pull request #262 from FunkinCrew/bugfix/another-haxeui-update
Update HaxeUI and Flixel
2024-01-01 18:48:32 -05:00
EliteMasterEric a4c993f733 Update HaxeUI and Flixel 2023-12-23 16:25:50 -05:00