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 |
|