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 |
|
Eric
|
fb137bc722
|
Merge pull request #2624 from Ethan-makes-music/main
Remove alot of unused imoprts and comments (not even half)
|
2024-05-28 21:57:53 -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 |
|
Cameron Taylor
|
1ae30283a3
|
re add the xmlns schema stuff
|
2024-05-28 15:34:09 -04:00 |
|
gamerbross
|
cf61b9ef90
|
Add toString to Stage + Revert "Fix Unscripted Stage Log Trace"
|
2024-05-28 14:51:16 +02:00 |
|
Cameron Taylor
|
f89e33d551
|
Merge branch 'rewrite/master' into Ethan-makes-music/main
|
2024-05-28 02:41:16 -04:00 |
|
Cameron Taylor
|
9ccee66b47
|
Merge branch 'rewrite/master' into downscroll
|
2024-05-28 02:24:40 -04:00 |
|
Cameron Taylor
|
8b73d4ef22
|
Merge branch 'rewrite/master' into bugfix/titlestate-startintro-crash
|
2024-05-28 02:20:45 -04:00 |
|
Cameron Taylor
|
d4b2e94963
|
assets submod
|
2024-05-28 02:17:55 -04:00 |
|
Cameron Taylor
|
e04a181d2c
|
Merge branch 'rewrite/master' into loadingbar-fix
|
2024-05-28 02:13:37 -04:00 |
|
EliteMasterEric
|
9a47666fc7
|
Fix a merge issue.
|
2024-05-28 01:37:30 -04:00 |
|
EliteMasterEric
|
3b5e85d050
|
Merge remote-tracking branch 'secret/rewrite/master' into bugfix/html5-save-data
|
2024-05-28 01:35:43 -04:00 |
|
Axuko
|
004ed32fad
|
Remove alot of unused imoprts
|
2024-05-27 22:34:28 -07:00 |
|
EliteMasterEric
|
3f9d8ccda9
|
Merge branch 'rewrite/master' into bugfix/html5-save-data
|
2024-05-28 01:34:16 -04:00 |
|
Cameron Taylor
|
6c0d998edd
|
update funkVis in hmm
|
2024-05-28 01:18:18 -04:00 |
|
Cameron Taylor
|
64123f4496
|
Merge pull request #556 from FunkinCrew/feature/results-clear-rank
Added clear percent, rank name, and background text.
|
2024-05-28 01:13:02 -04:00 |
|
Cameron Taylor
|
827ad61602
|
Merge branch 'rewrite/master' into feature/results-clear-rank
|
2024-05-28 00:56:18 -04:00 |
|
PurSnake
|
cb2f4b0f06
|
[BUGFIX] Correct characters scaling
bruh
|
2024-05-25 21:00:10 +03:00 |
|
gamerbross
|
4acfbfb76d
|
Fix Legacy Chart Importer wrong instrumental
|
2024-05-25 01:21:37 +02:00 |
|
gamerbross
|
07959d3e88
|
Fix Unscripted Stage Log Trace
|
2024-05-25 01:08:17 +02:00 |
|
EliteMasterEric
|
dd3e241f0c
|
Fix some merge conflicts
|
2024-05-24 16:44:12 -04:00 |
|
Cameron Taylor
|
85bfd00bad
|
desktop vis testing
|
2024-05-24 16:38:35 -04:00 |
|
EliteMasterEric
|
98505e58ec
|
Take two at fixing submodules
|
2024-05-24 14:04:55 -04:00 |
|
EliteMasterEric
|
c8930b5980
|
Attempt to repair local submodules
|
2024-05-24 13:45:37 -04:00 |
|
EliteMasterEric
|
e44266f5c0
|
Merge remote-tracking branch 'secret/feature/results-clear-rank' into develop-0.4.0
|
2024-05-24 13:29:35 -04:00 |
|
EliteMasterEric
|
62e04b3372
|
Update Changelog
|
2024-05-24 13:24:11 -04:00 |
|
Burgerballs
|
eb2b143a1c
|
Merge branch 'develop' into scroll-speed-fix
|
2024-05-24 17:23:45 +01:00 |
|
Eric
|
b167e485a1
|
Merge pull request #2593 from gamerbross/feature/legacy-healthicon-winning
[FEATURE] Add Winning support to Legacy Health Icons
|
2024-05-24 01:51:10 -04:00 |
|