cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-10 08:44:47 +00:00
Code Issues Releases Wiki Activity
2472 commits 3 branches 3 tags 3 GiB
Commit graph

2472 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Cameron Taylor e6cee0079f Merge pull request #260 from FunkinCrew/bugfix/pink-game-over-screen 
Fix a bug where the background of the game over screen is pink
 2023-12-22 22:52:49 -05:00
Cameron Taylor b308120ee2 Merge pull request #261 from FunkinCrew/bugfix/haxeui-update 
Update HaxeUI to latest (this fixes checkboxes)
 2023-12-22 22:52:22 -05:00
Eric edd8bdc014 Merge branch 'rewrite/master' into bugfix/chart-editor-monday-fixes 2023-12-19 19:04:40 -05:00
EliteMasterEric 711253a202 Update HaxeUI to latest 2023-12-19 16:12:25 -05:00
EliteMasterEric 8fea7eb734 Fix a bug where the background of the game over screen is pink 2023-12-19 01:57:39 -05:00
EliteMasterEric f01535e431 Don't forget to update hmm! 2023-12-19 01:28:24 -05:00
EliteMasterEric 70b7de94aa Fix to Metadata toolbox causing crash when no GF :( 2023-12-19 01:28:13 -05:00
EliteMasterEric ad02bf2ee0 Fix to GameOverSubstate exiting to Freeplay instead of Chart Editor 2023-12-19 01:27:58 -05:00
EliteMasterEric bb0fb02813 Fix to launching directly into Chart Editor 2023-12-19 01:26:43 -05:00
EliteMasterEric 3e65e7ecc5 Fix for vocals not loading properly and not getting cleared properly. 2023-12-19 01:26:26 -05:00
EliteMasterEric 328bb7b938 Fixes to Erect/Nightmare only 2023-12-19 01:25:15 -05:00
EliteMasterEric 4ff5bd21df Fixes to the FNF Legacy JSON parser 2023-12-19 01:23:42 -05:00
EliteMasterEric 9e27095659 Update assets. 2023-12-19 01:21:26 -05:00
Cameron Taylor f16f2b8f84 Merge pull request #258 from FunkinCrew/bugfix/selection-highlight 
Fix a bug where making one selection and then making a different one would leave the original highlighted
 2023-12-19 01:19:08 -05:00
Cameron Taylor 41ad47db52 Merge branch 'rewrite/master' into bugfix/selection-highlight 2023-12-19 01:18:49 -05:00
Cameron Taylor 48f916240f playstate import fixes and asset update 2023-12-18 21:33:29 -05:00
Cameron Taylor 360ba69496 shaderslmfao fix 2023-12-18 20:49:01 -05:00
shr 7fcf4c4175 added custom blend feature 2023-12-18 20:15:40 -05:00
shr 90036ee75d removing da dumb needless functions 2023-12-18 20:15:40 -05:00
shr dc8dfeb336 add lightmaps 2023-12-18 20:15:40 -05:00
shr bc20b81723 squiiish 2023-12-18 20:15:40 -05:00
shr f7a519b13f cleaning code 2023-12-18 20:15:40 -05:00
shr ab7ba485cb added GrabbableCamera 2023-12-18 20:15:40 -05:00
shr 9fc3a46b48 shader update 2023-12-18 20:15:40 -05:00
shr 7c46bcb707 add docs 2023-12-18 20:15:40 -05:00