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
|
a98d543974
|
Merge pull request #189 from FunkinCrew/rewrite/feature/remember-difficulty
Remember difficulty when returning to the Story menu
|
2023-10-18 23:59:35 -04:00 |
|
Cameron Taylor
|
c4e2f61e2d
|
Merge branch 'rewrite/master' into rewrite/feature/remember-difficulty
|
2023-10-18 23:59:21 -04:00 |
|
Cameron Taylor
|
5574a5d2c8
|
Merge pull request #197 from FunkinCrew/rewrite/bugfix/chart-editor-more-fixes
Chart Editor: Several crash/stability bugs fixed
|
2023-10-18 19:48:15 -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
|
8a4c32bd95
|
Merge pull request #195 from FunkinCrew/rewrite/bugfix/chart-editor-various-fixes
Fixes for a few bugs in the chart editor.
|
2023-10-18 19:32:45 -04:00 |
|
Cameron Taylor
|
25c24a9bc8
|
Merge branch 'rewrite/master' into rewrite/bugfix/chart-editor-various-fixes
|
2023-10-18 19:32:31 -04:00 |
|
Cameron Taylor
|
256a9e7a23
|
remote submodule stuff
|
2023-10-18 19:30:50 -04:00 |
|
Cameron Taylor
|
8f23537bac
|
assets submod merge
|
2023-10-18 18:37:00 -04:00 |
|
Cameron Taylor
|
58f3c5c186
|
Merge pull request #190 from FunkinCrew/charting-sfx
charting sound effects in progress!
|
2023-10-18 17:28:56 -04:00 |
|
EliteMasterEric
|
8d87f51f72
|
Update assets folder
|
2023-10-18 16:05:16 -04:00 |
|
EliteMasterEric
|
26f83b5a81
|
Fix _time of nullable compile error.
|
2023-10-18 16:02:56 -04:00 |
|
EliteMasterEric
|
f016a9ab10
|
Merge assets folder
|
2023-10-18 15:55:43 -04:00 |
|
EliteMasterEric
|
73022207fa
|
Merge hitsound audios
|
2023-10-18 15:52:44 -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 |
|
Cameron Taylor
|
c37c446b25
|
submodule merge fix
|
2023-10-18 14:55:59 -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
|
a8a8cf96fd
|
submodule merge fix
|
2023-10-17 23:36:25 -04:00 |
|
Cameron Taylor
|
f14afc4606
|
Merge pull request #192 from FunkinCrew/rewrite/bugfix/bf-pixel-cam
Fix BF Pixel death camera
|
2023-10-17 22:05:00 -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
|
1670cb70d0
|
dipshit mereg...
|
2023-10-17 20:21:12 -04:00 |
|
Cameron Taylor
|
7f113abad6
|
Merge branch 'rewrite/bugfix/bf-pixel-cam' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/bugfix/bf-pixel-cam
|
2023-10-17 20:16:27 -04:00 |
|
Cameron Taylor
|
75b9aefb1c
|
senpai antialiasing fix
|
2023-10-17 20:14:36 -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
|
277625cc5c
|
Merge pull request #186 from FunkinCrew/rewrite/bugfix/pause-and-results-fixes
Fixes to Pause screen and Results screen
|
2023-10-17 19:05:19 -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
|
9330e2b68f
|
Update assets
|
2023-10-17 17:54:00 -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
|
ed8a52d2e9
|
WIP on rewrite/bugfix/pause-and-results-fixes: 9b8fc872 song diff menu sort
|
2023-10-17 00:38:28 -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
|
160fe77bbc
|
Merge pull request #173 from FunkinCrew/rewrite/feature/precise-inputs-gamepad
Precise inputs on gamepad
|
2023-10-16 21:38:38 -04:00 |
|
Cameron Taylor
|
13e2fa9a0b
|
assets fix
|
2023-10-16 21:34:27 -04:00 |
|
EliteMasterEric
|
3add6a965e
|
Several crashes fixed and working Random!
|
2023-10-16 20:12:40 -04:00 |
|
Cameron Taylor
|
6e54607220
|
Merge branch 'rewrite/feature/precise-inputs-gamepad' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/precise-inputs-gamepad
|
2023-10-16 16:48:12 -04:00 |
|