Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-14 19:25:16 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'rewrite/master' into kadedev/chart-editor-fixes

Browse source
This commit is contained in:
Eric 2024-09-17 16:15:02 -04:00 committed by GitHub
commit dab417b391
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitmodules vendored
View file

@ -1,6 +1,6 @@
[submodule "assets"] [submodule "assets"]
path = assets path = assets
url = https://github.com/FunkinCrew/funkin.assets url = https://github.com/FunkinCrew/Funkin-assets-secret
[submodule "art"] [submodule "art"]
path = art path = art
url = https://github.com/FunkinCrew/funkin.art url = https://github.com/FunkinCrew/Funkin-art-secret

2
assets

@ -1 +1 @@
Subproject commit bc7009b4242691faa5c4552f7ca8a2f28e8cb1d2 Subproject commit a6861ae85433fb10d8cf2fd03f5e769d1e4479ea

2
source/funkin/play/notes/notestyle/NoteStyle.hx
View file

@ -575,7 +575,7 @@ class NoteStyle implements IRegistryEntry<NoteStyleData>
var result = _data.assets.judgementBad?.isPixel; var result = _data.assets.judgementBad?.isPixel;
if (result == null && fallback != null) result = fallback.isJudgementSpritePixel(rating); if (result == null && fallback != null) result = fallback.isJudgementSpritePixel(rating);
return result ?? false; return result ?? false;
case "GO": case "shit":
var result = _data.assets.judgementShit?.isPixel; var result = _data.assets.judgementShit?.isPixel;
if (result == null && fallback != null) result = fallback.isJudgementSpritePixel(rating); if (result == null && fallback != null) result = fallback.isJudgementSpritePixel(rating);
return result ?? false; return result ?? false;