1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-25 14:46:43 +00:00
Commit graph

3630 commits

Author SHA1 Message Date
Cameron Taylor bbbe2248f8 Merge branch 'ninjamuffin99/funk-268' into rewrite/master 2024-06-04 21:59:59 -04:00
Cameron Taylor 1827cdb6e6
Merge pull request #593 from FunkinCrew/feature/new-one-graphic-holy-fuck
Update num1.png to not suck
2024-06-04 21:57:10 -04:00
Cameron Taylor 6a62f38c33 quicki fix for incorrect clip tweens 2024-06-04 16:51:27 -04:00
Cameron Taylor 84d4d044d6 check clip width when text changes 2024-06-04 16:47:58 -04:00
EliteMasterEric bc21f0c606 Update assets submodule 2024-06-03 19:39:37 -04:00
Cameron Taylor cd85bcf222 assets submod 2024-06-03 18:32:46 -04:00
Cameron Taylor e12a48b6fc fabs code stuff and difficulty fixin 2024-06-03 18:18:33 -04:00
Cameron Taylor 8c4709c25e Merge branch 'results-scrolling' into anim-rename-fixins 2024-06-03 18:11:45 -04:00
Cameron Taylor 6596c47f47 fabs 2024-06-03 14:03:30 -04:00
Cameron Taylor 75621435ea lil more polish to fav icon + clipping 2024-06-02 02:53:07 -04:00
Cameron Taylor e8119bc7d7
Merge pull request #592 from FunkinCrew/bugfix/freeplay-mod-crash
Actually fix a crash bug on Freeplay menu when selecting a mod
2024-06-02 02:21:08 -04:00
Cameron Taylor 0346c3767e
Merge pull request #591 from FunkinCrew/rank-fixes
Freeplay rank fixes + freeplay rank cutscene fixes
2024-06-02 02:20:15 -04:00
Cameron Taylor c64db9966b Merge branch 'rewrite/master' into rank-fixes 2024-06-02 02:19:36 -04:00
EliteMasterEric f961ac8e4e Actually fix a crash bug on Freeplay menu when selecting a mod 2024-06-02 02:11:06 -04:00
Cameron Taylor 08f3b1d95b anim fixes on results 2024-06-02 00:15:10 -04:00
Cameron Taylor 51a44d4810 persistent draw false for results screen (fixes FUNK-256) 2024-06-01 23:36:57 -04:00
Cameron Taylor 7c6c51ea71 results dupe fix 2024-06-01 22:36:47 -04:00
EliteMasterEric 7aee1f900a Fix a Results->Freeplay crash 2024-06-01 20:54:24 -04:00
Cameron Taylor 8248cffbaf small bool cleanings, and maybe fixes 2024-06-01 20:36:14 -04:00
FabsTheFabs b96fa51045 assets submod!! 2024-06-02 00:26:13 +01:00
FabsTheFabs 63bd6f2ace sparks nd more fixes.. i think 2024-06-02 00:25:52 +01:00
Cameron Taylor bd7875e86a fix rank icons appearing when they shouldn't be 2024-06-01 17:13:07 -04:00
Cameron Taylor 4c037de247
Merge pull request #577 from FunkinCrew/nothyper474/cwd-preloader
[PUBLIC PR] Fix a crash when booting from the command line
2024-06-01 16:27:55 -04:00
Cameron Taylor c95ebaa948 Merge branch 'rewrite/master' into nothyper474/cwd-preloader 2024-06-01 16:27:08 -04:00
Cameron Taylor 5fc93f1b71
Merge pull request #572 from FunkinCrew/gamerbross/chart-importer-suffix
[PUBLIC PR] Fix instrumental ID issue when importing legacy charts
2024-06-01 16:26:28 -04:00
Cameron Taylor ded413ab77
Merge branch 'rewrite/master' into gamerbross/chart-importer-suffix 2024-06-01 16:26:18 -04:00
Cameron Taylor c2cc73077f
Merge pull request #588 from FunkinCrew/ninjamuffin99/funk-244-preview-songs-on-freeplay-should-last-longer
make songs last longer on freeplay
2024-06-01 16:25:49 -04:00
Cameron Taylor 26d19abaab
Merge pull request #590 from FunkinCrew/bugfix/may-31st-fixes
May 31st chart fixes
2024-06-01 16:25:08 -04:00
Cameron Taylor de92a7ba5c Merge branch 'rewrite/master' into bugfix/may-31st-fixes 2024-06-01 16:23:37 -04:00
Cameron Taylor e4eb9a7dc9 assets submod 2024-06-01 16:23:22 -04:00
EliteMasterEric 6851edc64b Add new charts 2024-05-31 21:55:33 -04:00
EliteMasterEric 12acdcd9d9 Fix a Results->Freeplay crash 2024-05-31 21:55:27 -04:00
EliteMasterEric fd28c91e75 Update assets submodule 2024-05-31 21:21:46 -04:00
FabsTheFabs b8920effdc assets submod.. 2024-06-01 01:17:58 +01:00
FabsTheFabs 1cffc36ba8 results timing redo + fixed anims for all ranks 2024-06-01 01:17:11 +01:00
FabsTheFabs e08cdac35b score number shuffling 2024-06-01 01:16:52 +01:00
EliteMasterEric e36fbfa72c Update the changelog 2024-05-31 20:16:37 -04:00
EliteMasterEric 074b1afc76 Readd a reverted freeplay bugfix 2024-05-31 20:16:23 -04:00
EliteMasterEric acdd6ba403 Merge remote-tracking branch 'secret/rewrite/master' into bugfix/may-31st-fixes 2024-05-31 20:08:31 -04:00
EliteMasterEric 9088570b92 Make sure JSON data uses latest version/generatedBy when writing. 2024-05-31 19:21:21 -04:00
EliteMasterEric 06daa9d402 Increase Great threshold to 80% 2024-05-31 19:20:39 -04:00
EliteMasterEric 8bf26322e9 Update generatedBy to the latest value when saving a chart. 2024-05-31 18:09:30 -04:00
EliteMasterEric 98eda8ef55 Give timeFormat a default value (fixes the Stress issues!) 2024-05-31 18:09:07 -04:00
Cameron Taylor a1e34123f5
Merge pull request #582 from FunkinCrew/title-bg-fix
fix the one random slice of pixels where the bg doesnt show... lol (FUNK-239)
2024-05-31 18:08:05 -04:00
Cameron Taylor 72ca1145ba
Merge pull request #584 from FunkinCrew/hard-erect-lag-fix
removes trace() that lags freeplay
2024-05-31 18:07:48 -04:00
Cameron Taylor 00566848e9
Merge pull request #586 from FunkinCrew/bugfix/mod-songs-freeplay-preview
Disable song previews for mod songs rather than crashing the game
2024-05-31 18:07:32 -04:00
Cameron Taylor 7d946cf1d8
Merge pull request #587 from FunkinCrew/results-scrolling
Scrolling results text
2024-05-31 18:06:56 -04:00
Cameron Taylor d89a898e6c make songs last longer on freeplay 2024-05-31 17:16:26 -04:00
FabsTheFabs 5d0db60810 assets submod 2024-05-31 10:40:51 +01:00
FabsTheFabs 28444fd478 rank tweaks, favourite changes + rank anim fixes 2024-05-31 10:39:53 +01:00