Cameron Taylor
d6723a8212
Merge branch 'rewrite/master' into bugfix/freeplay-menu-transition
2024-04-01 22:14:29 -04:00
Cameron Taylor
02b8aa0f12
assets submod
2024-04-01 22:13:38 -04:00
Cameron Taylor
8a60115df6
Merge pull request #454 from FunkinCrew/feature/erect-filter-freeplay
...
Freeplay menu now filters to supported songs when you change difficulty
2024-04-01 22:08:25 -04:00
Cameron Taylor
165e20c318
Merge pull request #453 from FunkinCrew/bugfix/judgements-below-notes
...
Bugfix/judgements below notes
2024-04-01 22:08:00 -04:00
Cameron Taylor
db89e199c4
Merge pull request #455 from FunkinCrew/bugfix/results-screen-cleanup
...
Bunch of results screen fixes
2024-04-01 22:07:43 -04:00
Cameron Taylor
fbb157b579
Merge pull request #423 from FunkinCrew/feature/credits
...
First implementation of credits state.
2024-04-01 22:07:18 -04:00
Cameron Taylor
7fb4b47e2a
Merge branch 'rewrite/master' into feature/credits
2024-04-01 22:06:58 -04:00
Cameron Taylor
626cc5cc78
assets submod
2024-04-01 22:06:44 -04:00
EliteMasterEric
67e096e443
Bunch of results screen fixes
2024-04-01 21:59:53 -04:00
Cameron Taylor
bf9f87e9e7
Merge pull request #441 from FunkinCrew/bugfix/spookeez-hold-note
...
Bugfix/spookeez hold note
2024-04-01 21:00:14 -04:00
EliteMasterEric
927b2a7cfc
Put judgements below the notes, and remove COMBO word.
2024-04-01 20:21:27 -04:00
EliteMasterEric
1df4a354cb
Freeplay menu now filters to supported songs when you change difficulty
2024-04-01 18:34:26 -04:00
Cameron Taylor
583ecf97b0
Merge pull request #432 from FunkinCrew/feature/new-audio
...
Audio improvements and a Freeplay crash fix
2024-03-30 03:32:52 -04:00
Cameron Taylor
ac5ca3991e
Merge branch 'rewrite/master' into feature/new-audio
2024-03-30 03:32:30 -04:00
Cameron Taylor
fe498b38e5
assets submod
2024-03-30 03:32:17 -04:00
Cameron Taylor
e03998fd86
Merge pull request #439 from FunkinCrew/bugfix/week-6-blueball-camera
...
Fix camera in game over screen on Week 6
2024-03-30 03:25:08 -04:00
Cameron Taylor
52c5f81e26
Merge branch 'rewrite/master' into bugfix/week-6-blueball-camera
2024-03-30 03:24:46 -04:00
Cameron Taylor
3637e3594b
assets submod
2024-03-30 03:24:30 -04:00
Cameron Taylor
065ef8895b
Merge pull request #448 from FunkinCrew/bugfix/spooky-lightning-crash
...
Fix polymod error on Spookeez
2024-03-30 03:07:03 -04:00
Cameron Taylor
846df8de6f
assets submod
2024-03-30 03:06:39 -04:00
EliteMasterEric
5be47e6619
Fix limo ride too
2024-03-29 10:34:59 -04:00
EliteMasterEric
f50c1ce86f
Update assets submodule
2024-03-29 10:17:16 -04:00
Cameron Taylor
1803742af8
Merge pull request #447 from FunkinCrew/cancel-merge-2
...
lol ref
2024-03-29 02:14:46 -04:00
Cameron Taylor
2d2aa271dd
Merge pull request #446 from FunkinCrew/cancel-merge-2
...
better branch
2024-03-29 02:14:39 -04:00
Cameron Taylor
826b6737e5
Merge pull request #445 from FunkinCrew/cancel-merge-2
...
sender branch name
2024-03-29 02:14:31 -04:00
Cameron Taylor
10db02a19b
Merge pull request #444 from FunkinCrew/cancel-merged-actions
...
remove push lol
2024-03-29 02:14:11 -04:00
Cameron Taylor
d7a4fa7601
Merge pull request #443 from FunkinCrew/cancel-merged-actions
...
Cancel runs of merged and "outdated" branches
2024-03-29 02:13:50 -04:00
Cameron Taylor
e949900bec
Merge pull request #434 from FunkinCrew/bugfix/combo-fixes
...
Bugfix/combo fixes
cancel builds if there's a new one queued
get list of current runs on current-branch
push test
comment out if merge
wrap in string
actions permissions
log
more log
cancel runs test
write permission
uncomment pr merge check
remove push lol
sender branch name
better branch
lol ref
2024-03-29 02:13:46 -04:00
Cameron Taylor
f6857d3aa1
Merge pull request #434 from FunkinCrew/bugfix/combo-fixes
...
Bugfix/combo fixes
cancel builds if there's a new one queued
get list of current runs on current-branch
push test
comment out if merge
wrap in string
actions permissions
log
more log
cancel runs test
write permission
uncomment pr merge check
remove push lol
sender branch name
better branch
2024-03-29 02:13:43 -04:00
Cameron Taylor
1a1f40e31b
Merge pull request #434 from FunkinCrew/bugfix/combo-fixes
...
Bugfix/combo fixes
cancel builds if there's a new one queued
get list of current runs on current-branch
push test
comment out if merge
wrap in string
actions permissions
log
more log
cancel runs test
write permission
uncomment pr merge check
remove push lol
sender branch name
2024-03-29 02:13:40 -04:00
Cameron Taylor
be69a10b86
Merge pull request #434 from FunkinCrew/bugfix/combo-fixes
...
Bugfix/combo fixes
cancel builds if there's a new one queued
get list of current runs on current-branch
push test
comment out if merge
wrap in string
actions permissions
log
more log
cancel runs test
write permission
uncomment pr merge check
remove push lol
2024-03-29 02:13:34 -04:00
Cameron Taylor
93a270fba5
Merge pull request #434 from FunkinCrew/bugfix/combo-fixes
...
Bugfix/combo fixes
cancel builds if there's a new one queued
get list of current runs on current-branch
push test
comment out if merge
wrap in string
actions permissions
log
more log
cancel runs test
write permission
uncomment pr merge check
2024-03-29 02:13:06 -04:00
EliteMasterEric
28462681b2
Fix bug where 100ms sustains wouldn't update their rendering.
2024-03-29 00:52:20 -04:00
EliteMasterEric
7c04630bb7
Fix a bug where duplicate notes would get placed at the beginning
2024-03-29 00:49:02 -04:00
Cameron Taylor
5ee550afb1
Merge pull request #434 from FunkinCrew/bugfix/combo-fixes
...
Bugfix/combo fixes
2024-03-29 00:46:38 -04:00
Cameron Taylor
0ce8ac3265
Merge pull request #438 from FunkinCrew/feature/weekend-1-graphic
...
Update Story Menu Weekend 1 graphic
2024-03-29 00:44:46 -04:00
EliteMasterEric
ddb41c9ef7
Increase AFK timer, and add SFX over it
2024-03-28 23:13:47 -04:00
EliteMasterEric
342782c3d3
Fix issue with pink screen when moving from PlayState->Freeplay->Main Menu
2024-03-28 22:33:50 -04:00
EliteMasterEric
aa7ff6fbc4
Update assets submodule
2024-03-28 21:40:47 -04:00
EliteMasterEric
8020624366
Fix a crash I found.
2024-03-28 21:40:16 -04:00
EliteMasterEric
1c9b087f2f
Update assets submodule
2024-03-28 21:20:08 -04:00
Eric
0eddea9bf8
Merge branch 'rewrite/master' into bugfix/combo-fixes
2024-03-28 20:32:34 -04:00
Eric
7e96b02248
Merge branch 'rewrite/master' into feature/new-audio
2024-03-28 20:31:10 -04:00
EliteMasterEric
c7d67b46e0
Update art submodule
2024-03-28 20:29:32 -04:00
EliteMasterEric
571c6d5960
Merge branch 'rewrite/master' into feature/credits
2024-03-28 20:29:15 -04:00
Cameron Taylor
86c91d1e82
Merge pull request #436 from FunkinCrew/feature/touch-here-to-play
...
New Funkin' Preloader, and Touch Here To Play
2024-03-28 07:15:53 -04:00
EliteMasterEric
8a9eee3aa3
Rework Funkin Preloader and added "Touch to Play" graphic
2024-03-28 04:34:43 -04:00
EliteMasterEric
4cd2a622a9
Update ART submodule!
2024-03-28 04:34:20 -04:00
EliteMasterEric
6ab6458e2a
Merge remote-tracking branch 'origin/rewrite/master' into feature/credits
2024-03-28 03:00:45 -04:00
EliteMasterEric
e5eca37dc0
Update assets submodule.
2024-03-28 02:58:46 -04:00
