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
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
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
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
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
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
EliteMasterEric
ce97a002cb
Reorganize a whole bunch of classes and perform syntax cleanup.
2023-11-07 04:04:22 -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
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
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
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
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
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
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
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
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
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
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
EliteMasterEric
9f293d3be8
Merge branch 'rewrite/master' into rewrite/feature/save-data-rewrite
2023-10-15 01:15:49 -04:00
EliteMasterEric
ccedd82210
Move FunkinDropdown to FunkinDropDown
2023-10-15 00:34:37 -04:00
EliteMasterEric
098dedd41e
Fix "Could not locate metadataDialog"
2023-10-15 00:22:25 -04:00
EliteMasterEric
dd38dbbadf
Tweaked the numbers on scrolling
2023-10-14 23:57:40 -04:00
EliteMasterEric
0f08b1133e
Rename some sounds used by the chart editor
2023-10-14 22:49:24 -04:00
EliteMasterEric
996f7b275e
Remember difficulty when leaving story/freeplay menu.
2023-10-12 03:20:21 -04:00
Cameron Taylor
9ff4885173
charting sound effects in progress!
2023-10-11 19:39:52 -04:00
EliteMasterEric
a88262a5f4
Hide AnimateAtlas characters in the animation editor.
2023-10-11 19:16:04 -04:00
EliteMasterEric
f3737601f8
Can't spam enter on pause menu or freeplay menu anymore
2023-10-11 18:54:58 -04:00
EliteMasterEric
8589c10c75
Fixes to Pause screen and Results screen
2023-10-11 17:33:55 -04:00
Cameron Taylor
0c0829b2d0
sound effects for stickersubstate
2023-10-11 07:43:44 -04:00
Cameron Taylor
6e2441b540
Merge pull request #184 from FunkinCrew/rewrite/bugfix/glowup-autosave
...
Fix exit button in Chart Editor menu
2023-10-11 06:32:00 -04:00
EliteMasterEric
05044d9af3
Override F4 behavior
2023-10-11 00:39:16 -04:00
EliteMasterEric
d7a15dc713
Fix exit button in Chart Editor menu
2023-10-11 00:30:41 -04:00
EliteMasterEric
1ccb84bbf2
Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/chart-editor-erect-template
2023-10-10 23:46:54 -04:00
EliteMasterEric
cdac9aec9a
Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/chart-editor-wasd
2023-10-10 23:42:38 -04:00
EliteMasterEric
299a3a1a25
Merge branch 'rewrite/master' into rewrite/feature/chart-editor-wasd
2023-10-10 23:38:38 -04:00
EliteMasterEric
989d1c3175
Merge rewrite/master, fix high score retrieval
2023-10-10 23:32:01 -04:00
Cameron Taylor
5ddc4876bc
boyfriend animations swapped to atlas sprites
2023-10-09 18:33:03 -04:00
Cameron Taylor
f000d21689
shaders and blendmode overlay stuff in progres
2023-10-09 18:32:18 -04:00
EliteMasterEric
4b23eaea59
Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/chart-editor-erect-template
2023-10-09 12:15:05 -04:00
Cameron Taylor
5617f8f63e
Merge pull request #165 from FunkinCrew/rewrite/feature/chart-editor-variation-button
...
Chart Editor: Add Variation Button
2023-10-09 05:20:11 -04:00
EliteMasterEric
7a1a2e1ab4
Correct FunkinDropDown capitalization
2023-10-08 22:09:09 -04:00
EliteMasterEric
e33c825a1f
Merge branch 'rewrite/master' into rewrite/feature/chart-editor-variation-button
2023-10-06 23:11:11 -04:00
EliteMasterEric
7c653a9e9b
Merge branch 'rewrite/master' into rewrite/feature/chart-editor-wasd
2023-10-06 22:54:12 -04:00
EliteMasterEric
5931345c71
Rewrite precise inputs to work on gamepad
2023-10-05 02:21:01 -04:00
EliteMasterEric
380d30d63f
Rewrote code for preferences to use Save data.
2023-10-04 11:40:55 -04:00
EliteMasterEric
490b2f18d0
Rewrite save data functionality (now with type safety and migration)
2023-10-03 19:14:46 -04:00
EliteMasterEric
b6752531bf
Add chart editor theme
2023-09-29 22:29:32 -04:00
EliteMasterEric
6c99f7161d
Working Input Style, note snapping in menu, W/S to scroll
2023-09-29 21:49:07 -04:00
EliteMasterEric
8580cf1640
Snapped/unsnapped pasting, plus fixes for selection box and event rendering.
2023-09-26 20:36:41 -04:00
EliteMasterEric
2fcb906edf
Fixed volume sliders, Load Instrumental button, and fixed hitsounds.
2023-09-26 17:46:07 -04:00
EliteMasterEric
42bb50882d
"Add Variation" button, SongMetadata format changes, bug fixes, resolve metadata loading issues.
2023-09-25 23:24:07 -04:00
EliteMasterEric
dc728133d1
Merge remote-tracking branch 'origin/master' into feature/chart-editor-performance-revamp
2023-09-20 19:41:17 -04:00
Cameron Taylor
cbbdba031d
Merge pull request #150 from FunkinCrew/bugfix-squash/song-data-parser-rework
...
Chart Editor: Song Data Parser Rework
2023-09-19 19:54:28 -04:00
Cameron Taylor
f6bcd8bf05
Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into feature/chart-note-snapping-ui
2023-09-19 19:25:42 -04:00
Cameron Taylor
a2e43b8e4e
Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into feature/ghost-hold-notes
2023-09-19 19:16:02 -04:00
EliteMasterEric
86c105aff8
Merge remote-tracking branch 'origin/master' into bugfix-squash/song-data-parser-rework
2023-09-18 21:58:22 -04:00
EliteMasterEric
06269e95fd
Fix to crash in freeplay (swapped two args oops!)
2023-09-18 20:02:17 -04:00
EliteMasterEric
0d84559606
HTML5 should build now
2023-09-18 17:19:31 -04:00
EliteMasterEric
09b03efeea
Merge branch 'master' into bugfix/chart-editor-null-safety
2023-09-18 16:52:47 -04:00
Cameron Taylor
35239909d0
woops fix conditional
2023-09-18 15:48:40 -04:00
Cameron Taylor
446dc30277
Merge branch 'master' into bugfix-squashed/macos-file-browse
2023-09-18 15:40:52 -04:00
EliteMasterEric
8dd07d2763
I discovered a new profiling tool and stayed up until 5 AM optimizing shit.
2023-09-13 14:51:12 -04:00
Cameron Taylor
5d7efcd6b9
Merge pull request #142 from FunkinCrew/bugfix/chart-editor-playbar-buttons
...
Fixed a bug where the playbar buttons wouldn't work
2023-09-13 00:09:37 -04:00
Cameron Taylor
fc3d2a17b6
Merge pull request #143 from FunkinCrew/feature/chart-editor-snap
...
Chart Editor: Configure Snapping (+ important bug fix!)
2023-09-12 23:56:05 -04:00
EliteMasterEric
b42e4ceb67
Fix cursor modes on toolboxes.
2023-09-12 23:37:07 -04:00
EliteMasterEric
257fa2da6a
Remove old Notifbar code
2023-09-12 23:31:38 -04:00
Cameron Taylor
2b3f99547a
Merge pull request #144 from FunkinCrew/feature/chart-editor-beat-lines
...
Darkened beat dividers on chart grid.
2023-09-12 22:41:46 -04:00
Cameron Taylor
ff34771ca3
Merge branch 'master' into feature/chart-editor-file-keybinds
2023-09-12 22:37:37 -04:00
Cameron Taylor
e02dee2601
fixed N -> O typo?
2023-09-12 22:34:49 -04:00
Cameron Taylor
b4042dba8c
Merge pull request #155 from FunkinCrew/bugfix/story-menu-background
...
Bugfixes: Story Menu Visuals
2023-09-12 22:29:39 -04:00
EliteMasterEric
a02058b260
Merge branch 'feature/improved-cursor' into develop
2023-09-12 19:52:08 -04:00
EliteMasterEric
7083f6e7ce
Additional cursor and playbar fixes.
2023-09-12 19:43:19 -04:00
EliteMasterEric
fa28932dea
Implementing custom cursor modes for better interface readability.
2023-09-12 19:42:39 -04:00
EliteMasterEric
71e1fccce1
Merge remote-tracking branch 'origin/master' into bugfix/chart-editor-playbar-buttons
2023-09-12 18:51:16 -04:00
EliteMasterEric
1acb048930
Merge remote-tracking branch 'origin/bugfix/story-menu-background' into develop
2023-09-12 02:37:02 -04:00
EliteMasterEric
aa1ca65c35
Fix issue where title text wasn't displaying properly.
2023-09-12 01:17:15 -04:00
EliteMasterEric
acdb44703c
Merge remote-tracking branch 'origin/bugfix/story-menu-background'
2023-09-12 01:06:35 -04:00
EliteMasterEric
2f16b9af96
Merge remote-tracking branch 'origin/feature/chart-editor-snap' into develop
2023-09-12 01:02:08 -04:00
EliteMasterEric
a63246ff51
Remove notification on snapping change.
2023-09-12 00:25:05 -04:00
EliteMasterEric
74bd9084b6
Merge remote-tracking branch 'origin/feature/ghost-hold-notes' into develop
2023-09-11 19:42:25 -04:00
EliteMasterEric
abcec3c5f6
Render a ghost hold note when dragging to place (plus fix for hold notes on different note quants)
2023-09-11 19:42:10 -04:00
EliteMasterEric
430c937811
Merge remote-tracking branch 'origin/feature/chart-editor-snap' into develop
2023-09-11 18:29:29 -04:00
EliteMasterEric
d3f5a81b13
Fix a bug where ghost note would be properly snapped but placed note would not.
2023-09-11 18:29:08 -04:00
EliteMasterEric
1524f6a96e
Merge branch 'bugfix-squashed/macos-file-browse' into develop
2023-09-11 17:52:04 -04:00
EliteMasterEric
2dad5953fd
I hope someone got fired for that blunder.
2023-09-11 17:42:46 -04:00
EliteMasterEric
2ea030d5a2
Merge remote-tracking branch 'origin/bugfix-squash/playbar-scrollarea-height' into HEAD
2023-09-08 18:25:40 -04:00
EliteMasterEric
1acce31123
Merge remote-tracking branch 'origin/feature/chart-note-snapping-ui' into HEAD
2023-09-08 18:25:20 -04:00
EliteMasterEric
a3e3341a1a
Merge branch 'bugfix-squash/chart-editor-template-bpm' into HEAD
2023-09-08 18:24:21 -04:00
EliteMasterEric
ef1cb10bb3
Merge remote-tracking branch 'origin/bugfix-squash/song-data-parser-rework' into HEAD
2023-09-08 18:23:55 -04:00