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

365 commits

Author SHA1 Message Date
Jenny Crowe bfb032dc7f Added units to other song events. 2024-01-26 18:51:36 -07:00
Jenny Crowe 8b19a7511c Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/units 2024-01-26 18:20:04 -07:00
Jenny Crowe e111e91a9c Editor: Added ability to set units for event properties. Fixed bug where event icon tooltip wouldn't show an enum text value correctly. 2024-01-24 20:31:25 -07:00
Jenny Crowe a7e9f08e26 Editor now loads saved inst/vocal offset properly. 2024-01-19 21:24:18 -07:00
EliteMasterEric 26b7610663 Fix an error with playable Pico death 2024-01-17 23:14:28 -05:00
EliteMasterEric a0c4499b03 Fix a bug where replaying a level makes a pink screen 2024-01-17 23:12:59 -05:00
Cameron Taylor 96d02261c5 Merge branch 'rewrite/master' into feature/stage-solids 2024-01-17 21:40:26 -05:00
EliteMasterEric 80c7bcdfdf Rewrite Stage data handling to use the Registry pattern, and add support for solid colors. 2024-01-16 17:08:25 -05:00
Cameron Taylor 4375dfd13a Merge pull request #285 from FunkinCrew/feature/play-state-note-polish
Feature/play state note polish
2024-01-16 06:27:30 -05:00
EliteMasterEric 673f7f57d4 Fix pink rim on low zoom levels. 2024-01-16 00:03:30 -05:00
EliteMasterEric 5ac4b14891 Fix week 7 death animations. 2024-01-15 23:51:37 -05:00
EliteMasterEric 3d2e50906f I was in fact a dumbass. 2024-01-15 22:13:01 -05:00
EliteMasterEric e391c02015 Polish note display visuals, and scrap Killer judgement. 2024-01-15 22:10:42 -05:00
EliteMasterEric e0dfdd40a2 Merge remote-tracking branch 'origin/rewrite/master' into feature/play-state-note-polish 2024-01-15 21:55:23 -05:00
EliteMasterEric 313fd55e98 WIP 2024-01-15 14:20:44 -05:00
EliteMasterEric d53dbd67e3 Rewrite to character animation, boyfriend death animation should be fixed 2024-01-14 09:18:32 -05:00
EliteMasterEric 549d461172 Fix an issue where Song offsets would be null rather than zero. 2024-01-14 06:46:58 -05:00
Cameron Taylor e87c895131 Merge branch 'rewrite/master' into feature/chart-editor-drag-edit-holds 2024-01-12 08:13:30 -05:00
Eric 2a7f9a0880 Merge branch 'rewrite/master' into bugfix/controller-overflow 2024-01-12 07:48:03 -05:00
EliteMasterEric 025fd326bd Click and drag on a sustain to edit it. 2024-01-12 06:13:34 -05:00
EliteMasterEric 462eece09a Use proper difficulty rating data, proper clear percentage 2024-01-11 00:30:00 -05:00
EliteMasterEric 043fb553f6 Fix an issue causing an overflow error when using gamepad (WINDOWS ONLY) 2024-01-10 00:20:00 -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 65aee1dd13 Merge branch 'rewrite/master' into bugfix/conductor-rewrite 2024-01-05 15:32:42 -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
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
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 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
EliteMasterEric 8fea7eb734 Fix a bug where the background of the game over screen is pink 2023-12-19 01:57:39 -05:00
EliteMasterEric ad02bf2ee0 Fix to GameOverSubstate exiting to Freeplay instead of Chart Editor 2023-12-19 01:27:58 -05:00
EliteMasterEric 328bb7b938 Fixes to Erect/Nightmare only 2023-12-19 01:25:15 -05:00
EliteMasterEric 88ca58f9e2 Fixes for updated HaxeUI and Flixel. 2023-12-15 21:09:01 -05:00
EliteMasterEric 3f2d1b4c1b Update haxelibs, add flixel-text-input to fix overlapping text 2023-12-14 17:34:02 -05:00
EliteMasterEric ca489b5609 Rewrite the Conductor to be a singleton instance. 2023-12-14 16:56:20 -05:00
EliteMasterEric 52f16ce457 Redo icon dialog and add support to metadata dialog. 2023-12-12 05:24:43 -05:00
Cameron Taylor ac3f27edd4 icon char select in progres 2023-12-11 00:19:33 -05:00
EliteMasterEric 6060282f20 Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offsets-part-2 2023-12-08 16:12:56 -05:00
Cameron Taylor 8f30532ed4 offsets null fix quick 2023-12-08 01:57:46 -05:00
EliteMasterEric 7f0caeb026 Work in progress on offsets in Chart Editor state. 2023-12-08 01:15:22 -05:00
Cameron Taylor 3652550b1a Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into feature/chart-editor-offsets-part-1 2023-12-07 18:14:10 -05:00
EliteMasterEric e23c1464f6 Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offsets-part-1 2023-12-07 16:32:12 -05:00
EliteMasterEric 66611c5d2f Fixes to FlxSound when pausing before starting 2023-12-06 22:03:36 -05:00
EliteMasterEric 1abd587645 Rework offsets to be built into the FlxSound 2023-12-06 15:04:24 -05:00
EliteMasterEric 1716ffc57f Implement instrumental and vocal offsets into the PlayState. 2023-12-05 02:44:57 -05:00
EliteMasterEric eebb2e874f Merge branch 'rewrite/master' into bugfix/chart-editor-notif-in-bg 2023-11-29 16:42:40 -05:00