Commits · d93cc77b2b5f13ff71ff24b04269a7a609a1909e · gadig / four

19 Nov, 2016 27 commits
- Merge branch 'character' into 'master' · d93cc77b
  Andrew R Van Buren authored Nov 20, 2016
```
Character

Added more boss stuff and player sounds (missing attack sounds/melee)

See merge request !37
```
  d93cc77b
- Merge branch 'master' of git.gmu.edu:gadig/four into character · 008e8a97
  Andrew Van Buren authored Nov 19, 2016
```
# Conflicts:
#	Assets/Scripts/Boss.cs
#	Assets/Scripts/FireballMove.cs
#	Assets/Scripts/FireballMove.cs.meta
#	Assets/script/FireballMove.cs.meta
#	Assets/script/TurtleActions.cs.meta
```
  008e8a97
- Added footsteps and victory sound. · 8b4dacbe
  Andrew Van Buren authored Nov 19, 2016
  
  8b4dacbe
- Changed map tool to use prefabs · 17ee1245
  Luke Smith authored Nov 19, 2016
  
  17ee1245
- Added water boss damage/danger and boss music. · 1c55fbcd
  Andrew Van Buren authored Nov 19, 2016
  
  1c55fbcd
- Merge branch 'WallProjectileTrap' into 'master' · d0e3b581
  Luke A Smith authored Nov 20, 2016
```
Added WallProjectileTrap Script

See merge request !34
```
  d0e3b581
- Added WallProjectileTrap Script · 113ca665
  James D Fonda authored Nov 19, 2016
  
  113ca665
- Added Map.cs · 1adf727f
  Luke Smith authored Nov 19, 2016
  
  1adf727f
- Merged to character · 0cb36019
  Andrew Van Buren authored Nov 19, 2016
  
  0cb36019
- Added turtle enemy · 6618db9d
  Jordan B Mckenney authored Nov 19, 2016
  
  6618db9d
- Merge branch 'ShootScript' into 'master' · f7172a18
  Luke A Smith authored Nov 20, 2016
```
Wrote shootStuff  Shoots stuff

See merge request !33
```
  f7172a18
- Merge branch 'MapMakerFix' into 'master' · fcf4c784
  Luke A Smith authored Nov 20, 2016
```
Added Missing Files For MapMaker

See merge request !32
```
  fcf4c784
- Added Missing Files For MapMaker · abe8dc49
  Luke Smith authored Nov 19, 2016
  
  abe8dc49
- turtle prefab changes · ef138b1e
  Jordan B Mckenney authored Nov 19, 2016
  
  ef138b1e
- Merge branch 'character' of git.gmu.edu:gadig/four into jmckenne · d6dc3643
  Jordan B Mckenney authored Nov 19, 2016
```
# Conflicts:
#	Assets/Prefabs/Ability - Water Shield Projectile.prefab
#	Assets/Scenes/player_animation_test.unity
```
  d6dc3643
- Added water boss aniations/trigger and added new water sprite. · 9eb1fc2b
  Andrew Van Buren authored Nov 19, 2016
  
  9eb1fc2b
- Merge branch 'Dialogue' into 'master' · 5b34e3c8
  Luke A Smith authored Nov 19, 2016
```
Added Dialogue Manager

See merge request !31
```
  5b34e3c8
- Added Dialogue Manager · 146736c1
  Luke Smith authored Nov 19, 2016
  
  146736c1
- Merge branch 'MapToolNoConflicts' into 'master' · 1c7ec77e
  Luke A Smith authored Nov 19, 2016
```
Map Tool Added

See merge request !30
```
  1c7ec77e
- Map Tool Added · 4130c051
  Luke Smith authored Nov 19, 2016
  
  4130c051
- Merge branch 'TilePrefabs' into 'master' · 664b79ef
  Luke A Smith authored Nov 19, 2016
```
Added Tile script to GrassTile

See merge request !28
```
  664b79ef
- Added Tile script to GrassTile · 54febebe
  James D Fonda authored Nov 19, 2016
  
  54febebe
- Made options button not quit and added keyboard navegation. · d6f4bbbf
  Andrew Van Buren authored Nov 19, 2016
  
  d6f4bbbf
- Changed keybindings to qwe, made fireball faster/use correct sprite, tweaked water srite. · 41283535
  Andrew Van Buren authored Nov 19, 2016
  
  41283535
- Merge branch 'Organization' into 'master' · b49e831e
  Luke A Smith authored Nov 19, 2016
```
Organization

See merge request !26
```
  b49e831e
- Organized Folders · b179b448
  Luke Smith authored Nov 19, 2016
  
  b179b448
- Organized folders · b251d2b3
  Luke Smith authored Nov 19, 2016
  
  b251d2b3
17 Nov, 2016 13 commits

Merge branch 'character' into 'master' · dc5f8507
Andrew R Van Buren authored Nov 18, 2016
```
Character

Added character updates (abilities, water boss, test maps).

See merge request !25
```
dc5f8507

Merge branch 'master' of git.gmu.edu:gadig/four into character · 31a26346

Andrew Van Buren authored Nov 17, 2016

# 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

temp branch because I have no computer · a0dcf274
Jordan B Mckenney authored Nov 17, 2016

a0dcf274
Updated player. · 5e9ef7d7
Andrew Van Buren authored Nov 17, 2016

5e9ef7d7
Added water boss. · 4ff06f7d
Andrew Van Buren authored Nov 17, 2016

4ff06f7d
Merge branch 'activateScripts' into 'master' · 99b88fd0
Ashley N Crouch authored Nov 18, 2016
```
Activate scripts

See merge request !24
```
99b88fd0
Added activate and deactivate methods to torches · 6312759e
Ashley authored Nov 17, 2016

6312759e
Added activate and deactivate methods to doors · bde1543b
Ashley authored Nov 17, 2016

bde1543b
Wrote shootStuff Shoots stuff · d57b5c78
Swado95 authored Nov 17, 2016

d57b5c78
Deleting unnecessary stuff · cc391d22
tmorga18 authored Nov 17, 2016

cc391d22
Removed redundant script folder, so all scripts are in the one folder · 2b11e4cb
Hussein O Zamzami authored Nov 17, 2016

2b11e4cb
Fixed abilities · 936c9b9b
Jordan B Mckenney authored Nov 17, 2016

936c9b9b
Merge branch 'movingWater' into 'master' · 34a8216b
Ashley N Crouch authored Nov 18, 2016
```
Moving water

See merge request !23
```
34a8216b