1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-26 15:07:14 +00:00
Commit graph

2370 commits

Author SHA1 Message Date
Cameron Taylor e04a181d2c Merge branch 'rewrite/master' into loadingbar-fix 2024-05-28 02:13:37 -04:00
Cameron Taylor 827ad61602 Merge branch 'rewrite/master' into feature/results-clear-rank 2024-05-28 00:56:18 -04:00
EliteMasterEric 44880fa569 Implement placeholder GREAT animation 2024-05-24 00:06:26 -04:00
Cameron Taylor b8ed779660 Merge branch 'rewrite/master' into feature/save-favorites 2024-05-23 17:14:07 -04:00
Cameron Taylor c02d75b94a Merge branch 'public-release/develop' into rewrite/master 2024-05-23 16:38:34 -04:00
EliteMasterEric f17f639304 Finish implementing smaller numbers. 2024-05-22 01:07:20 -04:00
EliteMasterEric 6cb5816378 Add freeplay favorites to the save data so they persist between sessions. 2024-05-21 02:49:07 -04:00
lemz e0867643d0 fix the setgraphicsize stuff 2024-05-19 01:39:30 +02:00
Eric 6744c1d261
Merge pull request #2518 from gamerbross/bugfix/gameover-charting-crash
[BUGFIX] ChartingState GameOver Crashes
2024-05-18 14:17:29 -04:00
Eric 8432f0668a
Merge pull request #2540 from gamerbross/bugfix/attract-toycommercial-allow-volume
[BUGFIX] Allow Volume Keys while watching Toy Commercial (AttractState)
2024-05-18 14:13:28 -04:00
SanicBTW 6b42da0902
Keep the consistency in Conductor 2024-05-18 09:04:27 +02:00
EliteMasterEric b6b93bb0c6 Added clear percent, rank name, and background text. 2024-05-17 20:26:34 -04:00
gamerbross 85b9de1de9 Allow Volume Keys while watching Toy Commercial (AttractState) 2024-05-17 23:53:43 +02:00
gamerbross f1a0692c51 Fix ChartingState GameOver Crashes 2024-05-15 22:50:34 +02:00
rich a8279cdd76
Merge branch 'FunkinCrew:main' into develop-char-opt 2024-05-15 16:32:22 +04:00
Cameron Taylor bd7b1fb544 Merge branch 'public-release/main' into develop-0.3.3 2024-05-14 22:15:29 -04:00
Cameron Taylor 84a4a23d3c Merge branch 'polish/game-over-transition' into public-release/develop 2024-05-14 21:32:05 -04:00
Cameron Taylor 2434f64381 web fix for scroll 2024-05-14 21:21:47 -04:00
Cameron Taylor 1619751eab Merge branch 'public-release/develop' into freeplayscrollwheel-bugfix 2024-05-14 21:13:48 -04:00
Cameron Taylor 0428482d04 Merge branch 'bugfix/freeplay-exiting-active' into public-release/develop 2024-05-13 21:30:02 -04:00
Cameron Taylor e26d4ac440
Merge pull request #554 from FunkinCrew/bugfix/public-fixes
Eric's public bug fixes
2024-05-13 21:20:47 -04:00
Cameron Taylor 259df760bc re-add lerp to load screen 2024-05-13 21:06:41 -04:00
lemz 54f337fe9c Merge remote-tracking branch 'origin/develop' into loadingbar-fix 2024-05-14 00:17:25 +02:00
lemz 4e935b47c6 Update LoadingState.hx 2024-05-14 00:04:45 +02:00
richTrash21 7df41ebc56 minor optimization 2024-05-13 21:35:26 +04:00
gamerbross 090e4fc6e8 Fixed doing actions when exiting Freeplay menu 2024-05-12 02:42:02 +02:00
JugieNoob b22f09d4da Fixed Scrolling on HTML5 Platforms 2024-05-12 02:21:59 +02:00
JugieNoob 4f8a0dbebf Fixed Freeplay Scrolling Issue 2024-05-12 01:35:04 +02:00
EliteMasterEric 6c2d18c72c Resurrected difficulty stars, fixed flame animation, fixed Random showing an album. 2024-05-11 01:05:51 -04:00
EliteMasterEric 83c3ff478c Added Clear % tally to results. 2024-05-10 22:09:09 -04:00
EliteMasterEric 5d5cf74020 Reimplement rank-based results animations. 2024-05-09 22:37:21 -04:00
EliteMasterEric a243b167b2 Fix up more credits 2024-05-09 22:37:01 -04:00
EliteMasterEric 99bd3a370f Merge remote-tracking branch 'public/bugfix/duplicate-controls-binds' into bugfix/public-fixes 2024-05-09 16:41:42 -04:00
EliteMasterEric c2650c0810 Merge remote-tracking branch 'public/bugfix/freeplay-lerp' into bugfix/public-fixes 2024-05-09 16:40:18 -04:00
EliteMasterEric 3207fd82f3 Merge remote-tracking branch 'public/bugfix/easter-egg-crash' into bugfix/public-fixes 2024-05-09 16:40:11 -04:00
EliteMasterEric 0b82a206ef Merge remote-tracking branch 'public/bugfix/crash-handler-flxstate-check' into bugfix/public-fixes 2024-05-09 16:39:53 -04:00
codist bfaa4626f8 Polish for the transition from GameOverSubState back into PlayState. 2024-05-09 01:10:53 -04:00
EliteMasterEric 4d5c0444c8 Fix an issue where control binds would be duplicated and quickly multiply. 2024-05-09 00:46:21 -04:00
Cameron Taylor 77446f28d7
Merge pull request #549 from FunkinCrew/sanitized/bugfix/easter-egg
Fix an error related to an easter egg, plus some script warnings.
2024-05-08 23:30:50 -04:00
Cameron Taylor 9730ef4280
Merge pull request #550 from FunkinCrew/sanitized/bugfix/shader-crash-freeplay
Fix a shader crash on Freeplay on some AMD cards.
2024-05-08 23:21:52 -04:00
Eric 34a6e16385
Merge pull request #2323 from nebulazorua/main
Chart debug key takes you back to chart editor if you're charting
2024-05-08 23:14:59 -04:00
Eric e3ee68abf2
Merge pull request #2370 from MadBear422/main
Character selection fix for chart editor
2024-05-08 23:08:48 -04:00
codist df5bdc7b7d Fixed stutter once a transition to the main menu completes. 2024-05-08 22:42:33 -04:00
MadBear422 4d1c2c1b88 Character selection fix for chart editor. 2024-05-08 15:30:40 -07:00
nebulazorua f5143c2d78 this is better 2024-05-08 19:56:13 +08:00
nebulazorua 6fdc090ecc i have accidentally done this and wiped out my chart many times 2024-05-08 19:53:47 +08:00
codist b49fac742f Fixed stutter once a transition to the main menu completes. 2024-05-08 04:21:30 -04:00
EliteMasterEric 4e5531744a Curse you burgerballs 2024-05-08 03:23:00 -04:00
Eric 6742e5c833
Merge pull request #2308 from Burgerballs/patch-1
Fix some spaghetti on PlayAnimationSongEvent
2024-05-08 02:32:26 -04:00
EliteMasterEric 2e74678caf Fix an issue where the Freeplay menu never displays 100% clear. 2024-05-08 01:54:48 -04:00