1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-03-22 09:59:25 +00:00

Merge branch 'rewrite/master' into bugfix/selection-highlight

This commit is contained in:
Cameron Taylor 2023-12-14 18:41:23 -05:00 committed by GitHub
commit 15f72adeed
2 changed files with 6 additions and 1 deletions

2
assets

@ -1 +1 @@
Subproject commit 7d59681870d2b73417a9f5b553720e8b7120bbde Subproject commit dfaf23dfa11ff67be2eea9113a80ff5dc0040f76

View file

@ -13,6 +13,8 @@ import haxe.ui.containers.HBox;
import haxe.ui.containers.ScrollView; import haxe.ui.containers.ScrollView;
import haxe.ui.containers.ScrollView; import haxe.ui.containers.ScrollView;
import haxe.ui.core.Screen; import haxe.ui.core.Screen;
import flixel.tweens.FlxTween;
import flixel.tweens.FlxEase;
// @:nullSafety // TODO: Fix null safety when used with HaxeUI build macros. // @:nullSafety // TODO: Fix null safety when used with HaxeUI build macros.
@:access(funkin.ui.debug.charting.ChartEditorState) @:access(funkin.ui.debug.charting.ChartEditorState)
@ -27,6 +29,9 @@ class ChartEditorCharacterIconSelectorMenu extends ChartEditorBaseMenu
super(state2); super(state2);
initialize(charType, lockPosition); initialize(charType, lockPosition);
this.alpha = 0;
this.y -= 10;
FlxTween.tween(this, {alpha: 1, y: this.y + 10}, 0.2, {ease: FlxEase.quartOut});
} }
function initialize(charType:CharacterType, lockPosition:Bool) function initialize(charType:CharacterType, lockPosition:Bool)