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
EliteMasterEric
9f293d3be8
Merge branch 'rewrite/master' into rewrite/feature/save-data-rewrite
2023-10-15 01:15:49 -04:00
EliteMasterEric
88f9584fd9
Fix an issue where the game would crash when loading a song in Freeplay
2023-10-15 01:06:06 -04:00
EliteMasterEric
ccefa972a0
Fixes an issue where Freeplay Menu wasn't properly flagging the Week 6 assets to load.
2023-10-15 00:59:35 -04:00
EliteMasterEric
7a9b4d6bf0
Add the "death.cameraOffset" attribute to character data
2023-10-15 00:51:20 -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
Cameron Taylor
eb95f105d7
Merge pull request #187 from FunkinCrew/rewrite/bugfix/menu-spam
...
Fix spamming buttons on Pause/Freeplay breaking shit
2023-10-14 20:33:36 -04:00
EliteMasterEric
c1684b218e
More fixes to github actions
2023-10-12 20:17:41 -04:00
EliteMasterEric
9ec3f7aaac
Fix to FORCE_DEBUG_VERSION flag
2023-10-12 19:57:16 -04:00
EliteMasterEric
dd3d1116c0
Add a flag to make Git hash display on launcher builds.
2023-10-12 13:22:59 -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
e5fbf5d99f
Merge pull request #180 from FunkinCrew/rewrite/bugfix/difficulty-switch-crash
...
[CRASH FIX] Safely handle difficulty switching to avoid null object reference in Play State
2023-10-10 21:33:57 -04:00
Cameron Taylor
e26a82275c
Merge branch 'rewrite/master' into rewrite/bugfix/alt-animation-fixes
2023-10-10 20:32:12 -04:00
EliteMasterEric
f652beb382
Fix several merge errors.
2023-10-09 20:04:21 -04:00
Cameron Taylor
8009045e76
fix to song selection
2023-10-09 18:38:52 -04:00
Cameron Taylor
9446f268e0
diff stars pop in nicer
2023-10-09 18:38:10 -04:00
Cameron Taylor
9926706e6e
litty fix
2023-10-09 18:38:05 -04:00
Cameron Taylor
4b1af216d4
capsule alpha stuff in progress
2023-10-09 18:38:02 -04:00
Cameron Taylor
387acd211e
icon scaling fix + removed temp lighting
2023-10-09 18:37:20 -04:00
Cameron Taylor
ba896508cc
cartoons and stuff
2023-10-09 18:35:43 -04:00
Cameron Taylor
546e15dcac
click polish
2023-10-09 18:34:54 -04:00
Cameron Taylor
8c74fcd73a
playingCartoon bool woops
2023-10-09 18:34:38 -04:00
Cameron Taylor
8f9206f639
python file to generate shitty audio
2023-10-09 18:34:29 -04:00
Cameron Taylor
ab5d6d2f48
sounds in progress
2023-10-09 18:33:50 -04:00
Cameron Taylor
66f77a985f
boyfriend blink code
2023-10-09 18:33:09 -04:00
Cameron Taylor
82bb619864
boyfriend tv looping
2023-10-09 18:33:09 -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
Cameron Taylor
b20cb27f82
hue shifting in progress
2023-10-09 18:31:06 -04:00
Cameron Taylor
20d13f56ac
capsule text effect
2023-10-09 18:29:32 -04:00
Cameron Taylor
5d6264e67e
sprites follow rotation of capsule
2023-10-09 18:28:59 -04:00
Cameron Taylor
0dbcc50bcc
random song music in progress
2023-10-09 18:28:56 -04:00
Cameron Taylor
8525cfaf21
cute text popin
2023-10-09 18:28:11 -04:00
Cameron Taylor
f474c3aac5
better grouping stuf
2023-10-09 18:28:11 -04:00
Cameron Taylor
eacd76a0fa
difficulty rankings and grayscale mockup
2023-10-09 18:28:08 -04:00
Cameron Taylor
a8e39d90e8
temp rank stuff in progress
2023-10-09 18:27:17 -04:00
EliteMasterEric
f7bac02ee3
Fix crashing, broken countdown, broken miss muting in song preview
2023-10-09 18:24:07 -04:00
EliteMasterEric
5fa9c5246f
Fixed a bug where beat hit events were called multiple times during the conductor
2023-10-09 18:22:52 -04:00
EliteMasterEric
11b1ca5100
Fix bug where pressing ENTER in UI would cause song to try to preview. Fix bug where trying to preview a newly created song would crash.
2023-10-09 18:22:28 -04:00
EliteMasterEric
5b4a00e893
Make sure timestamps are consistent with use of Int64.
2023-10-09 18:22:02 -04:00
EliteMasterEric
4f0e9614e0
Fix build issues caused by int64 handling
2023-10-09 18:21:58 -04:00
EliteMasterEric
2f56c74060
Fix HTML typing issue
2023-10-09 18:19:58 -04:00
EliteMasterEric
4468e2a5a5
Fixed several bugs with Play State (mostly restarting the song)
2023-10-09 18:16:26 -04:00
Cameron Taylor
b96c0e6256
album artist stuff
2023-10-09 18:12:14 -04:00
Cameron Taylor
097b5dab46
freeplay optimize fix
2023-10-09 18:11:19 -04:00
Cameron Taylor
97267d18b9
freeplay wrapping fix
2023-10-09 18:10:02 -04:00
Cameron Taylor
c3d30f6711
polish / optimize in progress
2023-10-09 18:10:02 -04:00
Cameron Taylor
92f45d93aa
pixel icons
2023-10-09 18:09:59 -04:00
Cameron Taylor
8052773f92
comment
2023-10-09 18:09:25 -04:00
Cameron Taylor
ee7108757b
proper fav and # symbol move
2023-10-09 18:09:24 -04:00
Cameron Taylor
9c641f9e90
tabbing movement
2023-10-09 18:09:24 -04:00
Cameron Taylor
c469d4b7c0
regexp filter
2023-10-09 18:09:24 -04:00
Cameron Taylor
ce2e6a3993
proper letter stuff
2023-10-09 18:09:24 -04:00
Cameron Taylor
e618fbc64f
bouncing thingie
2023-10-09 18:09:23 -04:00
Cameron Taylor
c2f46309ab
arrow and seperator back in
2023-10-09 18:09:20 -04:00
Cameron Taylor
11ffc62238
new letters
2023-10-09 18:08:13 -04:00
Cameron Taylor
f460af1ba0
positioning stuff
2023-10-09 18:05:01 -04:00
Cameron Taylor
dc452bbe9a
different colors / sizes
2023-10-09 18:05:01 -04:00
Cameron Taylor
eb87d40d58
random capsule in progres
2023-10-09 18:04:50 -04:00
Cameron Taylor
65422393cf
letter sort
2023-10-09 18:04:28 -04:00
Cameron Taylor
84f908fbde
tween in fixed
2023-10-09 18:04:28 -04:00
Cameron Taylor
9571eb70e0
scaling of capsules
2023-10-09 18:04:28 -04:00
Cameron Taylor
7ac2e91c8d
selected in middle-ish
2023-10-09 18:04:28 -04:00
EliteMasterEric
5ae2bc814b
Fix issue causing crash on F5
2023-10-09 15:35:50 -04:00
EliteMasterEric
e967b1e7f3
Fix vocals not changing when switching difficulties.
2023-10-09 14:19:52 -04:00
EliteMasterEric
74b925d2c6
Assert the difficulty exists (and throw an error if it doesn't) before performing reset.
2023-10-09 14:13:14 -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
Cameron Taylor
9fe74d719b
Merge pull request #175 from FunkinCrew/rewrite/bugfix/hold-note-scoring
...
Fix a bug where hold notes wouldn't grant score
2023-10-09 05:19:17 -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
4a4708fe23
That is the fastest I have ever fixed a bug holy shit.
2023-10-06 11:42:39 -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
be4fd74d40
Resolve metadata loading issues.
2023-09-25 23:24:18 -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
29c22a422f
Fixed a JSON parser issue causing event data to be parsed wrong!
2023-09-18 20:14:43 -04:00
EliteMasterEric
06269e95fd
Fix to crash in freeplay (swapped two args oops!)
2023-09-18 20:02:17 -04:00
EliteMasterEric
b56768d9b5
Fix an issue where the game would try and fail to load metadata for a newly created song in the Chart Editor.
2023-09-18 17:59:55 -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
82a6549075
Merge remote-tracking branch 'origin/master' into feature/chart-editor-file-keybinds
2023-09-12 18:53:06 -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
EliteMasterEric
e8952d101a
Merge remote-tracking branch 'origin/bugfix-squashed/macos-file-browse' into HEAD
2023-09-08 18:23:01 -04:00
EliteMasterEric
acadec80de
Merge remote-tracking branch 'origin/feature/chart-editor-file-keybinds' into HEAD
2023-09-08 18:21:25 -04:00
EliteMasterEric
15741843fc
Merge remote-tracking branch 'origin/feature/chart-editor-beat-lines' into HEAD
2023-09-08 18:21:08 -04:00
EliteMasterEric
f46c8821c8
Merge remote-tracking branch 'origin/feature/chart-editor-snap' into HEAD
2023-09-08 18:20:52 -04:00
EliteMasterEric
f8ae4b2a62
Merge remote-tracking branch 'origin/bugfix/chart-editor-playbar-buttons' into HEAD
2023-09-08 18:20:46 -04:00
EliteMasterEric
ee900fd7aa
Merge branch 'bugfix/chart-editor-null-safety' into HEAD
2023-09-08 18:20:25 -04:00
EliteMasterEric
c24fa3c154
Fix issue where playbar scroll area wasn't scaled to the grid.
2023-09-08 18:07:08 -04:00
EliteMasterEric
7a161e4cec
Improved UI for note snapping (and notif on difficulty change)
2023-09-08 18:04:25 -04:00
EliteMasterEric
8431e18d37
Fixed issue where ChartEditorState was not copying SongMetadata properly
2023-09-08 18:00:48 -04:00
EliteMasterEric
f4bc682ea1
Remove funkin.play.song.SongData and refactor app to match.
2023-09-08 17:46:44 -04:00
EliteMasterEric
7e1c11bb25
New song data parser
2023-09-08 17:45:47 -04:00
EliteMasterEric
2c3e513d5b
Fixed bugs with saving charts on Mac
...
Added FILE_DROP_SUPPORTED compilation flag and edited UI text to match.
2023-09-08 17:41:20 -04:00
Cameron Taylor
96a0b2fe87
Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into feature/chart-editor-snap
2023-09-04 23:30:02 -04:00
Cameron Taylor
222b364e75
Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into feature/chart-editor-beat-lines
2023-09-04 23:28:18 -04:00
Cameron Taylor
f87a8ef412
Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into bugfix/chart-editor-null-safety
2023-09-04 22:27:16 -04:00
Eric
bb09cc19e7
HTML5: Several fixes to asset loading ( #136 )
...
* Update Polymod to fix async script loading.
* Got into the Main Menu but playstate doesn't work
* Got into PlayState but GF script breaks!
---------
Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
2023-09-04 22:18:45 -04:00
EliteMasterEric
2b092abd8a
Added missing File menu keybinds
2023-09-04 15:33:08 -04:00
EliteMasterEric
3a47eed3b9
Darkened beat dividers on chart grid.
2023-09-01 00:56:10 -04:00
EliteMasterEric
97b640f30b
Note snapping yay!
2023-08-31 23:48:15 -04:00
EliteMasterEric
2f26a97dcb
WIP on chart editor snapping
2023-08-31 21:56:49 -04:00
EliteMasterEric
bc5b34cdd2
Fixed a bug where the playbar buttons wouldn't work while the cursor was over the UI.
2023-08-31 19:14:01 -04:00
EliteMasterEric
c813e23203
Merge remote-tracking branch 'origin/master' into bugfix/chart-editor-null-safety
2023-08-31 18:47:31 -04:00
EliteMasterEric
c78c6439a6
Filled out null safety checks.
2023-08-31 18:47:23 -04:00
Eric
279277b18c
Unit Tests: Coverage Reporting and Github Actions Integration ( #131 )
...
* Initial test suite
* Fix some build warnings
* Implemented working unit tests with coverage
* Reduced some warnings
* Fix a mac-specific issue
* Add 2 additional unit test classes.
* Multiple new unit tests
* Some fixins
* Remove auto-generated file
* WIP on hiding ignored tests
* Added list of debug hotkeys
* Remove old website
* Remove empty file
* Add more unit tests
* Fix bug where arrows would nudge BF
* Fix bug where ctrl/alt would flash capsules
* Fixed bug where bf-old easter egg broke
* Remove duplicate lines
* More test-related stuff
* Some code cleanup
* Add mocking and a test assets folder
* More TESTS!
* Update Hmm...
* Update artist on Monster
* More minor fixes to individual functions
* 1.38% unit test coverage!
* Even more tests? :O
* More unit test work
* Rework migration for BaseRegistry
* gameover fix
* Fix an issue with Lime
* Fix issues with version parsing on data files
* 100 total unit tests!
* Added even MORE unit tests!
* Additional test tweaks :3
* Fixed tests on windows by updating libraries.
* A bunch of smaller syntax tweaks.
* New crash handler catches and logs critical errors!
* Chart editor now has null safety enabled.
* Null safety on all tests
* New Level data test
* Generate proper code coverage reports!
* Disable null safety on ChartEditorState for unit testing
* Update openfl to use latest fixes for crash reporting
* Added unit test to Github Workflow
* Updated unit tests to compile with null safety enabled by inlining assertions.
* Added coverage gutters as a recommended extension
* Impreovements to tests involving exceptions
* Disable a few incomplete tests.
* Add scripts for building unit coverage reports on linux
---------
Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
2023-08-30 18:31:59 -04:00
Eric
3828179218
Chart Editor: Several bug fixes ( #139 )
...
* Fix a crash bug caused by unhandled null value.
* Fix bug where note preview wouldn't update on song load
* Fix note preview not updating when loading inst, fixed BF health icon positioning
2023-08-30 18:29:09 -04:00
EliteMasterEric
e157c23ea7
Apply @:nullSafety to chart editor classes.
2023-08-30 02:24:35 -04:00
Eric
cb81371b4a
Fix an occasional bug where "default" will be used over "" causing a crash on song load. ( #135 )
2023-08-28 15:07:51 -04:00
Eric
21f44edf1d
New crash handler + Additional null safety for ChartEditorState ( #130 )
...
* A bunch of smaller syntax tweaks.
* New crash handler catches and logs critical errors!
* Chart editor now has null safety enabled.
* Fix -W build issue.
* Actually update hmm.json to use the crash handling branch
* Fix issues causing crash handler to trigger
2023-08-28 15:03:29 -04:00
Eric
74dac9d830
Fix a story mode bug where charts would sometimes not be loaded for the second and third song. ( #134 )
2023-08-22 23:18:37 -04:00
Eric
235969e9a7
Fixed an issue where the Week 6 countdown was anti-aliased. ( #133 )
2023-08-22 22:45:58 -04:00
Eric
42d8d55067
Unit Test Suite ( #119 )
...
* Initial test suite
* Fix some build warnings
* Implemented working unit tests with coverage
* Reduced some warnings
* Fix a mac-specific issue
* Add 2 additional unit test classes.
* Multiple new unit tests
* Some fixins
* Remove auto-generated file
* WIP on hiding ignored tests
* Added list of debug hotkeys
* Remove old website
* Remove empty file
* Add more unit tests
* Fix bug where arrows would nudge BF
* Fix bug where ctrl/alt would flash capsules
* Fixed bug where bf-old easter egg broke
* Remove duplicate lines
* More test-related stuff
* Some code cleanup
* Add mocking and a test assets folder
* More TESTS!
* Update Hmm...
* Update artist on Monster
* More minor fixes to individual functions
* 1.38% unit test coverage!
* Even more tests? :O
* More unit test work
* Rework migration for BaseRegistry
* gameover fix
* Fix an issue with Lime
* Fix issues with version parsing on data files
* 100 total unit tests!
* Added even MORE unit tests!
* Additional test tweaks :3
* Fixed tests on windows by updating libraries.
* Set versions for flixel-ui and hamcrest
---------
Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
2023-08-22 04:27:30 -04:00
Cameron Taylor
ab34bbdcee
Merge pull request #129 from FunkinCrew/feature/chart-editor-note-graph
...
Chart Editor: Note Preview Graph
2023-08-16 04:14:12 -04:00
Cameron Taylor
280ecc2003
Merge pull request #128 from FunkinCrew/feature/chart-editor-difficulty-stuff
...
Chart Editor: Difficulty tweaks and bug fixes
2023-08-16 04:12:07 -04:00
EliteMasterEric
a548a43759
Note preview graph renders nicely and is fully interactable!
2023-08-16 03:40:44 -04:00
Cameron Taylor
db9f7f503f
Merge branch 'master' into bugfix/attract-screen
2023-08-15 22:10:22 -04:00
EliteMasterEric
8732adc144
Difficulty selection now updates metadata toolbox
2023-08-15 16:08:12 -04:00
EliteMasterEric
d03a2f0157
WIP on improving the difficulty toolbox
2023-08-14 23:13:12 -04:00
EliteMasterEric
c6a1f5ffea
Work on fixing issues with difficulty/variation handling in charts
2023-08-11 14:00:38 -04:00
EliteMasterEric
68c85d9214
Made the currently-unused Divisions field optional.
2023-08-10 15:34:40 -04:00
EliteMasterEric
6096f12307
Fix an issue where new songs on specific stages would crash
2023-08-10 14:21:10 -04:00
EliteMasterEric
2226f1f05e
Fix an issue where tracknames weren't loading properly
2023-08-10 14:04:09 -04:00
EliteMasterEric
214c706cac
Fix a story menu crash
2023-08-10 14:03:57 -04:00
EliteMasterEric
de6972cb90
Fix issue where stage wasn't loaded properly, and metronome would play in song preview.
2023-08-09 18:11:50 -04:00
EliteMasterEric
34abee594d
Fix bug where onUpdate was called twice per frame
2023-08-09 18:11:19 -04:00
EliteMasterEric
859b543118
Merge branch 'bugfix/play-state-fix' into feature/chart-editor-song-preview
2023-08-09 17:53:25 -04:00
EliteMasterEric
3e02f7fca9
Fix a bug where beatState
sometimes gets called before create
2023-08-09 00:28:09 -04:00
EliteMasterEric
92e94a84b6
Fix a bug where returning to title displays a black screen.
2023-08-08 16:41:23 -04:00
EliteMasterEric
ea31d72cbe
AttractState now properly plays the trailer
2023-08-08 16:37:17 -04:00
EliteMasterEric
b7f5f33f3e
Delete ancient VideoState.
2023-08-08 15:42:15 -04:00
EliteMasterEric
ec76c54ccd
Implement basic AttractState.
2023-08-08 15:41:48 -04:00
EliteMasterEric
3f99e0e3da
Move TitleState into its own package.
2023-08-08 15:41:25 -04:00
EliteMasterEric
b9c25d6ed9
Fix crashing, broken countdown, broken miss muting in song preview
2023-08-04 17:25:13 -04:00
EliteMasterEric
a0a8d47216
Imported music now plays properly in chart editor state
2023-08-04 16:15:07 -04:00
EliteMasterEric
3e093510af
Fixed a bug where beat hit events were called multiple times during the conductor
2023-08-04 12:35:01 -04:00
EliteMasterEric
4852515c42
Fix bug where pressing ENTER in UI would cause song to try to preview. Fix bug where trying to preview a newly created song would crash.
2023-08-04 11:18:00 -04:00
EliteMasterEric
13671cf290
Make sure timestamps are consistent with use of Int64.
2023-08-04 11:13:41 -04:00
EliteMasterEric
49622f2441
Fix build issues caused by int64 handling
2023-08-03 22:22:29 -04:00
EliteMasterEric
5590331e10
Fix HTML typing issue
2023-08-03 12:41:54 -04:00
EliteMasterEric
29466af4b7
Fix issue where strumline would stay pressed when resetting.
2023-08-03 12:19:36 -04:00
EliteMasterEric
050086fb36
Fixed camera focus on game over.
2023-08-03 11:40:19 -04:00
Cameron Taylor
5bbf279208
gameover fix
2023-08-03 11:22:52 -04:00
EliteMasterEric
3a31c9731c
Fixed several bugs with Play State (mostly restarting the song)
2023-08-02 18:08:49 -04:00
EliteMasterEric
b54c335886
Fix for Menu->Freeplay and Play->Pause transitions
2023-08-02 11:00:23 -04:00
EliteMasterEric
0136202c36
Janky fix
2023-08-02 10:15:54 -04:00
EliteMasterEric
005ffafe23
Merge remote-tracking branch 'origin/master' into feature/chart-editor-song-preview
2023-08-01 16:03:34 -04:00
Cameron Taylor
20658e0590
Merge branch 'feature/chart-editor-bpm' of https://github.com/ninjamuffin99/Funkin-secret into feature/chart-editor-bpm
2023-08-01 15:34:24 -04:00
EliteMasterEric
639a36a9c7
Fix some weird issues with constants
2023-08-01 15:29:17 -04:00
EliteMasterEric
9b66bc186a
alphabetical -> alphabetically
2023-08-01 15:25:46 -04:00
Cameron Taylor
da465ff46d
Merge branch 'feature/chart-editor-bpm' of https://github.com/ninjamuffin99/Funkin-secret into feature/chart-editor-bpm
2023-08-01 14:25:34 -04:00
EliteMasterEric
979a5ad493
Merge branch 'master' into feature/chart-editor-bpm
2023-08-01 14:08:41 -04:00
EliteMasterEric
68ccc3bceb
Fixed UI scaling issue (thanks Ian!!!)
2023-08-01 13:07:16 -04:00
Cameron Taylor
d750af4396
directory fix and hmm lock
2023-07-31 15:40:47 -04:00
EliteMasterEric
624d4f5111
Fix asset redirection
2023-07-31 15:04:18 -04:00
EliteMasterEric
c0745d4ad7
Hide warning
2023-07-31 14:08:48 -04:00
EliteMasterEric
4e67791249
Vwoosh notes on reset
2023-07-31 13:42:13 -04:00
EliteMasterEric
92a0c367b7
Typo fixes
2023-07-31 13:31:17 -04:00
EliteMasterEric
d0ef34ced6
Merge branch 'master' into feature/new-input-system-yay
2023-07-26 22:00:14 -04:00
EliteMasterEric
b974e6d6d7
Fix issues with playtest and backwards time travel
2023-07-26 21:34:38 -04:00
EliteMasterEric
03444161e8
Merge branch 'feature/new-input-system-yay' into feature/chart-editor-song-preview
2023-07-26 20:03:37 -04:00
EliteMasterEric
2048e65bf2
Added ability to start song at a specific timestamp
2023-07-26 20:03:31 -04:00
EliteMasterEric
5ff546bacc
First iteration of song playtesting from editor!
2023-07-26 16:52:58 -04:00
EliteMasterEric
a6daf3b0d6
Resolved lag issues caused by creating too many notes in the pool.
2023-07-25 23:11:12 -04:00
EliteMasterEric
6af5259a10
Fix an issue where sustain sprites were not killed when the song was reset.
2023-07-25 21:39:19 -04:00
Cameron Taylor
211ccc2e47
Merge pull request #107 from FunkinCrew/feature/offset-editor-tweaks
...
Tweaks and improvements to the animation editor
2023-07-24 16:26:04 -04:00
Cameron Taylor
e21511bc13
Merge pull request #108 from FunkinCrew/feature/chart-editor-importer
...
Chart editor legacy importer
2023-07-22 22:48:43 -04:00
Cameron Taylor
cd2f0d840d
Merge pull request #115 from FunkinCrew/feature/asset-redirect-2
...
Asset redirecting
2023-07-22 22:48:09 -04:00
EliteMasterEric
3c218ec01c
Done with BPM change fixes, currently working on rendering efficiency
2023-07-22 20:16:43 -04:00
Cameron Taylor
f634a099c3
actual songdata git merge proper lol
2023-07-22 14:43:28 -04:00
Cameron Taylor
85af96d654
Merge branch 'master' into feature/chart-editor-importer
2023-07-22 14:43:05 -04:00
EliteMasterEric
aaad06c97d
Merge branch 'feature/new-input-system-yay' into feature/chart-editor-bpm
2023-07-19 21:19:21 -04:00
EliteMasterEric
16e3bfe85e
Fix for BPM changes, plus working on hold note rendering
2023-07-19 21:16:39 -04:00
EliteMasterEric
c56517f94f
Sort the template view
2023-07-19 01:30:43 -04:00
EliteMasterEric
140afd3c31
Redo note positioning
2023-07-19 01:30:36 -04:00
EliteMasterEric
ae76b24a65
New time calculation functions
2023-07-19 01:30:23 -04:00
EliteMasterEric
adda3020a9
Alphabetical sort
2023-07-19 01:29:43 -04:00
EliteMasterEric
ce0be2374d
Event notes have different sprites for each type.
2023-07-19 01:29:13 -04:00
EliteMasterEric
d251d71daa
Asset redirect
2023-07-17 21:54:58 -04:00
EliteMasterEric
16bcf2c767
Rework note sprites to pull note style data
2023-07-13 20:27:45 -04:00
EliteMasterEric
ba53957191
Fixed an issue where dialogue scripts were not being reloaded
2023-07-13 20:26:56 -04:00
EliteMasterEric
00cfeeff72
Created the Note Style class and data registry
2023-07-13 20:25:44 -04:00
EliteMasterEric
883ab87931
Moved AnimationData into the data package
2023-07-13 20:25:01 -04:00
EliteMasterEric
70584c6e88
Make funkin.util.Constants auto-imported
2023-07-13 01:13:26 -04:00
EliteMasterEric
736eecfd9a
Fixed some random crash bug?
2023-07-13 00:37:54 -04:00
EliteMasterEric
b0b8b4fba0
Shut up StickerState
2023-07-10 23:23:18 -04:00
EliteMasterEric
24c9786166
Merge branch 'master' into feature/new-input-system-yay
2023-07-10 18:16:16 -04:00
EliteMasterEric
17a8610640
Added colors to hold note covers
2023-07-10 18:14:34 -04:00
EliteMasterEric
796a51325f
Hold note covers are in and properly positioned
2023-07-08 01:03:46 -04:00
EliteMasterEric
54a9b09155
Merge branch 'master' into bugfix/conductor-monster
2023-07-06 12:35:49 -04:00
EliteMasterEric
a3929db7a8
Merge branch 'master' into feature/offset-editor-tweaks
2023-07-06 01:00:32 -04:00
EliteMasterEric
8e071221ff
Work in progress on hold covers
2023-07-05 22:11:58 -04:00
EliteMasterEric
b615fbf82a
WIP on hold covers
2023-07-04 16:38:10 -04:00
EliteMasterEric
f932422d74
Merge branch 'master' into feature/week-6-dialogue
2023-07-03 13:18:53 -04:00
EliteMasterEric
3bf7955ffa
Conductor fix
2023-07-03 13:16:02 -04:00
EliteMasterEric
b764656a4e
Merge branch 'master' into feature/chart-editor-importer
2023-07-03 13:09:40 -04:00
EliteMasterEric
39cd304ef2
Expanded shortcut list, fixed build errors
2023-07-03 12:51:27 -04:00
EliteMasterEric
90bd5af376
Merge branch 'master' into feature/offset-editor-tweaks
2023-07-03 12:22:33 -04:00