Commit graph

3693 commits

Author SHA1 Message Date
EliteMasterEric
573e1575a7 Merge branch 'rewrite/master' into pursnake/character-scale 2024-05-30 23:40:00 -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
EliteMasterEric
6572d13a7f Improve documentation a bit. 2024-05-29 23:21:32 -04: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
Cameron Taylor
3ba778606b Merge branch 'sector-a/story-menu-score' into develop-0.4.0 2024-05-29 16:50:05 -04:00
Cameron Taylor
5adeada357 Merge branch 'gamerbross/scripted-stage-tostring' into develop-0.4.0 2024-05-29 16:49:12 -04:00
Cameron Taylor
e449dfa0ef Merge branch 'bugfix/titlestate-startintro-crash' into develop-0.4.0 2024-05-29 16:48:10 -04:00
Cameron Taylor
4f34079b98 Merge branch 'audio-stream' into develop-0.4.0 2024-05-29 16:45:35 -04:00
Your Name
ee4be81062 Now Preloader resets CWD 2024-05-29 15:16:31 -03:00
Eric
934d6c2518
Merge pull request #2539 from gamerbross/bugfix/titlestate-startintro-crash
[BUGFIX] Fix TitleState bugs + crash
2024-05-29 01:50:46 -04:00
Eric
d02ecd17e8
Merge pull request #2576 from richTrash21/develop-mainmenu-fix
[BUGFIX] Main Menu Camera Fix
2024-05-29 01:17:34 -04:00
Eric
972f649d82
Merge pull request #2604 from gamerbross/bugfix/legacy-chart-importer-instrumental
[BUGFIX] Chart Importer Wrong Instrumental
2024-05-29 01:10:40 -04:00
Eric
60d90c6698
Merge pull request #2585 from sector-a/main
Make texts update on difficulty change in Story Menu
2024-05-29 00:54:32 -04:00
EliteMasterEric
d97d77566e Make song score lerp faster 2024-05-29 00:53:32 -04:00
Eric
eeaae74b46
Merge pull request #2603 from gamerbross/bugfix/unscripted-stage-trace
[BUGFIX] Unscripted Stage Log Trace (missing toString for Stage)
2024-05-29 00:27:36 -04:00
Cameron Taylor
9aa2411b50 Merge branch 'rewrite/master' into audio-stream 2024-05-28 23:59:36 -04:00
Cameron Taylor
1f64c7fcc9 update hmm flxpartialsound 2024-05-28 23:54:23 -04:00
Cameron Taylor
2d300039ae promises + error out partial sounds that attempt to load multiple times 2024-05-28 23:53:50 -04:00
Eric
fd9cfc2cb1
Merge pull request #2457 from gamerbross/bugfix/freeplay-no-song-data-crash
[BUGFIX] Freeplay Crash when song is invalid
2024-05-28 23:47:46 -04:00
Eric
5e1f61665a
Merge pull request #2553 from lemz1/loadingbar-fix
[BUGFIX] Fix Web Loading Bar (Again)
2024-05-28 23:37:16 -04:00
Eric
db7b97d513
Merge pull request #562 from FunkinCrew/loadingbar-fix
[PUBLIC PR] Loading Bar Fix
2024-05-28 23:37:10 -04:00
Cameron Taylor
01b6a11ddb flxpartialsound lock to current version 2024-05-28 22:57:01 -04:00
EliteMasterEric
58415d49c9 Merge remote-tracking branch 'secret/bugfix/html5-save-data' into loadingbar-fix 2024-05-28 22:52:19 -04:00
Eric
53f7cfc8c7
Merge pull request #564 from FunkinCrew/downscroll
downscroll holdnote fix
2024-05-28 22:03:15 -04:00
Eric
34ca8dcd24
Merge pull request #2488 from MaybeMaru/downscroll
Fix hold notes on downscroll
2024-05-28 22:02:46 -04:00
EliteMasterEric
f0cd6c50c8 Merge remote-tracking branch 'secret/rewrite/master' into downscroll 2024-05-28 21:57:29 -04:00
Eric
818fc9f914
Merge pull request #565 from FunkinCrew/Ethan-makes-music/main
[PUBLIC PR] Remove a lot of unused imports
2024-05-28 21:55:53 -04:00
EliteMasterEric
5cd7466a74 Merge remote-tracking branch 'secret/bugfix/html5-save-data' into develop-0.4.0 2024-05-28 18:25:00 -04:00