Commits · fad88adea13c956cc6cdb69ad4c25df07ef12325 · gadig / Birb

06 Mar, 2017 10 commits
- add player model to player prefab, begin refactor · fad88ade
  Tanner Grehawick authored Mar 06, 2017
  
  fad88ade
- import character animations · c0020750
  Tanner Grehawick authored Mar 06, 2017
  
  c0020750
- add matt's changes · f78654f8
  Tanner Grehawick authored Mar 06, 2017
  
  f78654f8
- Merge branch 'enemyHorizontal' into 'master' · 02f95ff8
  Luke A Smith authored Mar 06, 2017
```
Enemy horizontal

See merge request !31
```
  02f95ff8
- fix scene · 648b73ae
  Tanner Grehawick authored Mar 06, 2017
  
  648b73ae
- tweak player wall jump horizontal speed · f8e10fcf
  Tanner Grehawick authored Mar 06, 2017
  
  f8e10fcf
- wall jump · f38a1933
  Tanner Grehawick authored Mar 06, 2017
  
  f38a1933
- add A and B to input manager · 625e59e9
  Tanner Grehawick authored Mar 06, 2017
  
  625e59e9
- directional dash · db9e221a
  Tanner Grehawick authored Mar 06, 2017
  
  db9e221a
- fix physics stuff · f39acef8
  Tanner Grehawick authored Mar 06, 2017
  
  f39acef8
02 Mar, 2017 27 commits
- checking that hazard exists · 24413aa6
  Cody A Burchett authored Mar 02, 2017
  
  24413aa6
- Merge branch 'enemyHorizontal' · 8f9f1f07
  Cody A Burchett authored Mar 02, 2017
  
  8f9f1f07
- Merge branch 'master' of git.gmu.edu:gadig/Birb · 10d46002
  Cody A Burchett authored Mar 02, 2017
  
  10d46002
- Merge branch 'pathmovement' into 'master' · c20aaaf9
  Andrew R Van Buren authored Mar 03, 2017
```
Pathmovement

See merge request !30
```
  c20aaaf9
- Merge branch 'master' of git.gmu.edu:gadig/birb into pathmovement · 2e28663e
  Andrew Van Buren authored Mar 02, 2017
```
# Conflicts:
#	Assets/Scenes/CharacterTest.unity
#	Assets/Scripts/Enemy.meta
#	Assets/Scripts/Enemy/ToggleEnemy.cs
#	Assets/Scripts/Enemy/ToggleEnemy.cs.meta
#	Assets/Scripts/Player/CameraFollow.cs.meta
#	Assets/Scripts/Util/WinTrigger.cs
#	ProjectSettings/ProjectVersion.txt
```
  2e28663e
- added hazard requirement · 35c90c88
  Cody A Burchett authored Mar 02, 2017
  
  35c90c88
- Added followable paths. · b6462278
  Andrew Van Buren authored Mar 02, 2017
  
  b6462278
- fixed more wall sliding stuff · cbbb5d3f
  Jordan B Mckenney authored Mar 02, 2017
  
  cbbb5d3f
- fix prefabs, CharacterTest, and CollisionState · 61bd817b
  Tanner Grehawick authored Mar 02, 2017
  
  61bd817b
- Merge branch 'master' of git.gmu.edu:gadig/Birb · 1720dae5
  Jordan B Mckenney authored Mar 02, 2017
  
  1720dae5
- added wall slide · 3a79f843
  Jordan B Mckenney authored Mar 02, 2017
  
  3a79f843
- fix indent in CollisionState, remove orphan code · 8282ed34
  Tanner Grehawick authored Mar 02, 2017
  
  8282ed34
- add onWallLeft and onWallRight, change onWall · 68ad85a6
  Tanner Grehawick authored Mar 02, 2017
```
onWall = onWallRight || onWallLeft
```
  68ad85a6
- Merge remote-tracking branch 'origin/master' · ef1b3f2d
  Jordan B Mckenney authored Mar 02, 2017
  
  ef1b3f2d
- commit · 9b087dfd
  Jordan B Mckenney authored Mar 02, 2017
  
  9b087dfd
- added turn around after certain distance moved · 4471851c
  Cody A Burchett authored Mar 02, 2017
  
  4471851c
- enemy refactor and cleanup · 8bd0501f
  Cody A Burchett authored Mar 02, 2017
  
  8bd0501f
- fix jump input, add player interpolation · c3d5d8ba
  Tanner Grehawick authored Mar 02, 2017
  
  c3d5d8ba
- add jump to prefab, fix other stuff · 6b92d20c
  Tanner Grehawick authored Mar 02, 2017
  
  6b92d20c
- Merge remote-tracking branch 'origin/jump' · a2223900
  Tanner Grehawick authored Mar 02, 2017
  
  a2223900
- change gravity · 18918c0e
  Tanner Grehawick authored Mar 02, 2017
  
  18918c0e
- Merge remote-tracking branch 'origin/levelTimer' · d5b6bfea
  Tanner Grehawick authored Mar 02, 2017
  
  d5b6bfea
- Merge branch 'master' of git.gmu.edu:gadig/Birb · 7b321b5c
  Tanner Grehawick authored Mar 02, 2017
  
  7b321b5c
- Merge branch 'hazard' into 'master' · c2f1d8b9
  Luke A Smith authored Mar 03, 2017
```
Hazard

See merge request !19
```
  c2f1d8b9
- Merge branch 'master' of git.gmu.edu:gadig/Birb · e61bda3f
  Tanner Grehawick authored Mar 02, 2017
  
  e61bda3f
- Merge branch 'enemyHorizontal' into 'master' · 50916e2f
  Luke A Smith authored Mar 03, 2017
```
enemy fixes

See merge request !28
```
  50916e2f
- Merge branch 'dashrefactor' · bb345224
  Tanner Grehawick authored Mar 02, 2017
  
  bb345224
23 Feb, 2017 3 commits
- enemy fixes · 08b6797d
  Cody A Burchett authored Feb 23, 2017
  
  08b6797d
- Merge branch 'walk' into 'master' · 1e755e8d
  Luke A Smith authored Feb 24, 2017
```
Walk

See merge request !27
```
  1e755e8d
- updated walk script · 568734b5
  Jordan B Mckenney authored Feb 23, 2017
  
  568734b5