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 |
|
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
|
dd6db0196b
|
Merge branch 'rewrite/master' into rewrite/feature/precise-inputs-gamepad
|
2023-10-16 16:47:01 -04:00 |
|
Cameron Taylor
|
494019a703
|
Merge pull request #172 from FunkinCrew/rewrite/feature/preferences-rewrite
Preferences rewrite, preferences now save
|
2023-10-16 16:21:53 -04:00 |
|
Cameron Taylor
|
729e6cc9fe
|
Merge pull request #193 from FunkinCrew/rewrite/fix-ci-clear-cache-when-deps-change
fix: cache needs to be manually cleared when dependency versions change
|
2023-10-16 16:20:57 -04:00 |
|
Hazel
|
808490245a
|
pin caches to hash of hmm.json
|
2023-10-16 18:40:44 +01:00 |
|
Hazel
|
c36d01230c
|
windows style paths <3
|
2023-10-16 18:39:03 +01: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
|
a89a819590
|
Merge pull request #171 from FunkinCrew/rewrite/feature/save-data-rewrite
Rewrite Save functionality
|
2023-10-15 20:22:46 -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 |
|
Cameron Taylor
|
965363c062
|
Merge pull request #167 from FunkinCrew/rewrite/feature/snapped-paste
Chart Editor: Snapped Paste and Event Visiblity
|
2023-10-15 19:39:56 -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 |
|
Cameron Taylor
|
844a7e5842
|
Merge pull request #166 from FunkinCrew/rewrite/feature/chart-editor-erect-template
Chart Editor: Erect Template and Instrumental Fixes
|
2023-10-15 19:02:01 -04:00 |
|
EliteMasterEric
|
022b93bc43
|
Merge branch 'rewrite/master' into rewrite/feature/chart-editor-erect-template
|
2023-10-15 18:42:38 -04:00 |
|