Commits · 6312759ece0fd0b8ebba14d3c36f5631b4f7f6b9 · gadig / four

18 Nov, 2016 9 commits
- 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
- Removed redundant script folder, so all scripts are in the one folder · 2b11e4cb
  Hussein O Zamzami authored Nov 17, 2016
  
  2b11e4cb
- 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
11 Nov, 2016 4 commits
- 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
28 Oct, 2016 8 commits
- Merge branch 'master' of git.gmu.edu:gadig/FOUR · a66d7cf4
  Ashley authored Oct 27, 2016
  
  a66d7cf4
- Merge branch 'torch' into 'master' · 269330bb
  Luke A Smith authored Oct 28, 2016
```
added Torch and TorchPrefab

See merge request !15
```
  269330bb
- fixed merge requests? Maybe? · b9478d74
  Ashley authored Oct 27, 2016
  
  b9478d74
- Updated · 804e8c42
  Swado95 authored Oct 27, 2016
  
  804e8c42
- Merge branch 'torch' "added torch prefab and torch script" · 0157e41f
  Ashley authored Oct 27, 2016
  
  0157e41f
- added Torch and TorchPrefab · 2ba49325
  Ashley authored Oct 27, 2016
  
  2ba49325
- Merge branch 'EnemyPathingFixes' into 'master' · f51a4c1d
  Luke A Smith authored Oct 28, 2016
```
Enemy pathing fixes

See merge request !14
```
  f51a4c1d
- override · facebc3a
  Zac Olsen authored Oct 27, 2016
  
  facebc3a
27 Oct, 2016 1 commit
- 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 18 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
- removed test file · 1e098a3d
  Zac Olsen authored Oct 21, 2016
  
  1e098a3d
- test · cc18ec21
  Zac Olsen authored Oct 21, 2016
  
  cc18ec21
- removed duplicat folders · 89bcd88e
  Zac Olsen authored Oct 21, 2016
  
  89bcd88e
- 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
- 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