Commit graph

1215 commits

Author SHA1 Message Date
Cameron Taylor
ad39ce3c21 local conductor got removed somewhere? 2024-04-03 04:43:12 -04:00
Cameron Taylor
b7c6b1aaf6 Merge pull request #458 from FunkinCrew/bugfix/a-couple-more-fixes
Bugfix/a couple more fixes
2024-04-03 03:38:37 -04:00
Cameron Taylor
668f47f761 Merge pull request #457 from FunkinCrew/html5/touch-to-start
Fix some build issues with HTML5.
2024-04-03 03:37:41 -04:00
EliteMasterEric
f7141e7096 Fixed an issue with save data not loading defaults properly. 2024-04-03 01:41:52 -04:00
EliteMasterEric
2b4bf42ac4 Fix multiple music, and crashes in freeplay 2024-04-03 01:41:47 -04:00
EliteMasterEric
f7ff381bc7 Fix some build issues with HTML5. 2024-04-02 23:33:10 -04:00
EliteMasterEric
90cf53b959 Someone forgot to merge assets from the credits branch. 2024-04-02 17:27:29 -04:00
Cameron Taylor
dcffe0537f Merge branch 'rewrite/master' into bugfix/buncha-2hot-fixes 2024-04-01 22:40:10 -04:00
Cameron Taylor
03cbba4a4e Merge branch 'rewrite/master' into feature/freeplay-ost-text 2024-04-01 22:21:29 -04:00
Cameron Taylor
d6723a8212 Merge branch 'rewrite/master' into bugfix/freeplay-menu-transition 2024-04-01 22:14:29 -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
7fb4b47e2a Merge branch 'rewrite/master' into feature/credits 2024-04-01 22:06:58 -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
ac5ca3991e Merge branch 'rewrite/master' into feature/new-audio 2024-03-30 03:32:30 -04:00
Cameron Taylor
52c5f81e26 Merge branch 'rewrite/master' into bugfix/week-6-blueball-camera 2024-03-30 03:24:46 -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
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
8020624366 Fix a crash I found. 2024-03-28 21:40:16 -04:00
EliteMasterEric
443a501e4e Merge branch 'rewrite/master' into feature/freeplay-ost-text 2024-03-28 20:33:17 -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
571c6d5960 Merge branch 'rewrite/master' into feature/credits 2024-03-28 20:29:15 -04:00
Eric
5fa559dfb1 Merge branch 'rewrite/master' into bugfix/buncha-2hot-fixes 2024-03-28 20:26:45 -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
6ab6458e2a Merge remote-tracking branch 'origin/rewrite/master' into feature/credits 2024-03-28 03:00:45 -04:00
EliteMasterEric
3d14024fd8 Implement merch link. 2024-03-28 02:58:08 -04:00
EliteMasterEric
3a86b47292 Fix issue where main menu music wouldn't play after credits. 2024-03-28 02:57:51 -04:00
EliteMasterEric
5311b043ac Rework credits data structure. 2024-03-28 02:57:22 -04:00
EliteMasterEric
b13c6563df Fix issues with Freeplay OST text and add animations. 2024-03-28 01:46:50 -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
EliteMasterEric
201e018f25 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/buncha-2hot-fixes 2024-03-28 00:03:09 -04:00
EliteMasterEric
893822532e Fix an issue causing the Kickstarter video to not play 2024-03-28 00:01:42 -04:00
EliteMasterEric
b771b46f1c Fix a build issue. 2024-03-28 00:01:18 -04:00
EliteMasterEric
f267a72783 Merge remote-tracking branch 'origin/rewrite/master' into feature/new-audio 2024-03-27 23:00:34 -04:00
Cameron Taylor
53d62c3c12 Merge branch 'rewrite/master' into bugfix/pico-fixes 2024-03-27 22:14:44 -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
195f366b65 Fix an issue where the Random button would crash Freeplay. 2024-03-27 17:43:15 -04:00
EliteMasterEric
f1811a8594 Implement Pico pause music 2024-03-27 17:42:29 -04:00
EliteMasterEric
463e946b17 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/buncha-2hot-fixes 2024-03-27 01:40:22 -04:00