cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-15 19:33:36 +00:00
Code Issues Releases Wiki Activity
3514 commits 30 branches 20 tags 6.8 GiB
Commit graph

1543 commits

Author SHA1 Message Date
Cameron Taylor 4f34079b98 Merge branch 'audio-stream' into develop-0.4.0 2024-05-29 16:45:35 -04:00
Cameron Taylor 9aa2411b50 Merge branch 'rewrite/master' into audio-stream 2024-05-28 23:59:36 -04:00
Cameron Taylor 2d300039ae promises + error out partial sounds that attempt to load multiple times 2024-05-28 23:53:50 -04:00
EliteMasterEric f0cd6c50c8 Merge remote-tracking branch 'secret/rewrite/master' into downscroll 2024-05-28 21:57:29 -04:00
Cameron Taylor f89e33d551 Merge branch 'rewrite/master' into Ethan-makes-music/main 2024-05-28 02:41:16 -04:00
Cameron Taylor 9ccee66b47 Merge branch 'rewrite/master' into downscroll 2024-05-28 02:24:40 -04:00
Axuko 004ed32fad Remove alot of unused imoprts 2024-05-27 22:34:28 -07:00
Cameron Taylor 827ad61602 Merge branch 'rewrite/master' into feature/results-clear-rank 2024-05-28 00:56:18 -04:00
EliteMasterEric dd3e241f0c Fix some merge conflicts 2024-05-24 16:44:12 -04:00
EliteMasterEric e44266f5c0 Merge remote-tracking branch 'secret/feature/results-clear-rank' into develop-0.4.0 2024-05-24 13:29:35 -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
Cameron Taylor a2ee359e46 fix for songs overlapping each other on desktop 2024-05-23 16:31:18 -04:00
EliteMasterEric 0514e05328 Merge branch 'bugfix/html5-save-data' into develop-0.4.0 2024-05-22 15:15:56 -04:00
EliteMasterEric 55d66b858b Merge branch 'feature/save-favorites' into develop-0.4.0 2024-05-22 15:15:47 -04:00
EliteMasterEric 30fd86befb Merge branch 'feature/charter-in-pause-menu' into develop-0.4.0 2024-05-22 12:01:27 -04:00
EliteMasterEric 42ab0b74e3 Merge branch 'feature/results-clear-rank' into develop 2024-05-22 11:40:00 -04:00
EliteMasterEric f17f639304 Finish implementing smaller numbers. 2024-05-22 01:07:20 -04:00
EliteMasterEric 6d3b58cecd Fix some additional compiling issues. 2024-05-21 04:02:53 -04:00
EliteMasterEric fed6d1146c Do some cleanup (replace several utility functions with a utility library we already depend on!) 2024-05-21 04:02:32 -04:00
EliteMasterEric 6cb5816378 Add freeplay favorites to the save data so they persist between sessions. 2024-05-21 02:49:07 -04:00
EliteMasterEric f3868c2ee8 An attempt at an HTML5 save data fix 2024-05-21 02:23:21 -04:00
EliteMasterEric 13595fca70 Changelog entry for chart metadata 2024-05-19 01:49:06 -04:00
EliteMasterEric 228ac66cc2 Credit the song's charter in the pause menu. 2024-05-19 01:48:51 -04:00
EliteMasterEric faf7a0643c Tinkered with ghost tapping some, leaving it off for now tho. 2024-05-19 01:47:36 -04: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
MaybeMaru c5caa0331e Update Strumline.hx 2024-05-13 22:17:47 +02:00
richTrash21 7df41ebc56 minor optimization 2024-05-13 21:35:26 +04:00
MaybeMaru c270f61cac Update Strumline.hx 2024-05-13 02:21:43 +02:00
MaybeMaru b22dd4d7d4 Update Strumline.hx 2024-05-13 02:18:57 +02: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