Commits · 0371430be1dace1b9c447771ffd1a0dde5c59416 · TheRedTeam / GroupProject

Oct 11, 2017
- 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 09, 2017

Merge branch 'feature_teather' into 'develop' · aeaeeb3c

# Conflicts:
#   CMPT306_Fall2017/Assets/CMPT306_Fall2017.unity
#   CMPT306_Fall2017/Assets/Scripts.meta

aeaeeb3c

Oct 01, 2017
- Commiting procedural Generation · 61fa9088
  Brandon Piller authored 7 years ago
  
  61fa9088
Sep 28, 2017
- Unity changes to asset files post merge · abd599ef
  clg544 authored 7 years ago
  
  abd599ef
- Merge branch 'feature_shooting' into 'develop' · 3ffc2a0c
  Clinton Galbraith authored 7 years ago
  
  Feature shooting See merge request !7
  3ffc2a0c
- Shooty now shoots, bullets do nothing on impact. (Implement on enemy branch?) · 590fe153
  clg544 authored 7 years ago
  
  590fe153
Sep 27, 2017
- Added aiming to player one using an xbox gamepad · d7f28fcb
  clg544 authored 7 years ago
  
  d7f28fcb
- Merge branch 'develop' into 'feature_shooting' · 75d30e1c
  Clinton Galbraith authored 7 years ago
  
  Develop See merge request !6
  75d30e1c
- Merge branch 'feature_input' into 'develop' · b2d45dc8
  Clinton Galbraith authored 7 years ago
  
  Added Interface for Xbox controllers See merge request !5
  b2d45dc8
- Initial shooting resources defined: need to pull input for joystick implementation · 35192060
  clg544 authored 7 years ago
  
  35192060
Sep 26, 2017
- Added Interface for Xbox controllers · ae5097c0
  clg544 authored 7 years ago
  
  ae5097c0
- Added prefabs from the test scene. · 265788b7
  clg544 authored 7 years ago
  
  265788b7
Sep 25, 2017
- Disabled debug visualizations · 4708cbca
  clg544 authored 7 years ago
  
  4708cbca
- Merge branch 'feature_camera' into 'develop' · 8a743e80
  Clinton Galbraith authored 7 years ago
  
  Reached goals for the camera, ready to merge. See merge request !4
  8a743e80
- Reached goals for the camera, ready to merge. · 1378a96b
  clg544 authored 7 years ago
  
  1378a96b
- Commiting procedural Generation · 8f23eb1b
  Brandon Piller authored 7 years ago
  
  8f23eb1b
- Merge branch 'feature_physics' into 'develop' · c2004a01
  Clinton Galbraith authored 7 years ago
  
  Feature physics See merge request !3
  c2004a01
- Added sprite to camera target to help visualize. Currently sits at center. · 05f2cf7e
  clg544 authored 7 years ago
  
  05f2cf7e
- some work on basic teathering mechanics · 9891aab0
  Daniel McCoshen (dam479) authored 7 years ago
  
  9891aab0
- some basic attempts at the teather scripting · b0b33805
  Daniel McCoshen (dam479) authored 7 years ago
  
  b0b33805
Sep 24, 2017
- Added comments to new code. · 093f599c
  clg544 authored 7 years ago
  
  093f599c
- Added basic camera that follows the center of the two players. · 0bb01957
  clg544 authored 7 years ago
  
  0bb01957
Sep 21, 2017
- Fixed compiler error, squared distance in tension equation to add responsiveness of tether. · 206ae4c2
  clg544 authored 7 years ago
  
  206ae4c2
Sep 20, 2017
- Added detailed comments to all scripts · 36b3d845
  clg544 authored 7 years ago
  
  36b3d845
- Basic physics and input are implemented into a basic test scene. · 19e985b8
  clg544 authored 7 years ago
  
  19e985b8
- Rebuilding a test scene, Prefabs are made. · 03cab19e
  Clinton Galbraith authored 7 years ago
  
  03cab19e
- Basic assest from a test made outside the repository, impotred to be constructed. · 24f23357
  Clinton Galbraith authored 7 years ago
  
  24f23357
- Merge branch 'develop' into 'master' · b17e1baf
  Clinton Galbraith authored 7 years ago
  
  Develop See merge request !2
  b17e1baf
- Created an empty Unity project to initiate the develop branch. · e28a5e1d
  clg544 authored 7 years ago
  
  e28a5e1d
- Added a Unity based git ignore file, with correct folder name. · 4f432aff
  clg544 authored 7 years ago
  
  4f432aff
- Added a Unity based git ignore file. · 7195fc23
  clg544 authored 7 years ago
  
  7195fc23
Sep 14, 2017
- Formatting README.md · a659f7d6
  Clinton Galbraith authored 7 years ago
  
  a659f7d6
- formatting of the Readme. · 9dfc4830
  Clinton Galbraith authored 7 years ago
  
  9dfc4830
- Initial commit of a README.md file, holding the identification information for our group. · bc1a8920
  Clinton Galbraith authored 7 years ago
  
  bc1a8920