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

3591 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cameron Taylor 5adeada357 Merge branch 'gamerbross/scripted-stage-tostring' into develop-0.4.0 2024-05-29 16:49:12 -04:00
Cameron Taylor e449dfa0ef Merge branch 'bugfix/titlestate-startintro-crash' into develop-0.4.0 2024-05-29 16:48:10 -04:00
Cameron Taylor 4f34079b98 Merge branch 'audio-stream' into develop-0.4.0 2024-05-29 16:45:35 -04:00
EliteMasterEric d97d77566e Make song score lerp faster 2024-05-29 00:53:32 -04:00
Cameron Taylor 9aa2411b50 Merge branch 'rewrite/master' into audio-stream 2024-05-28 23:59:36 -04:00
Cameron Taylor 1f64c7fcc9 update hmm flxpartialsound 2024-05-28 23:54:23 -04:00
Cameron Taylor 2d300039ae promises + error out partial sounds that attempt to load multiple times 2024-05-28 23:53:50 -04:00
Eric db7b97d513
Merge pull request #562 from FunkinCrew/loadingbar-fix 
[PUBLIC PR] Loading Bar Fix
 2024-05-28 23:37:10 -04:00
Cameron Taylor 01b6a11ddb flxpartialsound lock to current version 2024-05-28 22:57:01 -04:00
EliteMasterEric 58415d49c9 Merge remote-tracking branch 'secret/bugfix/html5-save-data' into loadingbar-fix 2024-05-28 22:52:19 -04:00
Eric 53f7cfc8c7
Merge pull request #564 from FunkinCrew/downscroll 
downscroll holdnote fix
 2024-05-28 22:03:15 -04:00
EliteMasterEric f0cd6c50c8 Merge remote-tracking branch 'secret/rewrite/master' into downscroll 2024-05-28 21:57:29 -04:00
Eric 818fc9f914
Merge pull request #565 from FunkinCrew/Ethan-makes-music/main 
[PUBLIC PR] Remove a lot of unused imports
 2024-05-28 21:55:53 -04:00
EliteMasterEric 5cd7466a74 Merge remote-tracking branch 'secret/bugfix/html5-save-data' into develop-0.4.0 2024-05-28 18:25:00 -04:00
Cameron Taylor 1ae30283a3 re add the xmlns schema stuff 2024-05-28 15:34:09 -04:00
gamerbross cf61b9ef90 Add toString to Stage + Revert "Fix Unscripted Stage Log Trace" 2024-05-28 14:51:16 +02: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
Cameron Taylor 8b73d4ef22 Merge branch 'rewrite/master' into bugfix/titlestate-startintro-crash 2024-05-28 02:20:45 -04:00
Cameron Taylor d4b2e94963 assets submod 2024-05-28 02:17:55 -04:00
Cameron Taylor e04a181d2c Merge branch 'rewrite/master' into loadingbar-fix 2024-05-28 02:13:37 -04:00
EliteMasterEric 9a47666fc7 Fix a merge issue. 2024-05-28 01:37:30 -04:00
EliteMasterEric 3b5e85d050 Merge remote-tracking branch 'secret/rewrite/master' into bugfix/html5-save-data 2024-05-28 01:35:43 -04:00
Axuko 004ed32fad Remove alot of unused imoprts 2024-05-27 22:34:28 -07:00
EliteMasterEric 3f9d8ccda9 Merge branch 'rewrite/master' into bugfix/html5-save-data 2024-05-28 01:34:16 -04:00
Cameron Taylor 64123f4496
Merge pull request #556 from FunkinCrew/feature/results-clear-rank 
Added clear percent, rank name, and background text.
 2024-05-28 01:13:02 -04:00
Cameron Taylor 827ad61602 Merge branch 'rewrite/master' into feature/results-clear-rank 2024-05-28 00:56:18 -04:00
gamerbross 4acfbfb76d Fix Legacy Chart Importer wrong instrumental 2024-05-25 01:21:37 +02:00
gamerbross 07959d3e88 Fix Unscripted Stage Log Trace 2024-05-25 01:08:17 +02:00
EliteMasterEric dd3e241f0c Fix some merge conflicts 2024-05-24 16:44:12 -04:00
EliteMasterEric 98505e58ec Take two at fixing submodules 2024-05-24 14:04:55 -04:00
EliteMasterEric c8930b5980 Attempt to repair local submodules 2024-05-24 13:45:37 -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 62e04b3372 Update Changelog 2024-05-24 13:24:11 -04:00
Eric b167e485a1
Merge pull request #2593 from gamerbross/feature/legacy-healthicon-winning 
[FEATURE] Add Winning support to Legacy Health Icons
 2024-05-24 01:51:10 -04:00
Eric b6724eb8c6
Merge pull request #2581 from Keoiki/playstate-notestyles-query 
[FEATURE] Custom Note Style Support
 2024-05-24 01:39:04 -04:00
EliteMasterEric 0e92023794 Add credits for all charts + tweak charts for Guns, Lit Up, Winter Horrorland 2024-05-24 00:21:45 -04:00
EliteMasterEric 2db99b3cb4 Update submodule 2024-05-24 00:06:52 -04:00
EliteMasterEric 44880fa569 Implement placeholder GREAT animation 2024-05-24 00:06:26 -04:00
Cameron Taylor 8a4769e206
Merge pull request #558 from FunkinCrew/feature/save-favorites 
Add freeplay favorites to the save data so they persist between sessions
 2024-05-23 17:16:31 -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
Cameron Taylor 1326dcdc97
Merge pull request #2594 from FunkinCrew/language-labels 
add simple PR auto labelling action
 2024-05-23 15:06:09 -04:00
Cameron Taylor 5d866cb186 pr target 2024-05-23 14:53:25 -04:00
Cameron Taylor 28bf46022a add simple PR auto labelling action 2024-05-23 14:37:50 -04:00
gamerbross 5e130eeffc Add Winning support to Legacy Health Icons 2024-05-23 18:18:37 +02:00
EliteMasterEric 9afc314a0d Fix an issue with git modules 2024-05-22 15:20:53 -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