 EricandGitHub
|
0388f887b5
|
Merge pull request #2565 from gamerbross/bugfix/charting-sustain-trails
[BUGFIX] Charting Editor Sustain Trails (2 bugs)
|
2024-05-29 22:54:49 -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 |
|
|
lemz
|
26b357df72
|
Merge branch 'fps-setting' of https://github.com/lemz1/Funkin into fps-setting
|
2024-05-30 00:22:18 +02:00 |
|
|
lemz
|
4a531888b5
|
Update PreferencesMenu.hx
|
2024-05-30 00:22:10 +02: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 |
|
|
lemzandGitHub
|
262bcc4d8b
|
Merge branch 'develop' into fps-setting
|
2024-05-29 18:45:09 +02:00 |
|
|
EricandGitHub
|
934d6c2518
|
Merge pull request #2539 from gamerbross/bugfix/titlestate-startintro-crash
[BUGFIX] Fix TitleState bugs + crash
|
2024-05-29 01:50:46 -04:00 |
|
|
lemzandGitHub
|
088ff3744a
|
Merge branch 'develop' into fps-setting
|
2024-05-29 07:26:35 +02:00 |
|
|
EricandGitHub
|
d02ecd17e8
|
Merge pull request #2576 from richTrash21/develop-mainmenu-fix
[BUGFIX] Main Menu Camera Fix
|
2024-05-29 01:17:34 -04:00 |
|
|
EricandGitHub
|
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 |
|
|
EricandGitHub
|
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 |
|
|
lemzandGitHub
|
01b1ce679c
|
Merge branch 'develop' into fps-setting
|
2024-05-29 06:42:46 +02:00 |
|
|
EricandGitHub
|
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
|
2d300039ae
|
promises + error out partial sounds that attempt to load multiple times
|
2024-05-28 23:53:50 -04:00 |
|
|
EricandGitHub
|
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 |
|
|
EricandGitHub
|
5e1f61665a
|
Merge pull request #2553 from lemz1/loadingbar-fix
[BUGFIX] Fix Web Loading Bar (Again)
|
2024-05-28 23:37:16 -04:00 |
|
|
EricandGitHub
|
db7b97d513
|
Merge pull request #562 from FunkinCrew/loadingbar-fix
[PUBLIC PR] Loading Bar Fix
|
2024-05-28 23:37:10 -04:00 |
|
|
EliteMasterEric
|
58415d49c9
|
Merge remote-tracking branch 'secret/bugfix/html5-save-data' into loadingbar-fix
|
2024-05-28 22:52:19 -04:00 |
|
|
EricandGitHub
|
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 |
|
|
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
|
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
|
827ad61602
|
Merge branch 'rewrite/master' into feature/results-clear-rank
|
2024-05-28 00:56:18 -04:00 |
|
|
PurSnakeandGitHub
|
cb2f4b0f06
|
[BUGFIX] Correct characters scaling
bruh
|
2024-05-25 21:00:10 +03:00 |
|
|
lemz
|
267fd0eadc
|
alpha stuff and correct text positioning
|
2024-05-25 16:30:08 +02:00 |
|
|
lemz
|
814d72cb3f
|
sounds
|
2024-05-25 03:06:27 +02:00 |
|
|
lemz
|
b75f6e5853
|
Update PreferencesMenu.hx
|
2024-05-25 02:19:11 +02:00 |
|
|
gamerbross
|
4acfbfb76d
|
Fix Legacy Chart Importer wrong instrumental
|
2024-05-25 01:21:37 +02:00 |
|
|
lemz
|
dd6d12de23
|
rename vars
|
2024-05-25 01:20:10 +02:00 |
|
|
lemz
|
f86a163692
|
Merge branch 'develop' into fps-setting
|
2024-05-25 01:16:34 +02:00 |
|
|
lemz
|
e0fe7cb1eb
|
add fps option
|
2024-05-25 01:11:34 +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 |
|