1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-09-11 20:57:20 +00:00
Commit graph

2996 commits

Author SHA1 Message Date
Cameron Taylor 5e7d21d43a Merge pull request #473 from FunkinCrew/bugfix/additional-fixins
Bugfix/additional fixins
2024-04-09 23:50:23 -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 45c7a04d5c Merge pull request #469 from FunkinCrew/html5/asset-optimization
[HTML5] Removed many unused assets to optimize bandwidth usage.
2024-04-09 20:26:57 -04:00
Cameron Taylor 0f9ecda2a1 Merge branch 'rewrite/master' into html5/asset-optimization 2024-04-09 20:25:37 -04:00
Cameron Taylor 1058181cc9 assets submod 2024-04-09 20:25:33 -04:00
Cameron Taylor 56623166b3 Merge pull request #472 from FunkinCrew/bugfix/linux-openal-crash
Fix segmentation fault on Linux by rebuilding Lime.
2024-04-09 20:15:39 -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
Cameron Taylor 2d98351a5c Merge pull request #480 from FunkinCrew/bugfix/week-3-stuff
Main menu fix and Week 3 train fix
2024-04-09 20:14:22 -04:00
Cameron Taylor eb752c242f assets submod 2024-04-09 20:13:59 -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 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
EliteMasterEric 958ebe92a3 Fix tankman's offsets to not suck. 2024-04-06 01:59:39 -04:00
EliteMasterEric 9a7a385af1 Fix segmentation fault on Linux by rebuilding Lime. 2024-04-06 01:11:27 -04:00
EliteMasterEric 2462bd2d99 Update assets submodule 2024-04-05 22:05:34 -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 af8a37d299 assets submod 2024-04-05 19:33:24 -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 a8b266f772 Merge pull request #471 from FunkinCrew/bugfix/pico-knife-sound
Fix various audio issues in Weekend 1
2024-04-05 16:43:16 -04:00
Cameron Taylor d9b5e2c80f Merge branch 'rewrite/master' into bugfix/pico-knife-sound 2024-04-05 16:42:45 -04:00
Cameron Taylor ab2c4bf20b assets submod 2024-04-05 16:42:14 -04:00
Cameron Taylor 3464ce336f Merge pull request #468 from FunkinCrew/feature/new-album-art-3
Add new album roll animation (again)
2024-04-05 16:41:30 -04:00
Cameron Taylor fe52fdfbad assets submod 2024-04-05 16:40:37 -04:00
EliteMasterEric ab18c64821 Fix various audio fixes 2024-04-05 03:33:15 -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
Eric 7124249a3f Merge pull request #437 from FunkinCrew/bugfix/quick-camera-fixes
Camera system internal and UI fixes
2024-04-05 02:46:33 -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
Eric 93e5e59d57 Merge pull request #433 from FunkinCrew/hl-compiles
shader var renames for hashlink
2024-04-04 18:23:44 -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 926a8fb71d Merge pull request #459 from FunkinCrew/feature/results-screen-score
Feature/results screen score
2024-04-04 05:38:58 -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 894ca98755 assets submod 2024-04-04 05:33:58 -04:00
Cameron Taylor 5c1b6d9848 Merge pull request #462 from FunkinCrew/bugfix/chart-editor-weekend-1
Bugfix/chart editor weekend 1
2024-04-04 05:32:50 -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 cdf15b3431 assets submod 2024-04-04 05:32:21 -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
Cameron Taylor 57a5973c2c small fade polish for week 8 convos 2024-04-04 05:22:44 -04:00