Commits · 6d151f9c6d3b85a6f5bb45f45bc4f18807412947 · GameDevWeek / Sommersemester 2019 / Unity / Baba is mutated

21 Sep, 2019 24 commits
- 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
- Level 0 Toxic final · 461f36ac
  Fredrik Kappmeier authored Sep 21, 2019
  
  461f36ac
- Level 0 Feuer final · 4e036abd
  Fredrik Kappmeier authored Sep 21, 2019
  
  4e036abd
- Level 0 Normal final · 058e33bd
  Fredrik Kappmeier authored Sep 21, 2019
  
  058e33bd
- Level 0 Normal · ee86119b
  Fredrik Kappmeier authored Sep 21, 2019
  
  ee86119b
- Teleport idle fix · 36228cfd
  Marcel Bieg authored Sep 21, 2019
  
  36228cfd
- level1 fix · 9988aa6f
  Marcel Bieg authored Sep 21, 2019
  
  9988aa6f
- Update · 006b6450
  Fredrik Kappmeier authored Sep 21, 2019
  
  006b6450
20 Sep, 2019 16 commits
- main menu · ada1e19a
  Sebastian Woelfel authored Sep 21, 2019
  
  ada1e19a
- some cleaning up · d7bbd4da
  Sebastian Woelfel authored Sep 21, 2019
  
  d7bbd4da
- camera bounds depending on map size · c6cbda9d
  Sebastian Woelfel authored Sep 20, 2019
  
  c6cbda9d
- Sachen · 089251ed
  Sebastian Woelfel authored Sep 20, 2019
  
  089251ed
- Merge branch 'master' of... · 0476f5e7
  Sebastian Woelfel authored Sep 20, 2019
```
Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/sommersemester-2019/unity/baba-is-mutated

# Conflicts:
#	Assets/_Game/Animations/bloeki_normal_teleport.meta
#	Assets/_Game/Prefabs/EventSystem.prefab.meta
#	Assets/_Game/Scenes/Level 1.unity
#	Assets/_Game/Scenes/Level 2.unity
#	Assets/_Game/Sprites/Tilesets/TileSet.meta
```
  0476f5e7
- Sachen · 96f4c5b7
  Sebastian Woelfel authored Sep 20, 2019
  
  96f4c5b7
- Merge branch 'master' of... · 7845f7d5
  Marcel Bieg authored Sep 20, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/baba-is-mutated

# Conflicts:
#	Assets/_Game/Scenes/Level 1.unity
```
  7845f7d5
- Teleport Animation beta · 85e13706
  Marcel Bieg authored Sep 20, 2019
  
  85e13706
- Sachen · 6180e8c9
  Sebastian Woelfel authored Sep 20, 2019
  
  6180e8c9
- pause menu · 2a1b77c7
  Sebastian Woelfel authored Sep 20, 2019
  
  2a1b77c7
- Merge branch 'master' of... · 6566bf5c
  Sebastian Woelfel authored Sep 20, 2019
```
Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/sommersemester-2019/unity/baba-is-mutated
```
  6566bf5c
- main menu · 711a2a22
  Sebastian Woelfel authored Sep 20, 2019
  
  711a2a22
- Teleporter Polish · a0d76ab8
  Fredrik Kappmeier authored Sep 20, 2019
  
  a0d76ab8
- bloeki Idle Fire Animation · 8f48b598
  Marcel Bieg authored Sep 20, 2019
  
  8f48b598
- Teleporter pretty · c53a63aa
  Fredrik Kappmeier authored Sep 20, 2019
  
  c53a63aa
- Current Status · 3946a24b
  Fredrik Kappmeier authored Sep 20, 2019
  
  3946a24b