Commits · master · GameDevWeek / Sommersemester 2019 / Unity / Baba is mutated

21 Sep, 2019 40 commits
- FINAL CHANGES · 17d86bae
  Marcel Bieg authored Sep 22, 2019
  
  17d86bae
- Merge branch 'master' of... · 9467afe0
  Marcel Bieg authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/baba-is-mutated
```
  9467afe0
- Level 3 · e0ed4bc6
  Marcel Bieg authored Sep 21, 2019
  
  e0ed4bc6
- super · 07f85039
  Sebastian Woelfel authored Sep 21, 2019
  
  07f85039
- hole · aeacf84c
  Sebastian Woelfel authored Sep 21, 2019
  
  aeacf84c
- Merge branch 'master' of... · 182d141f
  Sebastian Woelfel authored Sep 21, 2019
```
Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/sommersemester-2019/unity/baba-is-mutated
```
  182d141f
- box smooth movement · 389843b4
  Sebastian Woelfel authored Sep 21, 2019
  
  389843b4
- fix für sachen · 5dc70727
  Marcel Bieg authored Sep 21, 2019
  
  5dc70727
- Level 2 finished · f33da9f0
  Fredrik Kappmeier authored Sep 21, 2019
  
  f33da9f0
- Merge branch 'master' of... · b9dca941
  Marcel Bieg authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/baba-is-mutated

# Conflicts:
#	Assets/_Game/Animations/Death_toxic.meta
#	Assets/_Game/Prefabs/CreditsCanvas.prefab.meta
#	Assets/_Game/Sprites/Tilesets/TileSet.meta
```
  b9dca941
- Todesanimationen für Toxic + electric effect · e73fed32
  Marcel Bieg authored Sep 21, 2019
  
  e73fed32
- Merge branch 'master' of... · add6a02b
  Fredrik Kappmeier authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/baba-is-mutated
```
  add6a02b
- Polishing · 612fba5d
  Fredrik Kappmeier authored Sep 21, 2019
  
  612fba5d
- Merge branch 'master' of... · ed47c6a8
  Sebastian Woelfel authored Sep 21, 2019
```
Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/sommersemester-2019/unity/baba-is-mutated
```
  ed47c6a8
- credits assets · 33ddceb7
  Sebastian Woelfel authored Sep 21, 2019
  
  33ddceb7
- Merge branch 'master' of... · e5248cf1
  Marcel Bieg authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/baba-is-mutated

# Conflicts:
#	Assets/_Game/Scenes/Level 0 Toxic.unity
```
  e5248cf1
- toxic level · 64b9936e
  Marcel Bieg authored Sep 21, 2019
  
  64b9936e
- Druckplatten Tutorial Level, Druckpatten und Toxic vertauscht · 10afaf7d
  Fredrik Kappmeier authored Sep 21, 2019
  
  10afaf7d
- Merge branch 'master' of... · ed8458b9
  Fredrik Kappmeier authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/baba-is-mutated

# Conflicts:
#	Assets/_Game/Scenes/Level 0 Druckplatten.unity.meta
```
  ed8458b9
- Toxic Tutorial Update + Druckplatten Tutorial · e2eda2b0
  Fredrik Kappmeier authored Sep 21, 2019
  
  e2eda2b0
- death canvas asset · e7158a68
  Sebastian Woelfel authored Sep 21, 2019
  
  e7158a68
- Merge branch 'master' of... · c03537c5
  Marcel Bieg authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/baba-is-mutated

# Conflicts:
#	Assets/_Game/Graphics/Druckplatte.png.meta
#	Assets/_Game/Prefabs/Druckplatte.prefab
```
  c03537c5
- durckplatten · 010f5f7b
  Marcel Bieg authored Sep 21, 2019
  
  010f5f7b
- Level polish for Build · 6d151f9c
  Fredrik Kappmeier authored Sep 21, 2019
  
  6d151f9c
- update toxic field · b4a6801d
  Marcel Bieg authored Sep 21, 2019
  
  b4a6801d
- Merge branch 'master' of... · 01833d60
  Fredrik Kappmeier authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/baba-is-mutated
```
  01833d60
- Update · 5cc5336d
  Fredrik Kappmeier authored Sep 21, 2019
  
  5cc5336d
- Teleport Animation 3/3 · 01666a43
  Marcel Bieg authored Sep 21, 2019
  
  01666a43
- Level 1 polish · 77c2240a
  Fredrik Kappmeier authored Sep 21, 2019
  
  77c2240a
- Status update · 71ff0dca
  Fredrik Kappmeier authored Sep 21, 2019
  
  71ff0dca
- Teleport (2/3) · 5fdf1905
  Marcel Bieg authored Sep 21, 2019
  
  5fdf1905
- Merge branch 'master' of... · ba036b50
  Sebastian Woelfel authored Sep 21, 2019
```
Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/sommersemester-2019/unity/baba-is-mutated
```
  ba036b50
- pause menu assets · 90832473
  Sebastian Woelfel authored Sep 21, 2019
  
  90832473
- Merge branch 'master' of... · b3a44e76
  Fredrik Kappmeier authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/baba-is-mutated
```
  b3a44e76
- Merge branch 'master' of... · 6e94395d
  Sebastian Woelfel authored Sep 21, 2019
```
Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/sommersemester-2019/unity/baba-is-mutated
```
  6e94395d
- attached main menu assets · 260aa241
  Sebastian Woelfel authored Sep 21, 2019
  
  260aa241
- Level 0 graphical polish all · fe6b2ba4
  Fredrik Kappmeier authored Sep 21, 2019
  
  fe6b2ba4
- teleport animation (1/2) · b3b0a99f
  Marcel Bieg authored Sep 21, 2019
  
  b3b0a99f
- Build Settings · 912d4732
  Fredrik Kappmeier authored Sep 21, 2019
  
  912d4732
- Level 0 Electro final · daf8f4e5
  Fredrik Kappmeier authored Sep 21, 2019
  
  daf8f4e5