cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-27 07:27:12 +00:00
Code Issues Releases Wiki Activity
3023 commits 31 branches 21 tags 3 GiB
Commit graph

1288 commits

Author SHA1 Message Date
Cameron Taylor 658fd392fa Merge branch 'rewrite/master' into a-bot-bars 2024-04-14 02:57:05 -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 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
Cameron Taylor 57a5973c2c small fade polish for week 8 convos 2024-04-04 05:22:44 -04:00
Cameron Taylor 39d92eb09d fast loading on preloader 2024-04-04 04:55:27 -04:00
Cameron Taylor eed8299cfd Merge branch 'rewrite/master' into bugfix/hide-freeplay-menu-rating 2024-04-04 04:47:45 -04:00
Cameron Taylor 99cdb62175 updated color 2024-04-04 04:46:38 -04:00
EliteMasterEric 33685b2bcd Fix an issue where player could not switch difficulties from Pause menu until they beat Weekend 1. 2024-04-04 04:08:07 -04:00
Cameron Taylor c23f97917c Merge branch 'rewrite/master' into preloader-polish 2024-04-04 03:43:23 -04:00
EliteMasterEric 3ac466aa5e Add missing MapTools function from #459 2024-04-04 03:35:36 -04:00
EliteMasterEric 8826d0741b Hide miss popups when hitting ~160ms 2024-04-04 03:31:44 -04:00
EliteMasterEric 57d6ed118d Hide Rating on the right side of the items in Freeplay 2024-04-04 03:31:03 -04:00
EliteMasterEric f129cb7997 Fix a bug where if Weekend 1 wasn't cleared, you can't chart those songs 2024-04-03 21:57:29 -04:00
EliteMasterEric d8903f138f Additional save fix 2024-04-03 20:50:51 -04:00
EliteMasterEric 58427363d1 Prevent a crash trying to open a non-existant debugger checkbox. 2024-04-03 20:33:51 -04:00
EliteMasterEric b39712d33f Prevent crashes when the game attempts to load bad save data. 2024-04-03 20:31:34 -04:00
EliteMasterEric 4f2f28cb31 Fix issue with deepMerge() caused by handling maps incorrectly, causing an unhandleable crash. 2024-04-03 15:05:54 -04:00
EliteMasterEric d911c46d2f Better scoring numbers and improved anims. 2024-04-03 06:24:20 -04:00
EliteMasterEric 1759f5c388 Note cover now only plays splash on player 2024-04-03 04:52:28 -04:00
EliteMasterEric e9d8546737 More results screen changes 2024-04-03 04:52:12 -04:00
Cameron Taylor ad39ce3c21 local conductor got removed somewhere? 2024-04-03 04:43:12 -04:00
Cameron Taylor 99e19f8460 Merge branch 'rewrite/master' into hl-compiles 2024-04-03 03:40:22 -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