Commit graph

3601 commits

Author SHA1 Message Date
Cameron Taylor
c95ebaa948 Merge branch 'rewrite/master' into nothyper474/cwd-preloader 2024-06-01 16:27:08 -04:00
Cameron Taylor
5fc93f1b71
Merge pull request #572 from FunkinCrew/gamerbross/chart-importer-suffix
[PUBLIC PR] Fix instrumental ID issue when importing legacy charts
2024-06-01 16:26:28 -04:00
Cameron Taylor
ded413ab77
Merge branch 'rewrite/master' into gamerbross/chart-importer-suffix 2024-06-01 16:26:18 -04:00
Cameron Taylor
c2cc73077f
Merge pull request #588 from FunkinCrew/ninjamuffin99/funk-244-preview-songs-on-freeplay-should-last-longer
make songs last longer on freeplay
2024-06-01 16:25:49 -04:00
Cameron Taylor
26d19abaab
Merge pull request #590 from FunkinCrew/bugfix/may-31st-fixes
May 31st chart fixes
2024-06-01 16:25:08 -04:00
Cameron Taylor
de92a7ba5c Merge branch 'rewrite/master' into bugfix/may-31st-fixes 2024-06-01 16:23:37 -04:00
Cameron Taylor
e4eb9a7dc9 assets submod 2024-06-01 16:23:22 -04:00
EliteMasterEric
6851edc64b Add new charts 2024-05-31 21:55:33 -04:00
EliteMasterEric
12acdcd9d9 Fix a Results->Freeplay crash 2024-05-31 21:55:27 -04:00
EliteMasterEric
fd28c91e75 Update assets submodule 2024-05-31 21:21:46 -04:00
EliteMasterEric
e36fbfa72c Update the changelog 2024-05-31 20:16:37 -04:00
EliteMasterEric
074b1afc76 Readd a reverted freeplay bugfix 2024-05-31 20:16:23 -04:00
EliteMasterEric
acdd6ba403 Merge remote-tracking branch 'secret/rewrite/master' into bugfix/may-31st-fixes 2024-05-31 20:08:31 -04:00
EliteMasterEric
9088570b92 Make sure JSON data uses latest version/generatedBy when writing. 2024-05-31 19:21:21 -04:00
EliteMasterEric
06daa9d402 Increase Great threshold to 80% 2024-05-31 19:20:39 -04:00
EliteMasterEric
8bf26322e9 Update generatedBy to the latest value when saving a chart. 2024-05-31 18:09:30 -04:00
EliteMasterEric
98eda8ef55 Give timeFormat a default value (fixes the Stress issues!) 2024-05-31 18:09:07 -04:00
Cameron Taylor
a1e34123f5
Merge pull request #582 from FunkinCrew/title-bg-fix
fix the one random slice of pixels where the bg doesnt show... lol (FUNK-239)
2024-05-31 18:08:05 -04:00
Cameron Taylor
72ca1145ba
Merge pull request #584 from FunkinCrew/hard-erect-lag-fix
removes trace() that lags freeplay
2024-05-31 18:07:48 -04:00
Cameron Taylor
00566848e9
Merge pull request #586 from FunkinCrew/bugfix/mod-songs-freeplay-preview
Disable song previews for mod songs rather than crashing the game
2024-05-31 18:07:32 -04:00
Cameron Taylor
7d946cf1d8
Merge pull request #587 from FunkinCrew/results-scrolling
Scrolling results text
2024-05-31 18:06:56 -04:00
Cameron Taylor
d89a898e6c make songs last longer on freeplay 2024-05-31 17:16:26 -04:00
EliteMasterEric
2a8cdfaffa Fix an extra crash. 2024-05-31 02:30:42 -04:00
EliteMasterEric
9e0a993746 Disable song previews for mod songs rather than crashing the game 2024-05-31 02:03:40 -04:00
EliteMasterEric
0d4f3cdc33 Scrolling results text 2024-05-31 01:42:41 -04:00
Cameron Taylor
007ec95e85 update difficulties 2024-05-30 23:42:48 -04:00
Cameron Taylor
40d1fd96a3 art submod 2024-05-30 23:27:00 -04:00
Cameron Taylor
7347b66ce4 removes trace() that lags freeplay 2024-05-30 23:07:41 -04:00
Cameron Taylor
dc33da904c assets submod 2024-05-30 23:03:27 -04:00
Cameron Taylor
7a2f3c81a1 fix the one random slice of pixels where the bg doesnt show... lol 2024-05-30 21:11:17 -04:00
Cameron Taylor
62a3ddea3c
Merge pull request #581 from FunkinCrew/feature/results-freeplay-transition
Make Freeplay use correct ranks, play the slam animation after Results (FUNK-236)
2024-05-30 21:05:53 -04:00
Cameron Taylor
c322e2aeef Merge branch 'rewrite/master' into feature/results-freeplay-transition 2024-05-30 21:05:32 -04:00
Cameron Taylor
d33bc4ee30 assets submod 2024-05-30 20:56:44 -04:00
Cameron Taylor
99daf892b7 Merge branch 'gamerbross/chart-editor-sustains' into rewrite/master 2024-05-30 20:55:17 -04:00
Cameron Taylor
5f70e1be0b Merge branch 'develop-0.4.0' into rewrite/master 2024-05-30 20:54:27 -04:00
Cameron Taylor
d015e73066 Merge branch 'bugfix/multifix' into develop-0.4.0 2024-05-30 20:53:18 -04:00
EliteMasterEric
b7a828e7d8 Make Freeplay use correct ranks, play the slam animation after Results, new Results music 2024-05-30 05:25:51 -04:00
Eric
d4cf18df00
Merge pull request #580 from FunkinCrew/feature/freeplay-shit+santa-cutscene
freeplay shit + santa cutscene
2024-05-30 00:22:14 -04:00
EliteMasterEric
ee70e85dec Merge branch 'rewrite/master' into feature/freeplay-shit+santa-cutscene 2024-05-29 23:56:51 -04:00
FabsTheFabs
5f9019a2a3 update assets submod 2024-05-30 04:35:05 +01:00
FabsTheFabs
e7079452fb freeplay visual changes + base rank visuals 2024-05-30 04:34:00 +01:00
FabsTheFabs
68e9937b43 interval shake class 2024-05-30 04:33:26 +01:00
Eric
03e614e4d2
Merge branch 'rewrite/master' into gamerbross/chart-editor-sustains 2024-05-29 22:55:50 -04:00
EliteMasterEric
174c595837 Fix crash caused by improperly canceling a tween 2024-05-29 22:49:57 -04:00
EliteMasterEric
8d7591a796 Fix an issue where Story Menu props wouldn't render. 2024-05-29 21:43:54 -04:00
Cameron Taylor
fb752ddd78 remove random < in project.xml lol 2024-05-29 17:05:20 -04:00
Cameron Taylor
120bd38fc0 Merge branch 'projectxml-autocompletion' into develop-0.4.0 2024-05-29 16:57:24 -04:00
Cameron Taylor
75b4baefca Merge branch 'gamerbross/chart-editor-sustains' into develop-0.4.0 2024-05-29 16:54:19 -04:00
Cameron Taylor
4dca6671c4 Merge branch 'gamerbross/freeplay-crash' into develop-0.4.0 2024-05-29 16:53:26 -04:00
Cameron Taylor
a2fd14c031 Merge branch 'richtrash21/main-menu-camera' into develop-0.4.0 2024-05-29 16:51:24 -04:00