Commits · 2ba49325b3d41cd34c494d760ff780daaccd13c1 · gadig / four

27 Oct, 2016 2 commits
- added Torch and TorchPrefab · 2ba49325
  Ashley authored Oct 27, 2016
  
  2ba49325
- Merge branch 'SwitchObject' into 'master' · ce87482a
  Luke A Smith authored Oct 27, 2016
```
Added SwitchObject script and prefab

See merge request !13
```
  ce87482a
21 Oct, 2016 10 commits
- Merge branch 'folderFixes' into 'master' · 0ad0a4c2
  Luke A Smith authored Oct 21, 2016
```
Fixed folder names and removed redundent folders



See merge request !12
```
  0ad0a4c2
- Fixed folder names and removed redundent folders · 6db14b17
  Luke Smith authored Oct 21, 2016
  
  6db14b17
- Merge branch 'EnemyPathing' into 'master' · 2ff4cf21
  Luke A Smith authored Oct 21, 2016
```
Enemy pathing



See merge request !11
```
  2ff4cf21
- Pathing using heap · 87ab6458
  Zac Olsen authored Oct 21, 2016
  
  87ab6458
- Merge branch 'gitignore' into 'master' · 24b12369
  Luke A Smith authored Oct 21, 2016
```
Added gitignore



See merge request !10
```
  24b12369
- Added gitignore · ea0bd1ac
  Cethin authored Oct 21, 2016
  
  ea0bd1ac
- Merge branch 'cleanup' into 'master' · ff202615
  Luke A Smith authored Oct 21, 2016
```
Cleaned up files and renamed folders



See merge request !9
```
  ff202615
- Cleaned up files and renamed folders · 6bfd97d2
  Cethin authored Oct 21, 2016
  
  6bfd97d2
- Merge branch 'mapTool' into 'master' · 2890e917
  Luke A Smith authored Oct 21, 2016
```
Added MapTool stuff for map generation, as well as a world data layer created by…

… it and a PriorityQueue

See merge request !8
```
  2890e917
- Added MapTool stuff for map generation, as well as a world data layer created... · f14ca9e7
  Cethin authored Oct 21, 2016
```
Added MapTool stuff for map generation, as well as a world data layer created by it and a PriorityQueue
```
  f14ca9e7
20 Oct, 2016 13 commits
- Pathing · 454c5479
  Zac Olsen authored Oct 20, 2016
  
  454c5479
- Added SwitchObject script and prefab · 4f371b9e
  Joshua DeRossett authored Oct 20, 2016
  
  4f371b9e
- Merge branch 'flameCrab' into 'master' · c884d330
  Luke A Smith authored Oct 21, 2016
```
Flame crab

flameCrab and heap for pathfinding

See merge request !5
```
  c884d330
- -m additional comment · c7583795
  Cody A Burchett authored Oct 20, 2016
  
  c7583795
- Merge branch 'character' into 'master' · ddcf4c90
  Luke A Smith authored Oct 21, 2016
```
Character

Basic character functionality is in place.

See merge request !4
```
  ddcf4c90
- Merge branch 'master' into 'character' · c0f97470
  Andrew R Van Buren authored Oct 21, 2016
```
# Conflicts:
#   Assets/sprite/crate_16.png.meta
```
  c0f97470
- -m comments for heap · 7b5d33f0
  Cody A Burchett authored Oct 20, 2016
  
  7b5d33f0
- Combined initial character scripts and added animation controller. · 0e43c0d2
  Andrew Van Buren authored Oct 20, 2016
  
  0e43c0d2
- -m Heap for zac · 30954f53
  Cody A Burchett authored Oct 20, 2016
  
  30954f53
- Merge branch 'tree' into 'master' · 236b90fc
  Luke A Smith authored Oct 21, 2016
```
added trees



See merge request !3
```
  236b90fc
- Merge branch 'flameCrab' of git.gmu.edu:gadig/four into flameCrab · 7d25f6be
  Cody A Burchett authored Oct 20, 2016
  
  7d25f6be
- -m · 2cbc0619
  Cody A Burchett authored Oct 11, 2016
  
  2cbc0619
- flame crab · 67992c6c
  Cody A Burchett authored Oct 06, 2016
  
  67992c6c
13 Oct, 2016 7 commits
- Added a controller for determining what ability is selected when attack button is pressed · 4f259094
  Jordan McKenney authored Oct 13, 2016
  
  4f259094
- Added hero movement script · 5ee3e240
  Zack Rembisz authored Oct 13, 2016
  
  5ee3e240
- added trees · 80d43b54
  Shelby Sibbett authored Oct 13, 2016
  
  80d43b54
- Merge branch 'crate_16' into 'master' · b1edcb29
  Shellby Grehawick authored Oct 14, 2016
```
Crate 16

closes #71

See merge request !2
```
  b1edcb29
- Merge branch 'WDungeonBlockPrefab' into 'master' · 82d4c87d
  Shellby Grehawick authored Oct 14, 2016
```
added folders and preafab for water dungeon tile



See merge request !1
```
  82d4c87d
- added folders and preafab for water dungeon tile · cc714db4
  Dylan E Morley authored Oct 13, 2016
  
  cc714db4
- made a crate · 155ed1e7
  David Cooper authored Oct 13, 2016
  
  155ed1e7
11 Oct, 2016 1 commit
- -m · cdc94e37
  Cody A Burchett authored Oct 11, 2016
  
  cdc94e37
06 Oct, 2016 3 commits
- Added colider to crate · 567dbdfb
  David Cooper authored Oct 06, 2016
  
  567dbdfb
- flame crab · d35289a0
  Cody A Burchett authored Oct 06, 2016
  
  d35289a0
- fixed unity project folders · 1266fa3f
  Tanner Grehawick authored Oct 06, 2016
```
+ Assets folder
+ Assets sub-folders
```
  1266fa3f
29 Sep, 2016 2 commits
- deleted testfile · 229c3c09
  Tanner Grehawick authored Sep 29, 2016
  
  229c3c09
- here ya go · 2b68bb09
  Tanner Grehawick authored Sep 29, 2016
  
  2b68bb09
28 Sep, 2016 1 commit
- added missing files · c597f243
  Shellby Grehawick authored Sep 28, 2016
  
  c597f243
27 Sep, 2016 1 commit
- Update README.md · c68e8f58
  Shellby Grehawick authored Sep 27, 2016
  
  c68e8f58