Commit Graph
4073 Commits
Author SHA1 Message Date
Cameron Taylor da4e77bf44 Merge branch 'rewrite/master' into feature/chart-editor-context-menus 2024-01-05 20:11:38 -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 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
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 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
EricandGitHub 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
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 TaylorandGitHub 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 TaylorandGitHub 7932094042 Merge branch 'rewrite/master' into note-move-fix 2024-01-03 10:36:11 -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 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 TaylorandGitHub 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
EricandGitHub 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 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
Cameron TaylorandGitHub 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
shrandCameron Taylor 7fcf4c4175 added custom blend feature 2023-12-18 20:15:40 -05:00
shrandCameron Taylor 90036ee75d removing da dumb needless functions 2023-12-18 20:15:40 -05:00
shrandCameron Taylor dc8dfeb336 add lightmaps 2023-12-18 20:15:40 -05:00
shrandCameron Taylor bc20b81723 squiiish 2023-12-18 20:15:40 -05:00
shrandCameron Taylor f7a519b13f cleaning code 2023-12-18 20:15:40 -05:00
shrandCameron Taylor ab7ba485cb added GrabbableCamera 2023-12-18 20:15:40 -05:00
shrandCameron Taylor 9fc3a46b48 shader update 2023-12-18 20:15:40 -05:00
shrandCameron Taylor 7c46bcb707 add docs 2023-12-18 20:15:40 -05:00
shrandCameron Taylor ace89a44a5 cleaning up code 2023-12-18 20:15:40 -05:00
shrandCameron Taylor 26818e6d99 made it a library 2023-12-18 20:15:40 -05:00
shrandCameron Taylor 6d0a8cc535 testing poyopoyo 2023-12-18 20:15:40 -05:00
shrandCameron Taylor 883ef13e65 finally did it 2023-12-18 20:15:40 -05:00
shrandCameron Taylor 56cecf98a0 fix typo 2023-12-18 20:15:40 -05:00
shrandCameron Taylor b88fbeb206 update draw() 2023-12-18 20:15:40 -05:00
shrandCameron Taylor 95b03debb3 still buggy 2023-12-18 20:15:40 -05:00
shrandCameron Taylor eb27c679c3 update shader 2023-12-18 20:15:40 -05:00