diff --git a/project.xml b/project.xml
index c071daf9..bb7a17cf 100644
--- a/project.xml
+++ b/project.xml
@@ -112,19 +112,22 @@
+
+
+
-
+
-
+
-
+
@@ -145,13 +148,13 @@
-
+
-
+
-
+
diff --git a/source/funkin/editors/character/CharacterAnimsWindow.hx b/source/funkin/editors/character/CharacterAnimsWindow.hx
index 92a68ecd..91e2d726 100644
--- a/source/funkin/editors/character/CharacterAnimsWindow.hx
+++ b/source/funkin/editors/character/CharacterAnimsWindow.hx
@@ -45,6 +45,7 @@ class CharacterAnimsWindow extends UIButtonList {
setAnimAutoComplete(CoolUtil.getAnimsListFromSprite(character));
+ nextscrollY = 0;
// dragCallback = (button:CharacterAnimButton, oldID:Int, newID:Int) -> {}
}
@@ -146,7 +147,13 @@ class CharacterAnimsWindow extends UIButtonList {
if (newButton.valid)
buildAnimDisplay(animData.name, animData);
- if (addToUndo) CharacterEditor.undos.addToUndo(CAnimCreate(newButton.ID, newButton.data));
+ if (addToUndo)
+ CharacterEditor.undos.addToUndo(CAnimCreate(newButton.ID, newButton.data));
+
+ var nextButtonY:Float = 0;
+ for (buttonID in 0...newButton.ID)
+ nextButtonY += buttons.members[buttonID].bHeight + buttonOffset.y;
+ nextscrollY = nextButtonY;
}
@:noCompletion var __autoCompleteAnims:Array = [];
diff --git a/source/funkin/editors/character/CharacterEditor.hx b/source/funkin/editors/character/CharacterEditor.hx
index 1e73b24d..854eb52d 100644
--- a/source/funkin/editors/character/CharacterEditor.hx
+++ b/source/funkin/editors/character/CharacterEditor.hx
@@ -510,7 +510,8 @@ class CharacterEditor extends UIState {
characterAnimsWindow.deleteAnimation(characterAnimsWindow.buttons.members[animID], false);
case CAnimDelete(animID, animData):
characterAnimsWindow.addAnimation(animData, animID, false);
- case CAnimEditOrder(animID, newAnimID):
+ playAnimation(animData.name);
+ case CAnimEditOrder(animID, newAnimID):
var button:CharacterAnimButton = characterAnimsWindow.buttons.members[newAnimID];
characterAnimsWindow.buttons.members.remove(button);
characterAnimsWindow.buttons.members.insert(animID, button);
@@ -552,6 +553,7 @@ class CharacterEditor extends UIState {
case CCharEditSprite(oldSprite, newSprite):
case CAnimCreate(animID, animData):
characterAnimsWindow.addAnimation(animData, animID, false);
+ playAnimation(animData.name);
case CAnimDelete(animID, animData):
characterAnimsWindow.deleteAnimation(characterAnimsWindow.buttons.members[animID], false);
case CAnimEditOrder(animID, newAnimID):