Develop (!13) · Merge requests · TheRedTeam / GroupProject

Merged Clinton Galbraith requested to merge develop into feature_teather 7 years ago

Oct 11, 2017
- Configured procedural scene to work with player prefab · 6713b719
  clg544 authored 7 years ago
  
  6713b719
- Manual resolution of merge conflicts · 21b592bd
  clg544 authored 7 years ago
  
  21b592bd
- Added a scenes folder · 0371430b
  clg544 authored 7 years ago
  
  0371430b
- Merge branch 'feature_proceduralGeneration' into 'develop' · 3d917131
  Clinton Galbraith authored 7 years ago
  
  unity changes to project See merge request !11
  3d917131
- unity changes to project · 46e019c7
  clg544 authored 7 years ago
  
  46e019c7
Oct 10, 2017
- Merge branch 'feature_proceduralGeneration' into develop · 014ed02c
  Brandon Piller authored 7 years ago
  
  014ed02c
- fixed folder badness · 4c467b9b
  Brandon Piller authored 7 years ago
  
  4c467b9b
- Procedural Genreation Updates, added door functionality · 1364fa9d
  Brandon Piller authored 7 years ago
  
  1364fa9d
Oct 01, 2017
- Commiting procedural Generation · 61fa9088
  Brandon Piller authored 7 years ago
  
  61fa9088
Sep 25, 2017
- Commiting procedural Generation · 8f23eb1b
  Brandon Piller authored 7 years ago
  
  8f23eb1b

Develop