Commits · deaed16e08b59a5c363d353d0c28d8369f48c1aa · GDW-SS-18 / to-the-surface

29 Sep, 2018 31 commits
- Merge remote-tracking branch 'origin/master' · deaed16e
  Jan Meissner authored Sep 29, 2018
  
  deaed16e
- Updated LevelPreviews with new lighting · 4ed3edd4
  Jan Meissner authored Sep 29, 2018
  
  4ed3edd4
- Merge branch 'master' into feature/Level · 3bf91d46
  Christopher Benes authored Sep 29, 2018
  
  3bf91d46
- Level20 · 64c16844
  Christopher Benes authored Sep 29, 2018
  
  64c16844
- Cannons can now shoot through enviroment · d074bf89
  Markus Schlösser authored Sep 29, 2018
  
  d074bf89
- Added reset to lasers · 3629c83f
  Markus Schlösser authored Sep 29, 2018
  
  3629c83f
- Merge remote-tracking branch 'origin/master' · 64932f68
  Jan Meissner authored Sep 29, 2018
  
  64932f68
- Fixed lights having an outline · ba3b55bb
  Jan Meissner authored Sep 29, 2018
  
  ba3b55bb
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GDW-SS-18/unity/to-the-surface · 41e58555
  Christopher Benes authored Sep 29, 2018
  
  41e58555
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GDW-SS-18/unity/to-the-surface · c6ff4415
  Markus Schlösser authored Sep 29, 2018
  
  c6ff4415
- Updated level 1-5 lighting · 4d8ae750
  Markus Schlösser authored Sep 29, 2018
  
  4d8ae750
- Level 10-12 fixed · 6c8ce5e5
  Christopher Benes authored Sep 29, 2018
  
  6c8ce5e5
- Merge branch 'master' into feature/Level · 692d3796
  Christopher Benes authored Sep 29, 2018
  
  692d3796
- Level 20 Update · f2296104
  Christopher Benes authored Sep 29, 2018
  
  f2296104
- Merge branch 'master' into feature/lighting · 0160d667
  Markus Schlösser authored Sep 29, 2018
```
# Conflicts:
#	Assets/Resources/ChallengerModus.prefab
#	Assets/_Game/Scenes/Levels/Level10.unity
#	Assets/_Game/Scenes/Levels/Level11.unity
#	Assets/_Game/Scenes/Levels/Level12.unity
```
  0160d667
- Updated more levels · 9e15b545
  Markus Schlösser authored Sep 29, 2018
  
  9e15b545
- Level 18+19 fertiggestellt, Level 20 angefangen · 22492b55
  Christopher Benes authored Sep 29, 2018
  
  22492b55
- Updated level 7 and 8 lighting · 70d6064c
  Markus Schlösser authored Sep 29, 2018
  
  70d6064c
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GDW-SS-18/unity/to-the-surface · 44e578ec
  Christopher Benes authored Sep 29, 2018
  
  44e578ec
- Fixes · eb8a9bc1
  Christopher Benes authored Sep 29, 2018
  
  eb8a9bc1
- Fixed a bug regarding the LevelSelect · 5495c707
  Jan Meissner authored Sep 29, 2018
  
  5495c707
- Updated name of challenger particles · ebcf6987
  Markus Schlösser authored Sep 29, 2018
  
  ebcf6987
- Added Post Processing updated Challenger · 0d068fc1
  Markus Schlösser authored Sep 29, 2018
  
  0d068fc1
- Merge branch 'master' into feature/Level · 4117043b
  Christopher Benes authored Sep 29, 2018
```
# Conflicts:
#	Assets/_Game/Scenes/Levels/Level15.unity
```
  4117043b
- Level 18 gebaut, polishing anderer Levels · 08d6143a
  Christopher Benes authored Sep 29, 2018
  
  08d6143a
- Added lights to Level 1 - 6 · 4b1824a9
  Markus Schlösser authored Sep 29, 2018
  
  4b1824a9
- Fixed fire animation loop · 08067480
  Jan Meissner authored Sep 29, 2018
  
  08067480
- Reduced player hitbox, improved LevelSelect scripts, added preview for Level 13-14 · ba4aa6f5
  Jan Meissner authored Sep 29, 2018
  
  ba4aa6f5
- Merge branch 'master' into feature/Level · ee576b24
  Christopher Benes authored Sep 29, 2018
  
  ee576b24
- Updated cannon and fixed challenger collision · 5db7d444
  Markus Schlösser authored Sep 29, 2018
  
  5db7d444
- unwichtig · adae1db1
  Christopher Benes authored Sep 29, 2018
  
  adae1db1
28 Sep, 2018 9 commits
- Merge branch 'master' into feature/Level · 9851e683
  Christopher Benes authored Sep 28, 2018
```
# Conflicts:
#	Assets/_Game/Prefabs/Cannon.prefab
#	Assets/_Game/Scripts/CannonController.cs
```
  9851e683
- Level 15+17 gebaut · 05160591
  Christopher Benes authored Sep 28, 2018
  
  05160591
- Fixed cannon fire rate, deactivated wheels in prefab for now · 93a690f1
  Jan Meissner authored Sep 28, 2018
  
  93a690f1
- Merge remote-tracking branch 'origin/master' · c2f212de
  Marcel Kuehn authored Sep 28, 2018
  
  c2f212de
- Challengermode auf 2 Sekunden gesetzte /von drei) (ist machbar) · 37a63ffa
  Marcel Kuehn authored Sep 28, 2018
```
Alle lvl geplaytested (alle machbar auch mit 2 sek chall mod)
im Main Menu im Toggle die Methode zum toggln des Chal mod eingefügt da fehlte
```
  37a63ffa
- Improved some menu elements · 4c7e3195
  Jan Meissner authored Sep 28, 2018
  
  4c7e3195
- 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