diff --git a/.gitmodules b/.gitmodules index e7ac962a99..9cc9a2fca8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "assets"] path = assets - url = https://github.com/JustKolosaki/FunkinAssetsContrib/tree/char-creator-ui + url = https://github.com/FunkinCrew/funkin.assets [submodule "art"] path = art url = https://github.com/FunkinCrew/Funkin.art diff --git a/assets b/assets index eeb882e7c0..d40c3ee99a 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit eeb882e7c0870a32a229015879bbb7a1d5ce4582 +Subproject commit d40c3ee99a423c9c366bb7bc042f657ee18d2811 diff --git a/source/funkin/ui/debug/char/components/dialogs/AddAnimDialog.hx b/source/funkin/ui/debug/char/components/dialogs/AddAnimDialog.hx index d6e5151eea..09ed594413 100644 --- a/source/funkin/ui/debug/char/components/dialogs/AddAnimDialog.hx +++ b/source/funkin/ui/debug/char/components/dialogs/AddAnimDialog.hx @@ -15,10 +15,8 @@ class AddAnimDialog extends DefaultPageDialog linkedChar = char; // dialog callback bs - charAnimPath.disabled = (char.renderType != "multisparrow"); - charAnimPath.tooltip = (char.renderType == "multisparrow" ? null : "Only Available for Multi-Sparrow Characters."); - charAnimFrames.disabled = charAnimPath.disabled = charAnimFlipX.disabled = charAnimFlipY.disabled = charAnimFramerate.disabled = (char.renderType == "atlas"); - charAnimFrames.tooltip = charAnimPath.tooltip = charAnimFlipX.tooltip = charAnimFlipY.tooltip = charAnimFramerate.tooltip = (char.renderType == "atlas" ? "Unavailable for Atlas Characters." : null); + charAnimFrames.disabled = charAnimFlipX.disabled = charAnimFlipY.disabled = charAnimFramerate.disabled = (char.renderType == "atlas"); + charAnimFrames.tooltip = charAnimFlipX.tooltip = charAnimFlipY.tooltip = charAnimFramerate.tooltip = (char.renderType == "atlas" ? "Unavailable for Atlas Characters." : null); if (char.renderType != "atlas") { @@ -30,7 +28,7 @@ class AddAnimDialog extends DefaultPageDialog charAnimDropdown.onChange = function(_) { if (charAnimDropdown.selectedIndex == -1) // delele this shiz { - charAnimName.text = charAnimFrames.text = charAnimPath.text = ""; + charAnimName.text = charAnimFrames.text = ""; charAnimLooped.selected = charAnimFlipX.selected = charAnimFlipY.selected = false; charAnimFramerate.pos = 24; charAnimOffsetX.pos = charAnimOffsetY.pos = 0;