Commits · 26f2bfe5283402d6e843de5896d63e4aa09a0eb7 · GDW-SS-18 / to-the-surface · GitLab

28 Sep, 2018 40 commits
- Merge remote-tracking branch 'origin/master' · 26f2bfe5
  Jan Meissner authored Sep 28, 2018
  
  26f2bfe5
- LevelSelect is now even more dynamic. Wow. · 0aa11835
  Jan Meissner authored Sep 28, 2018
  
  0aa11835
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GDW-SS-18/unity/to-the-surface · 23c8d563
  Christopher Benes authored Sep 28, 2018
  
  23c8d563
- Added death effect · 8df452cb
  Markus Schlösser authored Sep 28, 2018
  
  8df452cb
- Merge branch 'master' into feature/Level · cf47262f
  Christopher Benes authored Sep 28, 2018
  
  cf47262f
- Level 14 gebaut · c1097a51
  Christopher Benes authored Sep 28, 2018
  
  c1097a51
- Fixed clock not resetting internal timer · 56b73fa7
  Markus Schlösser authored Sep 28, 2018
  
  56b73fa7
- Fixed a bug preventing the level select from working as intended · 4d78f2d6
  Jan Meissner authored Sep 28, 2018
  
  4d78f2d6
- Challengermde beim ertsenmal auf false · b9b47a01
  Marcel Kuehn authored Sep 28, 2018
  
  b9b47a01
- Merge branch 'master' into feature/Level · 0473bf29
  Christopher Benes authored Sep 28, 2018
  
  0473bf29
- Levels 12+13 gebaut · 2d629868
  Christopher Benes authored Sep 28, 2018
  
  2d629868
- ChallengerModus aktivierungskasten im Hauptmenu · 8d245092
  Marcel Kuehn authored Sep 28, 2018
  
  8d245092
- Merge remote-tracking branch 'origin/master' · bba50dbe
  Jan Meissner authored Sep 28, 2018
  
  bba50dbe
- Added more LevelSelect previews, improved lockedLevel image · 0d7d9521
  Jan Meissner authored Sep 28, 2018
  
  0d7d9521
- Updated challenger prefab to partile system · 1e7e7f36
  Markus Schlösser authored Sep 28, 2018
  
  1e7e7f36
- Fixed empty level end animation · 3faf0347
  Markus Schlösser authored Sep 28, 2018
  
  3faf0347
- Fixed player collider · 79e8cc22
  Markus Schlösser authored Sep 28, 2018
  
  79e8cc22
- LevelSelect Bugfix · 4a2567dd
  Marcel Kuehn authored Sep 28, 2018
  
  4a2567dd
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GDW-SS-18/unity/to-the-surface · b43c6b48
  Markus Schlösser authored Sep 28, 2018
  
  b43c6b48
- Added animation to level end · 3b08784f
  Markus Schlösser authored Sep 28, 2018
  
  3b08784f
- Fixed player collider missing, updatet levelselect screen · 0c93be7b
  Jan Meissner authored Sep 28, 2018
  
  0c93be7b
- Updated pause menu · 370c9f40
  Markus Schlösser authored Sep 28, 2018
  
  370c9f40
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GDW-SS-18/unity/to-the-surface · 67356804
  Markus Schlösser authored Sep 28, 2018
  
  67356804
- Updated and fixed challenger mode · 4d7cc7a8
  Markus Schlösser authored Sep 28, 2018
  
  4d7cc7a8
- 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
- Added Reset on Player death · 264f5f48
  Markus Schlösser authored Sep 28, 2018
  
  264f5f48
- 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