Commits · master · GameDevWeek / Sommersemester 2019 / Unity / Best Enemies Forever

22 Sep, 2019 21 commits
- menu and more · dbe67ca7
  Skydiver3 authored Sep 22, 2019
  
  dbe67ca7
- Merge branch 'master' of... · 9f3e0e20
  Skydiver3 authored Sep 22, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/best-enemies-forever
```
  9f3e0e20
- Merge branch 'master' of... · 4cd25b47
  Skydiver3 authored Sep 22, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/best-enemies-forever
```
  4cd25b47
- Merge remote-tracking branch 'origin/master' · 622271cf
  Games@thm authored Sep 22, 2019
  
  622271cf
- Stuff · c2a22dfb
  Games@thm authored Sep 22, 2019
  
  c2a22dfb
- Postprocessing; Menu · 1b54802d
  Skydiver3 authored Sep 22, 2019
  
  1b54802d
- Merge remote-tracking branch 'origin/master' · 55a802f6
  M-e-e authored Sep 22, 2019
  
  55a802f6
- Story Audio Fix · 86ca110c
  M-e-e authored Sep 22, 2019
  
  86ca110c
- Stuff · d5d28e5d
  Games@thm authored Sep 22, 2019
  
  d5d28e5d
- Merge remote-tracking branch 'origin/master' · 4bed95c8
  Games@thm authored Sep 22, 2019
  
  4bed95c8
- Intro Load · 195138eb
  Games@thm authored Sep 22, 2019
  
  195138eb
- bug fixed · 261e6574
  Leona Kirchem authored Sep 22, 2019
  
  261e6574
- Merge remote-tracking branch 'origin/master' · 07e77181
  M-e-e authored Sep 22, 2019
  
  07e77181
- Story Audio Fix · 05a950f5
  M-e-e authored Sep 22, 2019
  
  05a950f5
- Merge remote-tracking branch 'origin/master' · 4afa5fa7
  Games@thm authored Sep 22, 2019
  
  4afa5fa7
- LevelSelect fertig · ab308267
  Games@thm authored Sep 22, 2019
  
  ab308267
- Merge remote-tracking branch 'origin/master' · d77f599c
  M-e-e authored Sep 22, 2019
```
# Conflicts:
#	Assets/_Game/Scenes/Levels/Intro.unity
```
  d77f599c
- 1LVL Story · 4dc7148b
  M-e-e authored Sep 22, 2019
  
  4dc7148b
- levers work with checkpoints now:) · aba676c0
  Skydiver3 authored Sep 22, 2019
  
  aba676c0
- text eingepflegt · 0995e9f8
  Leona Kirchem authored Sep 22, 2019
  
  0995e9f8
- LevelSelect · 97317e96
  Games@thm authored Sep 22, 2019
  
  97317e96
21 Sep, 2019 19 commits
- Merge remote-tracking branch 'origin/master' · c046cd02
  Games@thm authored Sep 22, 2019
  
  c046cd02
- Postprocessing · 9a05f862
  Games@thm authored Sep 22, 2019
  
  9a05f862
- Merge remote-tracking branch 'origin/master' · 95a767d4
  Leona Kirchem authored Sep 22, 2019
```
# Conflicts:
#	Assets/PostProcessing.meta
```
  95a767d4
- some next level changes · 69016d8c
  Leona Kirchem authored Sep 22, 2019
  
  69016d8c
- Merge remote-tracking branch 'origin/master' · 417c3168
  Games@thm authored Sep 22, 2019
  
  417c3168
- audiotweaks · 433a3779
  Games@thm authored Sep 22, 2019
  
  433a3779
- Merge remote-tracking branch 'origin/master' · 2c8ac5a3
  M-e-e authored Sep 22, 2019
  
  2c8ac5a3
- Post Processing Base · de27b53d
  M-e-e authored Sep 22, 2019
  
  de27b53d
- Merge branch 'master' of... · 6b18b1e3
  Skydiver3 authored Sep 22, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/best-enemies-forever
```
  6b18b1e3
- menus · 2c9b677b
  Skydiver3 authored Sep 22, 2019
  
  2c9b677b
- Merge remote-tracking branch 'origin/master' · a17118c0
  Games@thm authored Sep 22, 2019
  
  a17118c0
- audiotweaks · 7d2171d9
  Games@thm authored Sep 22, 2019
  
  7d2171d9
- Merge remote-tracking branch 'origin/master' · 888165df
  M-e-e authored Sep 22, 2019
  
  888165df
- Potion Sound · 7bb81f7c
  M-e-e authored Sep 22, 2019
  
  7bb81f7c
- Merge remote-tracking branch 'origin/master' · a4efffcb
  Games@thm authored Sep 22, 2019
  
  a4efffcb
- audiotweaks · a709e212
  Games@thm authored Sep 22, 2019
  
  a709e212
- Merge remote-tracking branch 'origin/master' · 00bf6cb6
  M-e-e authored Sep 22, 2019
  
  00bf6cb6
- Animation? · 84627d6d
  M-e-e authored Sep 22, 2019
  
  84627d6d
- Merge branch 'master' of... · ccaa1d43
  Skydiver3 authored Sep 22, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/best-enemies-forever
```
  ccaa1d43