Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-23 16:17:53 -05:00
Code Issues Projects Releases Packages Wiki Activity
2166 commits 30 branches 20 tags 3 GiB
Commit graph

305 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
EliteMasterEric
ce97a002cb Reorganize a whole bunch of classes and perform syntax cleanup. 2023-11-07 04:04:22 -05:00
EliteMasterEric
66ae60e9e4 Updated syntax after merge 2023-11-05 01:19:47 -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
EliteMasterEric
2b468ad926 Fix issue where changing width of dropdown would cause a crash 2023-11-02 17:40:00 -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
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
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