Commits · abe8dc49d5ef4cba719cdcc3b787fa50694020cb · gadig / four

19 Nov, 2016 10 commits
- Added Missing Files For MapMaker · abe8dc49
  Luke Smith authored Nov 19, 2016
  
  abe8dc49
- 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
- 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 18 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
- 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
- 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
- Merge branch 'master' into 'movingWater' · 016c357d
  Ashley N Crouch authored Nov 18, 2016
```
# Conflicts:
#   ProjectSettings/ProjectVersion.txt
```
  016c357d
- Created water tile · 351ccb29
  Joshua DeRossett authored Nov 17, 2016
  
  351ccb29
- Merge branch 'floorSwitch' into 'master' · 0d90c74c
  Luke A Smith authored Nov 18, 2016
```
Floor switch

See merge request !21
```
  0d90c74c
- Merge branch 'ANewBranch' into 'master' · 7fb86304
  Luke A Smith authored Nov 18, 2016
```
Adding basic slime script

See merge request !20
```
  7fb86304
- Adding basic slime script · de9143a9
  James D Fonda authored Nov 17, 2016
  
  de9143a9
- Merge branch 'character' of git.gmu.edu:gadig/four into character · dadd9846
  tmorga18 authored Nov 17, 2016
  
  dadd9846
- Merged the fireball and watershield actions into one script · 781857a8
  tmorga18 authored Nov 17, 2016
  
  781857a8
10 Nov, 2016 8 commits
- Added basic water dungeon, but no scripts yet. · db47e980
  Andrew Van Buren authored Nov 10, 2016
  
  db47e980
- Adjusted the main menu and added depth to the fireball · 9b52c8ea
  Jordan McKenney authored Nov 10, 2016
  
  9b52c8ea
- Added a main menu · 61025137
  Jordan McKenney authored Nov 10, 2016
  
  61025137
- Merge branch 'doors' into 'master' · 44408661
  Luke A Smith authored Nov 11, 2016
```
Doors

See merge request !18
```
  44408661
- Completed DoorSceneScript · 7a0183b5
  Ashley authored Nov 10, 2016
  
  7a0183b5
- Added DoorScript and KeyScript, started DoorSceneScript · 6321c0fd
  Ashley authored Nov 10, 2016
  
  6321c0fd
- Added DoorScript and KeyScript, started the DoorSceneScript · 163e296f
  Ashley authored Nov 10, 2016
  
  163e296f
- Added more to test scene and tweaked values. · 0b883507
  Andrew Van Buren authored Nov 10, 2016
  
  0b883507
03 Nov, 2016 4 commits
- Added sprite randomizer for grass and simple Z sorting for moving objects. · 74f6bdeb
  Andrew Van Buren authored Nov 03, 2016
  
  74f6bdeb
- Merge branch 'character' of git.gmu.edu:gadig/four into character · 269232c6
  Jordan McKenney authored Nov 03, 2016
  
  269232c6
- Added a fireball prefab and script to spawn fireballs · 5ab16613
  Jordan McKenney authored Nov 03, 2016
  
  5ab16613
- Adjusted walk particles and animation. · 15e510cd
  Andrew Van Buren authored Nov 03, 2016
  
  15e510cd