Commits · master · GameDevWeek / Sommersemester 2019 / Unity / Touch me if you can

21 Sep, 2019 40 commits
- FINAL FINAL FINAL FINAL FINAL FINAL · 9eba8a08
  Jonas authored Sep 21, 2019
  
  9eba8a08
- Merge branch 'master' of... · 79299824
  Jonas authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can

 Conflicts:
	Assets/_Game/Materials/Materials.meta
```
  79299824
- kp sry · 3d4b2445
  Jonas authored Sep 21, 2019
  
  3d4b2445
- kp sry · b9c65c9f
  Jonas authored Sep 21, 2019
  
  b9c65c9f
- Merge branch 'master' of... · 0f4d3057
  Sven authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  0f4d3057
- SvensfancyScene+Mats · 74af3927
  Sven authored Sep 21, 2019
  
  74af3927
- Merge branch 'master' of... · 23c1ed5e
  Jonas authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  23c1ed5e
- Updating UI · 0c0a0da3
  Jonas authored Sep 21, 2019
  
  0c0a0da3
- Merge remote-tracking branch 'origin/master' · 733ede15
  bogomil authored Sep 21, 2019
  
  733ede15
- Color for the Players · b6f3b57e
  bogomil authored Sep 21, 2019
  
  b6f3b57e
- Merge branch 'master' of... · a6717723
  Sven authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  a6717723
- SvensfancyScene · c52b3801
  Sven authored Sep 21, 2019
  
  c52b3801
- Merge branch 'master' of... · 9da3f4f2
  Patrick Stengel authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  9da3f4f2
- i promise my last next next next System change · 4be6549a
  Patrick Stengel authored Sep 21, 2019
  
  4be6549a
- Merge branch 'master' of... · 94b01f3c
  Jonas authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  94b01f3c
- Duplicate of Showcountdown removed · 12e7c702
  Jonas authored Sep 21, 2019
  
  12e7c702
- Duplicate of Showcountdown removed · ae654dd7
  Jonas authored Sep 21, 2019
  
  ae654dd7
- Merge branch 'master' of... · a63f8fd5
  Patrick Stengel authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can

 Conflicts:
	Assets/_Game/Scripts/UI/CharacterCustomization.cs
	Assets/_Game/Scripts/UI/PlayerTags.cs
```
  a63f8fd5
- the final neyt next next System overhaul · 5960751d
  Patrick Stengel authored Sep 21, 2019
  
  5960751d
- GameHandler v2 · 6de62506
  Jonas authored Sep 21, 2019
  
  6de62506
- Merge branch 'master' of... · 320b7c7d
  Jonas authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  320b7c7d
- Character Customization with Updated Resets · 06e27e80
  Jonas authored Sep 21, 2019
  
  06e27e80
- Merge branch 'master' of... · 31caf1fd
  bogomil authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  31caf1fd
- Color for the Players · 497d90a2
  bogomil authored Sep 21, 2019
  
  497d90a2
- Merge remote-tracking branch 'origin/master' · 563cd657
  Jonas authored Sep 21, 2019
```
# Conflicts:
#	Assets/_Game/Prefabs/PlayerManagerPrefabs/Player1Manager.prefab
#	Assets/_Game/Prefabs/PlayerPrefabs_wMovement/Body.prefab
#	Assets/_Game/Scenes/CharacterCustomization.unity
#	Assets/_Game/Scenes/MainLevelSwitched.unity
#	Assets/_Game/Scripts/GameManager/GameHandler.cs
#	Assets/_Game/Scripts/UI/CharacterCustomization.cs
#	Assets/_Game/Scripts/UI/ShowCountdown.cs
```
  563cd657
- Score Calculation · 2fff6796
  Jonas authored Sep 21, 2019
  
  2fff6796
- Merge branch 'master' of... · 77c428eb
  Patrick Stengel authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  77c428eb
- next next System overhaul · df56e49f
  Patrick Stengel authored Sep 21, 2019
  
  df56e49f
- Merge branch 'master' of... · d97937cc
  bogomil authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  d97937cc
- Color for the Players · af38f95a
  bogomil authored Sep 21, 2019
  
  af38f95a
- Score Calculation · 97452fe6
  Jonas authored Sep 21, 2019
  
  97452fe6
- Merge branch 'master' of... · 366cbe9f
  Patrick Stengel authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can

 Conflicts:
	Assets/ShowCountdown.cs
```
  366cbe9f
- next System overhaul · 8586460e
  Patrick Stengel authored Sep 21, 2019
  
  8586460e
- Merge branch 'master' of... · f9003744
  Sven authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  f9003744
- pcc update · 58d10300
  Sven authored Sep 21, 2019
  
  58d10300
- Merge branch 'master' of... · 5ebca023
  Adrian Wegener authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  5ebca023
- Color Grading · eb33acc6
  Adrian Wegener authored Sep 21, 2019
  
  eb33acc6
- Merge branch 'master' of... · 79ba2f6a
  bogomil authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  79ba2f6a
- Color for the Players · ebdf89f6
  bogomil authored Sep 21, 2019
  
  ebdf89f6
- Merge branch 'master' of... · 17f8d808
  Jonas authored Sep 21, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  17f8d808