Commits · b9b5b4e17b28b1e222c833be71304d97ce36baab · Tommé Nöll / seedling · GitLab

06 Oct, 2019 40 commits
- Merge branch 'tomme' · b9b5b4e1
  Tommé Nöll authored Oct 06, 2019
  
  b9b5b4e1
- corruption + light L2, L3 · 2c713b0b
  Tommé Nöll authored Oct 06, 2019
  
  2c713b0b
- Licht + Korruption L1 · f3203e2a
  Tommé Nöll authored Oct 06, 2019
  
  f3203e2a
- Adjusted flying platforms in boss level a bit, credits appear after boss death now · 6d00e079
  Max authored Oct 06, 2019
  
  6d00e079
- stalaktit licht · c88f49ec
  Tommé Nöll authored Oct 06, 2019
  
  c88f49ec
- Merge branch 'tomme' · 26daf705
  Tommé Nöll authored Oct 06, 2019
  
  26daf705
- pilz boss UI · e9b49d21
  Tommé Nöll authored Oct 06, 2019
  
  e9b49d21
- Added flying platform animation and added sounds to crawler · d9b5cdff
  Max authored Oct 06, 2019
  
  d9b5cdff
- L2 durchgänge fixed + visuals · 45f1ea86
  Doemoetoer Kozak authored Oct 06, 2019
  
  45f1ea86
- Merge branch 'tomme' · 0cf4b2c5
  Tommé Nöll authored Oct 06, 2019
  
  0cf4b2c5
- integrated boss fight music · d25bd298
  Tommé Nöll authored Oct 06, 2019
  
  d25bd298
- Durchgang zu L3 fixed · d84163ca
  Doemoetoer Kozak authored Oct 06, 2019
  
  d84163ca
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/noellt/seedling · dc41f038
  Max authored Oct 06, 2019
  
  dc41f038
- Added camera shake to transition in level 3 · 79df61ec
  Max authored Oct 06, 2019
  
  79df61ec
- Pilzgrotte L1 ausgang ist nurn permanent versperrt · b3524f93
  Doemoetoer Kozak authored Oct 06, 2019
  
  b3524f93
- Added camera shake to transition in level 2 · a0b0e1d5
  Max authored Oct 06, 2019
  
  a0b0e1d5
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/noellt/seedling · 3f88f9e0
  Tommé Nöll authored Oct 06, 2019
  
  3f88f9e0
- Added camera shake to transition in level, fixed compiler error · cf3a9a85
  Max authored Oct 06, 2019
  
  cf3a9a85
- Merge branch 'tomme' · 367bb7f2
  Tommé Nöll authored Oct 06, 2019
  
  367bb7f2
- added boss music transitions, not tested yet · d0599b57
  Tommé Nöll authored Oct 06, 2019
  
  d0599b57
- Fixed tutorial again · 1bde28e2
  Doemoetoer Kozak authored Oct 06, 2019
  
  1bde28e2
- Merge branch 'Dominik_' · dc95c882
  Domm29 authored Oct 06, 2019
  
  dc95c882
- OPtions und Credits finish und icon ist drin · 78975482
  Domm29 authored Oct 06, 2019
  
  78975482
- PilzGrotte Durchgänge jetzt höhlen · 9472b34b
  Doemoetoer Kozak authored Oct 06, 2019
  
  9472b34b
- added fade possibility to backgroundmusic.cs · d08aaab3
  Tommé Nöll authored Oct 06, 2019
  
  d08aaab3
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/noellt/seedling · 16d68473
  Tommé Nöll authored Oct 06, 2019
  
  16d68473
- fixed door starting open · 41bb5f5d
  Tommé Nöll authored Oct 06, 2019
  
  41bb5f5d
- Merge remote-tracking branch 'origin/ChrisMerge' · 3f66ac0d
  Doemoetoer Kozak authored Oct 06, 2019
  
  3f66ac0d
- Merge remote-tracking branch 'origin/Dominik_' · b7e08290
  Doemoetoer Kozak authored Oct 06, 2019
  
  b7e08290
- death animation · 58339eaf
  HelloLitty authored Oct 06, 2019
  
  58339eaf
- kleinkram · adfdd6d3
  Domm29 authored Oct 06, 2019
  
  adfdd6d3
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/noellt/seedling into ChrisMerge · 793c69b4
  HelloLitty authored Oct 06, 2019
  
  793c69b4
- Prettied Bosslevel · ebd5de26
  Doemoetoer Kozak authored Oct 06, 2019
  
  ebd5de26
- Added transition objective to level 3 · b99c4b68
  BlckTgr authored Oct 06, 2019
  
  b99c4b68
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/noellt/seedling into ChrisMerge · 041dcdff
  HelloLitty authored Oct 06, 2019
```
# Conflicts:
#	Assets/Scripts/Player/Life.cs
```
  041dcdff
- Merge branch 'tomme' · 42f4e81a
  Tommé Nöll authored Oct 06, 2019
  
  42f4e81a
- added some space in beginning of tutorial · 0f18d136
  Tommé Nöll authored Oct 06, 2019
  
  0f18d136
- added switch and door into tutorial, fixed lighting · ff59ec1d
  Tommé Nöll authored Oct 06, 2019
  
  ff59ec1d
- death case added · 60859dbc
  HelloLitty authored Oct 06, 2019
  
  60859dbc
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/noellt/seedling · 95dde7ca
  BlckTgr authored Oct 06, 2019
  
  95dde7ca