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

08 Oct, 2018 4 commits
- Update .gitlab-ci.yml · 66925e00
  Oliver Biwer authored Oct 08, 2018
  
  66925e00
- webgl build · 71a616d3
  Soraphis authored Oct 08, 2018
  
  71a616d3
- smaller fixes · 1713b5bb
  Soraphis authored Oct 08, 2018
```
touch input
cleanups
```
  1713b5bb
- smaller fixes · e5fe8e08
  Soraphis authored Oct 08, 2018
```
touch input
cleanups
```
  e5fe8e08
01 Oct, 2018 1 commit
- Added Credits · 0dbdf554
  Markus Schlösser authored Oct 01, 2018
  
  0dbdf554
30 Sep, 2018 1 commit
- Added/updated LevelSelect previews · 6cf4dd8b
  Jan Meissner authored Sep 30, 2018
  
  6cf4dd8b
29 Sep, 2018 34 commits
- Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GDW-SS-18/unity/to-the-surface · eded8ba1
  Markus Schlösser authored Sep 30, 2018
  
  eded8ba1
- Updated level 17 - 19 · 39936ac2
  Markus Schlösser authored Sep 30, 2018
  
  39936ac2
- Updated level 17 - 19 · cd09c4ea
  Markus Schlösser authored Sep 30, 2018
  
  cd09c4ea
- Updated levels 14-16, reworked part of level 16 to be possible · f1f27864
  Markus Schlösser authored Sep 29, 2018
  
  f1f27864
- Merge branch 'master' into feature/Level · d48222c6
  Christopher Benes authored Sep 29, 2018
  
  d48222c6
- Level 20 Update · 668e21d2
  Christopher Benes authored Sep 29, 2018
  
  668e21d2
- 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