• 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
..
Main Menu Loading commit data...
animation Loading commit data...
environment_tiles Loading commit data...
.gitkeep Loading commit data...
1_front.png Loading commit data...
1_front.png.meta Loading commit data...
3_right.png Loading commit data...
3_right.png.meta Loading commit data...
5_back.png Loading commit data...
5_back.png.meta Loading commit data...
Door.png Loading commit data...
Door.png.meta Loading commit data...
GADIG_Kamali_ATTACKDOWN_v5.png Loading commit data...
GADIG_Kamali_ATTACKDOWN_v5.png.meta Loading commit data...
GADIG_Kamali_ATTACKUP_v4.png Loading commit data...
GADIG_Kamali_ATTACKUP_v4.png.meta Loading commit data...
GADIG_Kamali_ATTACK_v12.png Loading commit data...
GADIG_Kamali_ATTACK_v12.png.meta Loading commit data...
GADIG_Kamali_WALKDOWN_v9.png Loading commit data...
GADIG_Kamali_WALKDOWN_v9.png.meta Loading commit data...
GADIG_Kamali_WALKUP_v5.png Loading commit data...
GADIG_Kamali_WALKUP_v5.png.meta Loading commit data...
GADIG_Kamali_WALK_v15.png Loading commit data...
GADIG_Kamali_WALK_v15.png.meta Loading commit data...
Gadic_Four_WaterShieldSprite.png Loading commit data...
Gadic_Four_WaterShieldSprite.png.meta Loading commit data...
Lit torch side view.png Loading commit data...
Lit torch side view.png.meta Loading commit data...
Main Menu.meta Loading commit data...
Stone Door.png Loading commit data...
Stone Door.png.meta Loading commit data...
Tree_01.png Loading commit data...
Tree_01.png.meta Loading commit data...
Tree_03.png Loading commit data...
Tree_03.png.meta Loading commit data...
Unlit torch side view.png Loading commit data...
Unlit torch side view.png.meta Loading commit data...
WaterBossSprite.png Loading commit data...
WaterBossSprite.png.meta Loading commit data...
WaterTileplaceholder.png Loading commit data...
WaterTileplaceholder.png.meta Loading commit data...
animation.meta Loading commit data...
blue.png Loading commit data...
blue.png.meta Loading commit data...
crate_16.png Loading commit data...
crate_16.png.meta Loading commit data...
environment_tiles.meta Loading commit data...
ice_spike.png Loading commit data...
ice_spike.png.meta Loading commit data...
mainvillain_idle.png Loading commit data...
mainvillain_idle.png.meta Loading commit data...
mainvillain_walk_forward.png Loading commit data...
mainvillain_walk_forward.png.meta Loading commit data...
water_deity.png Loading commit data...
water_deity.png.meta Loading commit data...
white 1.png Loading commit data...
white 1.png.meta Loading commit data...
white.png Loading commit data...
white.png.meta Loading commit data...