-
Andrew Van Buren authored
# Conflicts: # Assets/Scenes/player_animation_test.unity # Assets/Scripts/HeroAttackController.cs # Assets/Scripts/HeroAttackController.cs.meta # Assets/Scripts/HeroMobility.cs # Assets/Sprites/animation/Player/down.anim # Assets/Sprites/animation/Player/down.anim.meta # Assets/Sprites/animation/Player/right.anim # Assets/Sprites/animation/Player/right.anim.meta # Assets/Sprites/animation/Player/up.anim # Assets/Sprites/animation/Player/up.anim.meta # Assets/script/Boss.cs.meta # Assets/script/HeroAttackController.cs.meta # Assets/sprite/animation/Player/down.anim # Assets/sprite/animation/Player/down.anim.meta # Assets/sprite/animation/Player/idle_down.anim # Assets/sprite/animation/Player/idle_right.anim # Assets/sprite/animation/Player/idle_up.anim # Assets/sprite/animation/Player/right.anim # Assets/sprite/animation/Player/right.anim.meta # Assets/sprite/animation/Player/up.anim # Assets/sprite/animation/Player/up.anim.meta # Assets/sprite/animation/Player/walk_down.anim.meta # Assets/sprite/animation/Player/walk_right.anim.meta # Assets/sprite/animation/Player/walk_up.anim.meta # ProjectSettings/TagManager.asset
31a26346