Commits · 2d6298685240b1e539bf5a23f5f9232a48084ae4 · GDW-SS-18 / to-the-surface

28 Sep, 2018 25 commits
- Levels 12+13 gebaut · 2d629868
  Christopher Benes authored Sep 28, 2018
  
  2d629868
- Merge branch 'master' into feature/Level · e7fc9a44
  Christopher Benes authored Sep 28, 2018
  
  e7fc9a44
- Level 12 gebaut · 68f467fa
  Christopher Benes authored Sep 28, 2018
  
  68f467fa
- Merge remote-tracking branch 'origin/master' · a1552ba1
  Marcel Kuehn authored Sep 28, 2018
  
  a1552ba1
- Challenegr Mode nun gespeichert in safeLoad · be9f996b
  Marcel Kuehn authored Sep 28, 2018
  
  be9f996b
- Added Timed Toggle · f3bdd9ba
  Markus Schlösser authored Sep 28, 2018
  
  f3bdd9ba
- Added laser controller · b9a5e40b
  Markus Schlösser authored Sep 28, 2018
  
  b9a5e40b
- Merge remote-tracking branch 'origin/master' · af35d702
  Marcel Kuehn authored Sep 28, 2018
```
# Conflicts:
#	Assets/_Game/Prefabs/Cannon.prefab
```
  af35d702
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GDW-SS-18/unity/to-the-surface · 31914d99
  Markus Schlösser authored Sep 28, 2018
  
  31914d99
- Added physics shape to every tile · a2a35eeb
  Markus Schlösser authored Sep 28, 2018
  
  a2a35eeb
- Merge remote-tracking branch 'origin/master' · 84906b58
  Jan Meissner authored Sep 28, 2018
  
  84906b58
- Added LevelPreviews, fixed player collider missing · c0e47026
  Jan Meissner authored Sep 28, 2018
  
  c0e47026
- Challanger updated · 397100a6
  Marcel Kuehn authored Sep 28, 2018
  
  397100a6
- Merge branch 'master' into feature/Level · b919635f
  Christopher Benes authored Sep 28, 2018
  
  b919635f
- Level 10-11 gebaut · 255c4e1f
  Christopher Benes authored Sep 28, 2018
  
  255c4e1f
- Updated Cannon · 77b171dc
  Markus Schlösser authored Sep 28, 2018
  
  77b171dc
- Removed unneded animation state · 3b29b1f1
  Markus Schlösser authored Sep 28, 2018
  
  3b29b1f1
- Merge remote-tracking branch 'origin/master' · d49a20da
  Jan Meissner authored Sep 28, 2018
  
  d49a20da
- Optimized ProjektilController · 9f58eadb
  Jan Meissner authored Sep 28, 2018
  
  9f58eadb
- Added sperate head shake when failing to jump · 6713daa2
  Markus Schlösser authored Sep 28, 2018
  
  6713daa2
- Added HeadShake · 0e1d6f4b
  Markus Schlösser authored Sep 28, 2018
  
  0e1d6f4b
- Merge remote-tracking branch 'origin/master' · 8900a634
  Jan Meissner authored Sep 28, 2018
```
# Conflicts:
#	Assets/_Game/Scripts/CannonController.cs
```
  8900a634
- Added animation to CannonBarrel & wheels · 6199b4ec
  Jan Meissner authored Sep 28, 2018
  
  6199b4ec
- Added Lever · eefae6c0
  Markus Schlösser authored Sep 28, 2018
  
  eefae6c0
- Fixed error in camera far plane setting · c76f1e27
  Markus Schlösser authored Sep 28, 2018
  
  c76f1e27
27 Sep, 2018 15 commits
- Fixed animation resets in player actor · 7ff2a895
  Markus Schlösser authored Sep 27, 2018
  
  7ff2a895
- Fixed enormous far plane setting in main camera · 13f00fe6
  Markus Schlösser authored Sep 27, 2018
  
  13f00fe6
- Fixed error in concave slope asset · 98b92682
  Markus Schlösser authored Sep 27, 2018
  
  98b92682
- Added Level10 to build settings · 1429907b
  Markus Schlösser authored Sep 27, 2018
  
  1429907b
- Refactored code files · d1ed5ac0
  Markus Schlösser authored Sep 27, 2018
  
  d1ed5ac0
- Merge remote-tracking branch 'origin/master' · 22dba28e
  Marcel Kuehn authored Sep 27, 2018
```
# Conflicts:
#	Assets/_Game/Scripts/PlayerActor.cs
```
  22dba28e
- ChallangerController geschrieben und prefab dafür in resources, welches über... · 72635724
  Marcel Kuehn authored Sep 27, 2018
```
ChallangerController geschrieben und prefab dafür in resources, welches über inLevelCotroller automatisch geladen wird wenn varibale in GameManager true ist.

Die Position des Challanger ist scheinbar noch nicht die des players
```
  72635724
- Merge branch 'master' into feature/Level · 4c45158c
  Christopher Benes authored Sep 27, 2018
  
  4c45158c
- Level 10 mit Laserrrrrrrrrrrrn · af1f523e
  Christopher Benes authored Sep 27, 2018
  
  af1f523e
- Deadly Laser · 5af89f66
  Markus Schlösser authored Sep 27, 2018
  
  5af89f66
- Fixed Main Meu Buttons · fa0cf46c
  Markus Schlösser authored Sep 27, 2018
  
  fa0cf46c
- Merge branch 'master' into feature/Level · f367fa1e
  Christopher Benes authored Sep 27, 2018
  
  f367fa1e
- LevelEnd eingebaut · b024fa69
  Christopher Benes authored Sep 27, 2018
  
  b024fa69
- Fixed various cannon related bugs · efac3570
  Jan Meissner authored Sep 27, 2018
  
  efac3570
- Merge remote-tracking branch 'origin/master' · c78599d4
  Jan Meissner authored Sep 27, 2018
  
  c78599d4