cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-07-15 06:35:33 +00:00
Code Issues Releases Wiki Activity
2552 commits 10 branches 17 tags 2.9 GiB
Commit graph

1875 commits

Author SHA1 Message Date
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 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
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
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 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 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
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 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 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
shr ace89a44a5 cleaning up code 2023-12-18 20:15:40 -05:00
shr 26818e6d99 made it a library 2023-12-18 20:15:40 -05:00
shr 6d0a8cc535 testing poyopoyo 2023-12-18 20:15:40 -05:00
shr 883ef13e65 finally did it 2023-12-18 20:15:40 -05:00
shr 56cecf98a0 fix typo 2023-12-18 20:15:40 -05:00
shr b88fbeb206 update draw() 2023-12-18 20:15:40 -05:00
shr 95b03debb3 still buggy 2023-12-18 20:15:40 -05:00
shr eb27c679c3 update shader 2023-12-18 20:15:40 -05:00
Cameron Taylor 32ec724da6 rainshader prototype 2023-12-18 20:15:40 -05:00
Cameron Taylor cf9915ef60 puddle positioning 2023-12-18 20:15:40 -05:00
Cameron Taylor 4815bed2cb abot in progresss 2023-12-18 20:15:40 -05:00
Cameron Taylor 4fc56a2280 small fix to backups folder not existing 2023-12-15 21:46:09 -05:00
EliteMasterEric 88ca58f9e2 Fixes for updated HaxeUI and Flixel. 2023-12-15 21:09:01 -05:00
Cameron Taylor e9ed7223b6 no debugger 2023-12-15 02:29:32 -05:00
Cameron Taylor 15f72adeed Merge branch 'rewrite/master' into bugfix/selection-highlight 2023-12-14 18:41:23 -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 b3236e6134 Fix a bug where modifying a copied template song's BPM in the chart editor would modify BPM in Freeplay. 2023-12-14 00:47:04 -05:00
Cameron Taylor 4ea04a9a2e Merge branch 'icon-charswitcher' into rewrite/master 2023-12-13 23:11:51 -05:00
EliteMasterEric e2b0ed98dd Fix a bug where making one selection and then making a different one would leave the original highlighted 2023-12-13 23:11:19 -05:00
Cameron Taylor 0a47689eaa ease 2023-12-13 23:11:12 -05:00
EliteMasterEric aeb2cf24ad Fix a rebase issue 2023-12-13 22:42:09 -05:00
EliteMasterEric b740fbf028 Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-waveform 2023-12-13 22:36:08 -05:00
Cameron Taylor 4193cd4ee2 proper dialog fading 2023-12-13 18:24:55 -05:00
Cameron Taylor 028e90474c Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into icon-charswitcher 2023-12-13 17:26:46 -05:00
Cameron Taylor db76a0dd1d Merge pull request #244 from FunkinCrew/chart-edit-playtest 
Enabling / Disabling "playtest" mode from chart editor
 2023-12-13 17:19:02 -05:00
Cameron Taylor b09ed369e8 f 2023-12-13 09:20:15 -05:00
Cameron Taylor 6ca0e32391 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into icon-charswitcher 2023-12-13 09:20:11 -05:00
Eric 34673c3f6c Merge branch 'rewrite/master' into mac-delete 2023-12-12 19:44:04 -05:00
EliteMasterEric 42d070922b Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-waveform 2023-12-12 19:34:58 -05:00
Eric f36cb84797 Merge pull request #242 from FunkinCrew/copy-flash 
chart editor: copy notes polish
 2023-12-12 19:29:17 -05:00
Eric a6e7fc6d2c Merge pull request #241 from FunkinCrew/copy-preview 
note highlight preview
 2023-12-12 19:29:06 -05:00
Eric 50d015c449 Merge branch 'rewrite/master' into chart-edit-playtest 2023-12-12 17:09:26 -05:00
EliteMasterEric 43038d0a06 Move the "Start at current time" checkbox 2023-12-12 17:07:28 -05:00
Eric 591de9bf6d Merge branch 'rewrite/master' into icon-charswitcher 2023-12-12 14:29:06 -05:00
EliteMasterEric 52f16ce457 Redo icon dialog and add support to metadata dialog. 2023-12-12 05:24:43 -05:00
Cameron Taylor b33f27f097 tiny lil polish and cleanin 2023-12-11 04:35:39 -05:00
Cameron Taylor 05f977f85f character selector 2023-12-11 03:38:44 -05:00
Cameron Taylor 9ffffe9c8a player char select 2023-12-11 02:40:58 -05:00
Cameron Taylor 181e3f85b8 switching opp 2023-12-11 02:26:37 -05:00
Cameron Taylor ac3f27edd4 icon char select in progres 2023-12-11 00:19:33 -05:00
EliteMasterEric e24c5877a9 Some quick fixes to get Mac to build. 2023-12-10 23:33:08 -05:00
Cameron Taylor c3fa793d97 adds !isCursorOverHaxeUI around 2023-12-10 04:10:57 -05:00
Cameron Taylor 3a70ca4e08 menubar selected fix 2023-12-10 03:49:24 -05:00
Cameron Taylor 8cec180353 practice mode in progress 2023-12-10 03:37:12 -05:00
Cameron Taylor 7876b07c37 mac delete key fix 2023-12-09 18:00:32 -05:00
Cameron Taylor 87c866f662 copy notifier polish 2023-12-08 22:55:14 -05:00
Cameron Taylor 6f141e5f52 copy text popup 2023-12-08 22:28:34 -05:00
Cameron Taylor 796e1fcbab note highlight preview 2023-12-08 20:21:55 -05:00
Cameron Taylor 1871b87630 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into feature/chart-waveform 2023-12-08 19:28:16 -05:00
Cameron Taylor c99ac11d8a opponent vocal 2023-12-08 18:44:45 -05:00
Cameron Taylor 81432100b8 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into feature/chart-waveform 2023-12-08 18:35:28 -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
EliteMasterEric 64cba7ca2d Okay offsets should be actually done now. 2023-12-08 16:12:36 -05:00
EliteMasterEric 7c6baea7d2 Rework to fix variant issues 2023-12-08 14:01:12 -05:00
Cameron Taylor 2858cbf56b mac file filter fix 2023-12-08 02:14:26 -05:00
Cameron Taylor 8f30532ed4 offsets null fix quick 2023-12-08 01:57:46 -05:00
Cameron Taylor 88409df992 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into feature/chart-waveform 2023-12-08 01:34:26 -05:00
EliteMasterEric f3fa9a58d3 Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offsets-part-2 2023-12-08 01:16:16 -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
Cameron Taylor cd0bd7ff55 assets 2023-12-07 14:41:53 -05:00
Cameron Taylor 554c7bb31d null + macro things? 2023-12-07 14:29:45 -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
Cameron Taylor a750cc1620 vis wips wips wips 2023-12-01 19:58:58 -05:00
EliteMasterEric a0ae30a7c1 Metronome slider and scroll anchor 2023-12-01 17:14:48 -05:00
EliteMasterEric 8ef380e0b2 Resolve merge issues 2023-11-29 16:53:08 -05:00
EliteMasterEric eebb2e874f Merge branch 'rewrite/master' into bugfix/chart-editor-notif-in-bg 2023-11-29 16:42:40 -05:00
Cameron Taylor df427c8ecb player vis in progress 2023-11-29 06:17:01 -05:00
Cameron Taylor eea614b4f5 samples stability 2023-11-29 05:49:59 -05:00
Cameron Taylor 73810a5059 Merge branch 'rewrite/master' of https://github.com/funkincrew/funkin-secret into feature/chart-waveform 2023-11-29 04:44:37 -05:00
Cameron Taylor 0899c60e8d Merge pull request #234 from FunkinCrew/polish/welcome-screen 
more info on playbar
 2023-11-29 04:25:11 -05:00
Cameron Taylor 87b1cabbac Merge branch 'rewrite/master' into bugfix/platform-fixes 2023-11-29 01:46:10 -05:00
Cameron Taylor ca9f42fedf waveform in progres 2023-11-29 01:43:59 -05:00
EliteMasterEric 99ed8b94d7 Target the current time change rather than the first one. 2023-11-28 21:44:09 -05:00
EliteMasterEric 90fc00f9bb Additional web fixes, Github CI should be happy now. 2023-11-28 21:19:07 -05:00
EliteMasterEric 9a2f235bed Platform-specific fixes for HTML5 and MacOS 2023-11-28 20:52:45 -05:00
EliteMasterEric ed10d2c5d0 Multiple chart editor bug fixes +tweaks 2023-11-28 20:36:59 -05:00
Cameron Taylor 21b79c0b83 bpm in playbar 2023-11-28 04:30:29 -05:00
Cameron Taylor d9d5744f1e difficulty playbar 2023-11-28 04:05:17 -05:00
Cameron Taylor aee8df4fcb default note snapps 2023-11-27 23:29:48 -05:00
Cameron Taylor e44559d056 last modified 2023-11-27 20:37:10 -05:00
Cameron Taylor 41384ddf0d playtesting fix 2023-11-25 03:50:22 -05:00
Cameron Taylor f3a38e0232 fixing the stop 2023-11-25 02:48:43 -05:00
Cameron Taylor 64a4512980 charting song polish + recents menu fix 2023-11-25 02:18:39 -05:00
EliteMasterEric 290c568cb5 Disable notification actions while playtest is open. 2023-11-24 16:11:53 -05:00
EliteMasterEric a2cee82779 Fixing up a rough Git merge 2023-11-24 00:58:12 -05:00
EliteMasterEric 4e1945b373 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/chart-editor-macro-rework 2023-11-24 00:49:51 -05:00
EliteMasterEric 47f39b072a Convert chart editor to macro-based UIState 2023-11-24 00:42:07 -05:00
EliteMasterEric bab7d6cf53 Reworks to dialogs 2023-11-24 00:41:38 -05:00
Cameron Taylor 811640ef6a Merge branch 'rewrite/master' into feature/chart-editor-backup-popup 2023-11-23 20:08:13 -05:00
Cameron Taylor a2ce1fdd5e opening and selecting specific file 2023-11-23 19:54:34 -05:00
Cameron Taylor 2d33461a24 windows file slash fix for opening folders 2023-11-23 19:48:28 -05:00
Cameron Taylor 645b9b579a don't close backup dialog if opening folder 2023-11-23 18:35:57 -05:00
Cameron Taylor ecdb89c3a6 Merge pull request #228 from FunkinCrew/polish/chart-intro-screen 
Polish/chart intro screen
 2023-11-22 20:45:35 -05:00
Cameron Taylor dbaaf639ac Merge branch 'rewrite/master' into feature/chart-editor-backup-popup 2023-11-22 20:27:37 -05:00
EliteMasterEric 668fbd3b37 Fixes for autosave notification 2023-11-22 20:25:25 -05:00
Cameron Taylor d66141c15a playhead dragging 2023-11-22 19:53:56 -05:00
EliteMasterEric 4ace7c9cf4 Add "Go to Backups" menu item 2023-11-22 19:42:28 -05:00
EliteMasterEric 700ebb6a83 Add action buttons for notifications 2023-11-22 19:41:52 -05:00
EliteMasterEric 97b259d1c2 Finalized backup handling 2023-11-22 19:17:35 -05:00
EliteMasterEric 780220c2d4 Move notification handling into its own class. 2023-11-22 19:16:38 -05:00
Cameron Taylor cdfb3fb172 dialog cursor fix 2023-11-21 18:45:31 -05:00
Cameron Taylor 63f65149f7 skip transition into chart editor 2023-11-21 16:09:13 -05:00
Cameron Taylor 25a66ddbfe open recent on welcome screen 2023-11-21 15:23:24 -05:00
Cameron Taylor 620cd50c1d Chart Editor: Sustain Note polish (#223) 
* light lerp polish on ghost sustains

* small hold fix

* small number tweak

---------

Co-authored-by: Eric <ericmyllyoja@gmail.com>
 2023-11-21 15:10:18 -05:00
Cameron Taylor b121a6bc65 Merge pull request #225 from FunkinCrew/debugging/folder-opening 
open log on debug menu
 2023-11-21 15:10:08 -05:00
EliteMasterEric 27234ddd67 Work in progress on backup popup 2023-11-21 13:31:02 -05:00
Eric 95b43cce55 Several UI tweaks and usability fixes. (#224) 
Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-11-21 02:12:34 -05:00
Cameron Taylor 98aa59f85a open log on debug menu 2023-11-21 01:37:49 -05:00
Eric e2250b18ff [BUGFIX] Chart Editor Event Handling (#220) 
* Fix a bug causing editing or removal of song events to not happen properly.

* Fix an exception thrown as the application closes.

* Fix an issue with moving events in the chart causing a crash.

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-11-21 01:00:06 -05:00
Eric daf1ba85dc Fix crash on completing song after playtesting (#217) 
Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-11-20 11:27:58 -05:00
Eric a1da5a5758 Bugfix/chart editor fixins (#222) 
* Rewrite crash log file to contain more information

* Detect host platform.

* Suppress shouldHandleCursor spam

* Fix bug where previous song's vocals are kept on new songs

* Fix an issue where note snapping could go negative.

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-11-20 11:26:58 -05:00
Eric 421358e069 Nightmare difficulty sprites + a options change (#219) 
* Made song variations array optional (defaulting to empty)

* Add support for animated difficulties in Freeplay menu

* Disable funny music thing; disable flashing nightmare graphic when turned off

* Update assets folder

* assets update

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-11-20 11:12:50 -05:00
Eric 4406677be7 Fix character camera offsets embedded in stage data (#218) 
* Make StageDataCharacter attributes mandatory, and remove defaults.

* Update character files

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-11-20 10:46:09 -05:00
Eric 260f1bd265 [BUGFIX] Fix an issue where PlayState would crash after the second song. (#216) 
* Ignore blank lines in intro text

* Add a check when trying to render destroyed graphics.

* Persist noteSplash graphic so it isn't destroyed.
 2023-11-20 10:42:23 -05:00
Cameron Taylor 0e21220e24 Merge pull request #215 from FunkinCrew/feature/rebind-debug-keys 
Debug Controls, plus a chart loading fix
 2023-11-16 02:20:53 -05:00
Cameron Taylor 270a527602 Merge branch 'rewrite/master' into bugfix/senpai-naughty 2023-11-16 02:02:08 -05:00
EliteMasterEric 2140158786 Debug controls, plus a chart loading fix 2023-11-16 00:02:42 -05:00
Cameron Taylor 4335e5a4dc Merge branch 'rewrite/master' into bugfix/chart-editor-preview-inst 2023-11-15 21:32:11 -05:00
Cameron Taylor ad345fd834 Merge branch 'rewrite/master' into bugfix/senpai-naughty 2023-11-15 19:52:14 -05:00
Cameron Taylor 38ffc37bb2 Merge branch 'rewrite/master' into bugfix/week-5-scripts 2023-11-15 19:44:45 -05:00
EliteMasterEric 398b2e386e Remove wonky Spectrogram code 2023-11-15 11:30:38 -05:00
Cameron Taylor 16eda2a717 Merge branch 'rewrite/master' into bugfix/chart-editor-preview-inst 2023-11-15 01:14:19 -05:00
Cameron Taylor aecd587ef0 Merge branch 'rewrite/master' into feature/chart-editor-open-recent 2023-11-15 01:10:26 -05:00
EliteMasterEric b8504c8e3a Merge remote-tracking branch 'origin/rewrite/master' into bugfix/senpai-naughty 2023-11-15 00:47:47 -05:00
Cameron Taylor 6b52a4b56b Merge branch 'rewrite/master' into rewrite/bugfix/input-issues 2023-11-14 23:21:35 -05:00
Cameron Taylor e4c248896a Merge branch 'rewrite/master' into feature/chart-editor-haxeui-update 2023-11-14 17:08:38 -05:00
Cameron Taylor 124a400e8b Merge branch 'rewrite/master' into rewrite/bugfix/chart-editor-event-placement 2023-11-14 17:05:07 -05:00
Cameron Taylor 12d5cf796b Merge branch 'rewrite/master' into feature/chart-editor-haxeui-update 2023-11-14 16:10:35 -05:00
Cameron Taylor dbeb2a1a1e Merge branch 'rewrite/master' into bugfix/cleanup 2023-11-14 15:31:54 -05:00
EliteMasterEric c7f35bed5d Fix a bug where completing a song in Preview would mute music. 2023-11-13 18:56:07 -05:00
EliteMasterEric ca3e00c1cd Merge branch 'rewrite/master' into feature/chart-editor-haxeui-update 2023-11-10 16:37:55 -05:00
Cameron Taylor ba5fa6b45e Merge pull request #211 from FunkinCrew/bugfix/overlapping-vocals 
Fix a bug where multiple vocal tracks would play at once
 2023-11-10 14:23:14 -05:00
EliteMasterEric a9dfd4adcf Fix a bug where multiple vocal tracks would play at once 2023-11-09 17:00:46 -05:00
EliteMasterEric 2728f34512 Fix bug where Freeplay random would crash the game 2023-11-07 18:53:50 -05:00
EliteMasterEric 3e1146aadf Fix bug where getDirection didn't work in scripts. 2023-11-07 18:32:00 -05:00
EliteMasterEric ce97a002cb Reorganize a whole bunch of classes and perform syntax cleanup. 2023-11-07 04:04:22 -05:00
EliteMasterEric 21ba81c799 Fix a bug where returning to a week in Story Mode would not play dialog 2023-11-06 17:51:56 -05:00
EliteMasterEric 4833c9bd2e Fix a bug where F5 would crash in Week 6. 2023-11-06 17:51:27 -05:00
EliteMasterEric 071114b6b4 Merge remote-tracking branch 'origin/rewrite/master' into rewrite/bugfix/input-issues 2023-11-06 17:08:25 -05:00
EliteMasterEric 66ae60e9e4 Updated syntax after merge 2023-11-05 01:19:47 -04:00
EliteMasterEric 4f34484689 Use correct location for js.html.Navigator. 2023-11-05 00:26:03 -04:00
EliteMasterEric a0ae4c418d Merge remote-tracking branch 'origin/rewrite/master' into rewrite/bugfix/chart-editor-event-placement 2023-11-05 00:14:44 -04:00
EliteMasterEric de5edb3cc2 Fix variation metadata and error message in 
ChartEditorImportExportHandler
 2023-11-05 00:08:18 -04:00
EliteMasterEric 27de7dc036 Update notification expiry time constant in 
ChartEditorState and ChartEditorDialogHandler
 2023-11-05 00:08:06 -04:00
EliteMasterEric efd29dafbf Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-haxeui-update 2023-11-04 23:51:15 -04:00
Cameron Taylor cf63f7d6b6 Merge branch 'rewrite/master' into feature/chart-editor-new-font 2023-11-04 16:09:34 -04:00
Cameron Taylor 47fd6426a6 Merge branch 'rewrite/master' into rewrite/feature/chart-editor-drag-notes 2023-11-04 15:07:53 -04:00
EliteMasterEric 2b468ad926 Fix issue where changing width of dropdown would cause a crash 2023-11-02 17:40:00 -04:00
EliteMasterEric 0dd9ba7fd2 Fix merge conflicts in FreeplayState 2023-11-01 23:20:47 -04:00
EliteMasterEric 4b92c145b4 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/freeplay-fixins 2023-11-01 23:11:50 -04:00
EliteMasterEric 15ffbf2fe7 Fixed a MacOS-specific issue 2023-11-01 23:09:52 -04:00
EliteMasterEric b9b1461ab5 WIP on refactoring some classes related to controls 2023-10-31 15:30:47 -04:00
EliteMasterEric 73107dbc07 Update HaxeUI cursor handling, and remove Funkin components 2023-10-31 14:43:01 -04:00
EliteMasterEric d5cf9bfc22 New shortcut handler 2023-10-28 19:56:34 -04:00
EliteMasterEric b2dd58b904 Resolve several bugs related to event note placement. 2023-10-27 01:42:05 -04:00
EliteMasterEric eec3ac3ced Clean up several messy chunks of code, and add support for dragging notes and events. 2023-10-26 05:46:22 -04:00
EliteMasterEric 8d875949b9 Clean up several messy chunks of code, and add support for dragging selected notes. 2023-10-26 05:45:53 -04:00
EliteMasterEric e14e6448ac More event type refactors 2023-10-25 01:13:06 -04:00
EliteMasterEric acce2ac811 Move ScriptEventType to its own module. 2023-10-25 01:12:46 -04:00
EliteMasterEric 33a1b81737 Fixes for quicksave 2023-10-24 15:50:02 -04:00
EliteMasterEric a9e253a530 Save handling (with window title!) 2023-10-23 12:22:29 -04:00
EliteMasterEric 8664aed4cc Implement "Open Recent" menu 2023-10-22 15:43:39 -04:00
EliteMasterEric ffd0a98393 FNFC file rework (includes command line quicklaunch) 2023-10-21 01:04:50 -04:00
EliteMasterEric 92785166ef Remove duplicate pushUnique 2023-10-19 01:03:58 -04:00
EliteMasterEric 33644d0c7f Merge branch 'rewrite/master' into bugfix/freeplay-fixins 2023-10-19 00:46:25 -04:00
Cameron Taylor 041b5749d6 Merge pull request #188 from FunkinCrew/rewrite/bugfix/anim-editor-crash-fix 
Hide AnimateAtlas characters in the animation editor.
 2023-10-19 00:44:05 -04:00
Cameron Taylor c4e2f61e2d Merge branch 'rewrite/master' into rewrite/feature/remember-difficulty 2023-10-18 23:59:21 -04:00
Cameron Taylor 902ad4be3a Merge branch 'rewrite/master' into rewrite/bugfix/chart-editor-more-fixes 2023-10-18 19:47:50 -04:00
Cameron Taylor 25c24a9bc8 Merge branch 'rewrite/master' into rewrite/bugfix/chart-editor-various-fixes 2023-10-18 19:32:31 -04:00
EliteMasterEric 26f83b5a81 Fix _time of nullable compile error. 2023-10-18 16:02:56 -04:00
EliteMasterEric fa358e455e Merge branch 'rewrite/master' into charting-sfx 2023-10-18 15:50:12 -04:00
EliteMasterEric fbcce75ea4 Merge branch 'rewrite/master' into rewrite/feature/remember-difficulty 2023-10-18 15:47:18 -04:00
EliteMasterEric cdab8753ea Lots of reported bugs fixed. 2023-10-18 01:02:10 -04:00
EliteMasterEric 6bf6b8ef11 Merge branch 'rewrite/master' into rewrite/bugfix/chart-editor-various-fixes 2023-10-18 00:04:04 -04:00
Cameron Taylor d4e6befc28 submodule merge fix 2023-10-17 21:40:20 -04:00
Cameron Taylor 08845915ea fixed cutscene skipping too fast from disabling inputs 2023-10-17 21:26:32 -04:00
EliteMasterEric d47c5f5765 Merge branch 'rewrite/bugfix/chart-editor-various-fixes' into rewrite/master 2023-10-17 21:21:46 -04:00
Cameron Taylor 4b255174fb Merge pull request #196 from FunkinCrew/rewrite/bugfix/chart-editor-bpm-fixes 
Chart Editor: Fix issues with changing BPMs of songs.
 2023-10-17 19:11:57 -04:00
Cameron Taylor 7cfbd0ca0f Merge branch 'rewrite/master' into rewrite/bugfix/pause-and-results-fixes 2023-10-17 19:02:36 -04:00
EliteMasterEric 92a4a41d20 Fix an issue where chart editor theme continues when exiting 2023-10-17 17:59:01 -04:00
EliteMasterEric 4a6904d52c Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/remember-difficulty 2023-10-17 17:32:14 -04:00
EliteMasterEric 6cb8a719af Additional cleanup on difficulty sort order (tested and working!) 2023-10-17 17:27:11 -04:00
Cameron Taylor a129e6219d Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/master 2023-10-17 17:20:08 -04:00
EliteMasterEric 6888e7b122 Merge branch 'rewrite/bugfix/pause-and-results-fixes' of https://github.com/FunkinCrew/Funkin-secret into rewrite/bugfix/pause-and-results-fixes 2023-10-17 17:10:16 -04:00
EliteMasterEric a4fde254d9 Merge branch 'rewrite/master' into rewrite/bugfix/pause-and-results-fixes 2023-10-17 17:07:36 -04:00
EliteMasterEric 4e0934dbd1 Fix issues with changing BPMs of songs. 2023-10-17 16:57:06 -04:00
EliteMasterEric f51592963e Fixes for a few bugs in the chart editor. 2023-10-17 02:42:52 -04:00
EliteMasterEric 6dbf958d75 Readd some missing lines. 2023-10-17 02:15:53 -04:00
Cameron Taylor afcb677fac index on rewrite/bugfix/pause-and-results-fixes: 9b8fc872 song diff menu sort 2023-10-17 00:38:28 -04:00
Cameron Taylor 9b8fc87261 song diff menu sort 2023-10-17 00:07:36 -04:00
Cameron Taylor 0ce82e49d0 story menu diff sorted 2023-10-16 23:43:59 -04:00
EliteMasterEric 3add6a965e Several crashes fixed and working Random! 2023-10-16 20:12:40 -04:00
Cameron Taylor 732fe59c3e Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/precise-inputs-gamepad 2023-10-16 16:47:51 -04:00
Cameron Taylor 865f771c4a Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/preferences-rewrite 2023-10-15 20:54:22 -04:00
Cameron Taylor cb0bddcb34 Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/save-data-rewrite 2023-10-15 20:19:31 -04:00
EliteMasterEric f41a7fbc23 Fast-forward assets submodule 2023-10-15 19:39:11 -04:00
EliteMasterEric d350ba3bdc Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/save-data-rewrite 2023-10-15 19:36:36 -04:00
EliteMasterEric b3ca30d10a Merge remote-tracking branch 'origin/rewrite/master' into rewrite/bugfix/anim-editor-crash-fix 2023-10-15 19:25:33 -04:00
EliteMasterEric 6fc56ffd77 Merge branch 'rewrite/master' into rewrite/bugfix/anim-editor-crash-fix 2023-10-15 19:25:01 -04:00
Cameron Taylor 937082fecf Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/snapped-paste 2023-10-15 19:23:06 -04:00
EliteMasterEric 022b93bc43 Merge branch 'rewrite/master' into rewrite/feature/chart-editor-erect-template 2023-10-15 18:42:38 -04:00