1. 01 Dec, 2016 5 commits
  2. 19 Nov, 2016 31 commits
  3. 17 Nov, 2016 4 commits
    • Andrew R Van Buren's avatar
      Merge branch 'character' into 'master' · dc5f8507
      Andrew R Van Buren authored
      Character
      
      Added character updates (abilities, water boss, test maps).
      
      See merge request !25
      dc5f8507
    • 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
    • Jordan B Mckenney's avatar
      temp branch because I have no computer · a0dcf274
      Jordan B Mckenney authored
      a0dcf274
    • Andrew Van Buren's avatar
      Updated player. · 5e9ef7d7
      Andrew Van Buren authored
      5e9ef7d7