• Andrew Van Buren's avatar
    Merge branch 'master' of git.gmu.edu:gadig/four into character · 31a26346
    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
Name
Last commit
Last update
..
AudioManager.asset Loading commit data...
ClusterInputManager.asset Loading commit data...
DynamicsManager.asset Loading commit data...
EditorBuildSettings.asset Loading commit data...
EditorSettings.asset Loading commit data...
GraphicsSettings.asset Loading commit data...
InputManager.asset Loading commit data...
NavMeshAreas.asset Loading commit data...
NetworkManager.asset Loading commit data...
Physics2DSettings.asset Loading commit data...
ProjectSettings.asset Loading commit data...
ProjectVersion.txt Loading commit data...
QualitySettings.asset Loading commit data...
TagManager.asset Loading commit data...
TimeManager.asset Loading commit data...
UnityAdsSettings.asset Loading commit data...
UnityConnectSettings.asset Loading commit data...