EliteMasterEric
|
a0ae4c418d
|
Merge remote-tracking branch 'origin/rewrite/master' into rewrite/bugfix/chart-editor-event-placement
|
2023-11-05 00:14:44 -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
|
73107dbc07
|
Update HaxeUI cursor handling, and remove Funkin components
|
2023-10-31 14:43:01 -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
|
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 |
|