Commit graph

2839 commits

Author SHA1 Message Date
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
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
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
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
837fcee983 Fix a bug where 000 would display any time a Bad or Shit is hit (instead of just when a combo break is hit) 2024-03-28 00:19:57 -04:00
EliteMasterEric
c1c2621e1d Fix bug where Bad and Shit didn't count at Notes Hit in the results screen. 2024-03-28 00:18:39 -04:00
Cameron Taylor
2c7fb62f72 Merge pull request #424 from FunkinCrew/bugfix/pico-fixes
Fix some issues with Week 3
2024-03-27 22:15:27 -04:00
Cameron Taylor
53d62c3c12 Merge branch 'rewrite/master' into bugfix/pico-fixes 2024-03-27 22:14:44 -04:00
Cameron Taylor
17df6a515f assets submod 2024-03-27 22:11:31 -04:00
Cameron Taylor
96fe131544 Merge pull request #430 from FunkinCrew/feature/miss-judgement-debug
Add debug logging to Flixel debugger for miss judgements
2024-03-27 21:56:18 -04:00
Cameron Taylor
0f80f1c8a6 Merge pull request #417 from FunkinCrew/bugfix/freeplay-afk-fixes
Bugfix/freeplay afk fixes
2024-03-27 21:08:08 -04:00
Cameron Taylor
3181795985 remove trace() calls from ages ago while im here 2024-03-27 20:58:58 -04:00
EliteMasterEric
843095e3de Add debug logging to Flixel debugger for miss judgements 2024-03-27 01:25:38 -04:00
Cameron Taylor
31827f30b1 Merge pull request #425 from FunkinCrew/feature/more-new-charts
Update several charts (Lit Up, 2hot, High Erect, South Erect)
2024-03-27 01:10:17 -04:00
Cameron Taylor
cccfdd0638 Merge branch 'rewrite/master' into feature/more-new-charts 2024-03-27 01:09:45 -04:00
Cameron Taylor
75b8336dce assets submod 2024-03-27 01:09:24 -04:00
Cameron Taylor
14c10448d2 Merge pull request #427 from FunkinCrew/bugfix/song-delay+volume-fixes
fixed song delay and made volume consistent across all tracks
2024-03-27 01:08:33 -04:00
Cameron Taylor
ce53e46510 Merge branch 'rewrite/master' into bugfix/song-delay+volume-fixes 2024-03-27 01:08:04 -04:00
Cameron Taylor
b3076c7ec4 assets submod 2024-03-27 01:07:37 -04:00
Cameron Taylor
030be3a24b Merge pull request #429 from FunkinCrew/bugfix/story-mode-scroll-sound
Readd scroll sounds to Story Menu
2024-03-27 01:06:35 -04:00
Cameron Taylor
982616e2ba assets submod 2024-03-27 01:05:53 -04:00
EliteMasterEric
4209c5156e Readd a missing sound in the story menu 2024-03-27 01:02:11 -04:00
FabsTheFabs
5ec3546bbc fixed song delay and made volume consistent across all tracks 2024-03-27 04:31:03 +00:00
EliteMasterEric
6b35898ed9 Fix some issues with Weekend 1. 2024-03-26 23:24:59 -04:00
EliteMasterEric
d373e1bfed Implement a bunch of updated charts. 2024-03-26 21:30:25 -04:00
EliteMasterEric
0e93f2ab27 Improve error logging when the game can't find a chart file. 2024-03-26 21:30:08 -04:00
EliteMasterEric
291a9f630d Update assets submodule 2024-03-26 19:39:02 -04:00
EliteMasterEric
9ebb253b53 Fix music updating issue. 2024-03-26 19:38:56 -04:00
EliteMasterEric
e84fdf9fac Resolve FlxG.sound.music crash 2024-03-26 19:38:42 -04:00
Eric
88c973f1ae Merge branch 'rewrite/master' into bugfix/freeplay-afk-fixes 2024-03-26 19:35:10 -04:00
Cameron Taylor
99ea7bbe84 Merge pull request #422 from FunkinCrew/bugfix/blazin-crashes
Fix crashes tied to Blazin' character animations not parsing
2024-03-26 01:31:19 -04:00
Cameron Taylor
524ae119fa Merge branch 'rewrite/master' into bugfix/blazin-crashes 2024-03-26 01:30:59 -04:00
Cameron Taylor
6d4c2e804f assets submod 2024-03-26 01:30:48 -04:00