Commit graph

1296 commits

Author SHA1 Message Date
FabsTheFabs
351cb8cbaa popupstuff changes + make combopopup able to be edited outside of playstate 2024-04-19 14:14:33 -04:00
Cameron Taylor
5d8c28ca2b Merge branch 'rewrite/master' into bugfix/blazin-death-confirm 2024-04-19 14:05:52 -04:00
Cameron Taylor
035db7f00a Merge branch 'rewrite/master' into bugfix/draw-crash 2024-04-19 14:03:58 -04:00
Cameron Taylor
22e411d43f Merge branch 'rewrite/master' into feature/chart-editor-gamepad-support 2024-04-19 13:57:42 -04:00
Cameron Taylor
93ae7692c8 Merge branch 'rewrite/master' into bugfix/weekend-1-bug-fixes 2024-04-19 13:55:01 -04:00
Cameron Taylor
bb7b863272 Fix an issue where changing focus would pause some sounds but not others (#491)
Repro: Start a song then switch to another window. Instrumental and opponent pause but player doesn't.
2024-04-17 20:08:26 -04:00
Cameron Taylor
fd2356aed4 Fix a crash in the Results state. also nudge GF over to the spot shes in in the FLA (#490) 2024-04-17 20:07:47 -04:00
EliteMasterEric
b982484856 Properly fix the menu background to use the correct line colors. 2024-04-16 20:19:20 -04:00
EliteMasterEric
80a558ac08 Fix an issue where changing focus would pause some sounds but not others. 2024-04-16 19:57:19 -04:00
EliteMasterEric
d346c9387c Fix a crash in the Results state. also nudge GF over to the spot she's in in the FLA 2024-04-16 19:42:52 -04:00
EliteMasterEric
bc0a27c985 Fix references to missing graphics in Freeplay 2024-04-16 18:43:11 -04:00
Cameron Taylor
2d5153cdbf Merge branch 'rewrite/master' into bugfix/remove-kickstarter-backers 2024-04-16 13:33:02 -04:00
Cameron Taylor
fab6412bc6 Merge pull request #486 from FunkinCrew/bugfix/main-menu-color
Fix the saturation on the main menu background.
2024-04-16 13:25:46 -04:00
Cameron Taylor
e6dc795d2a Merge branch 'rewrite/master' into bugfix/lingering-hold-cover 2024-04-16 13:25:00 -04:00
Eric
b553dbd517 Remove janky animation on Freeplay menu. (#488) 2024-04-16 13:24:41 -04:00
EliteMasterEric
43ec72fb9d Ensure playNoteHoldCover doesn't call if note is judged as 'miss' 2024-04-15 20:36:38 -04:00
EliteMasterEric
4d1f60434a Fix the saturation on the main menu background. 2024-04-15 19:21:55 -04:00
EliteMasterEric
5e7b417d6f Remove Kickstarter link from credits. 2024-04-12 14:44:01 -04:00
EliteMasterEric
6f5c3a043f Fix crash caused when game tries to render disposed sprites during a Sticker transition. 2024-04-10 14:45:07 -04:00
Cameron Taylor
5f48ca82bd Merge branch 'rewrite/master' into bugfix/additional-fixins 2024-04-09 23:50:05 -04:00
Cameron Taylor
54496c400b Merge pull request #479 from FunkinCrew/bugfix/no-save-data
Fix bad initial save data when no save data present
2024-04-09 23:34:28 -04:00
Cameron Taylor
0f9ecda2a1 Merge branch 'rewrite/master' into html5/asset-optimization 2024-04-09 20:25:37 -04:00
Cameron Taylor
f00c6085e4 Merge pull request #477 from FunkinCrew/bugfix/song-compile-define
Fix loading issue tied to -DSONG compile define.
2024-04-09 20:15:24 -04:00
EliteMasterEric
dbcbb73338 Main menu fix and Week 3 train fix 2024-04-09 15:10:58 -04:00
Mike Welsh
97884021c0 Fix bad initial save data when no save data present
If no save data was present, the game would check for legacy save
data in the ninjamuffin99 path to migrate over. This code was
incorrectly checking `FlxSave.data == null` to determine if
legacy data was present.

This caused an empty legacy save being migrated over, resulting
in a `volume` of 0 for any new player of the game.
2024-04-08 22:08:24 -07:00
EliteMasterEric
6d374c7af9 Fix loading issue tied to -DSONG compile define. 2024-04-08 18:39:51 -04:00
EliteMasterEric
b464f51ba2 Fix an issue where a missing stage would cause a crash (rather than an error popup) 2024-04-06 22:38:32 -04:00
EliteMasterEric
ea1d123c49 Fixes to Pico Blazin' animations. 2024-04-06 21:42:31 -04:00
EliteMasterEric
5beb20ec7c Fix bug where restarting the song would sometimes crash. 2024-04-06 21:42:18 -04:00
EliteMasterEric
14869b9373 Also disable highscores in botplay 2024-04-06 02:08:10 -04:00
EliteMasterEric
99ee2b07ca Make results screen use full campaign score in Story Mode 2024-04-06 02:06:06 -04:00
EliteMasterEric
29f105a44d Practice mode = no highscore! 2024-04-06 01:59:46 -04:00
Cameron Taylor
3b87ecf6f5 Merge branch 'html5/asset-optimization' of github.com:FunkinCrew/Funkin-secret into html5/asset-optimization 2024-04-05 19:59:25 -04:00
Cameron Taylor
da4f1fb424 remove difficulty stars 2024-04-05 19:47:33 -04:00
EliteMasterEric
a6d44b1f15 Removed many unused assets to optimize bandwidth usage. 2024-04-05 19:43:52 -04:00
Cameron Taylor
90f53a78c1 Merge pull request #470 from FunkinCrew/bugfix/results-gf-cam-zoom
Readd GF camera zoom into results state.
2024-04-05 16:43:47 -04:00
Cameron Taylor
fe52fdfbad assets submod 2024-04-05 16:40:37 -04:00
EliteMasterEric
95434018f7 Readd GF camera zoom into results state. 2024-04-05 02:56:47 -04:00
Eric
fd88ebef63 Merge pull request #467 from FunkinCrew/retro-fade
small fade polish for week 8 convos
2024-04-05 02:47:10 -04:00
EliteMasterEric
9c8ab72494 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/quick-camera-fixes 2024-04-05 02:45:23 -04:00
EliteMasterEric
08e8530ad4 Fix SetCameraBopSongEvent to be additive 2024-04-05 02:44:44 -04:00
EliteMasterEric
a764112bd4 Removed many unused assets to optimize bandwidth usage. 2024-04-05 01:24:03 -04:00
EliteMasterEric
e35eb63d53 Merge branch 'rewrite/master' into hl-compiles 2024-04-04 18:16:07 -04:00
EliteMasterEric
823baa3326 Add new album roll animation (again) 2024-04-04 16:30:04 -04:00
Cameron Taylor
acb58a6b49 remove sitelock 2024-04-04 05:41:44 -04:00
Cameron Taylor
64cab4d137 removed duplicate merge 2024-04-04 05:37:48 -04:00
Cameron Taylor
8f3406cb0e Merge branch 'rewrite/master' into feature/results-screen-score 2024-04-04 05:34:29 -04:00
Cameron Taylor
544dcdf809 Merge branch 'rewrite/master' into bugfix/chart-editor-weekend-1 2024-04-04 05:32:26 -04:00
Cameron Taylor
ec47ee4285 Merge pull request #461 from FunkinCrew/bugfix/debuggercheckbox-crash
Prevent a crash trying to open a non-existant debugger checkbox.
2024-04-04 05:30:41 -04:00
Cameron Taylor
3cb1f65e1d Merge pull request #465 from FunkinCrew/bugfix/miss-judgement
Hide miss popups when hitting ~160ms
2024-04-04 05:30:23 -04:00