• 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
..
Pathing Loading commit data...
World Loading commit data...
.DS_Store Loading commit data...
.gitkeep Loading commit data...
DoorSceneScript.cs Loading commit data...
DoorSceneScript.cs.meta Loading commit data...
DoorScript.cs Loading commit data...
DoorScript.cs.meta Loading commit data...
FlameCrab.cs Loading commit data...
FlameCrab.cs.meta Loading commit data...
FloorSwitch.cs Loading commit data...
FloorSwitch.cs.meta Loading commit data...
HeroMobility.cs Loading commit data...
HeroMobility.cs.meta Loading commit data...
KeyScript.cs Loading commit data...
KeyScript.cs.meta Loading commit data...
Pathing.meta Loading commit data...
Pathing.meta~HEAD Loading commit data...
Pathing.meta~HEAD.meta Loading commit data...
Pathing.meta~f51a4c1d9bad02a17df713e8551abaab48d641f4 Loading commit data...
Pathing.meta~f51a4c1d9bad02a17df713e8551abaab48d641f4.meta Loading commit data...
PlayerAnimation.cs Loading commit data...
PlayerAnimation.cs.meta Loading commit data...
PriorityQueue.cs Loading commit data...
PriorityQueue.cs.meta Loading commit data...
SwitchObject.cs Loading commit data...
SwitchObject.cs.meta Loading commit data...
Torch.cs Loading commit data...
Torch.cs.meta Loading commit data...
World.meta Loading commit data...
basic_slime_script.cs Loading commit data...
basic_slime_script.cs.meta Loading commit data...