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

21 Sep, 2019 5 commits

Score Calculation · 97452fe6
Jonas authored Sep 21, 2019

97452fe6

Jonas authored Sep 21, 2019

Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can

17f8d808

reworked Body Movement · 27594497
Jonas authored Sep 21, 2019

27594497

Merge branch 'master' of... · 4e6a0900

bogomil 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/Scenes/CharacterCustomization.unity
	Assets/_Game/Scripts/UI/CharacterCustomization.cs

4e6a0900

Color for the Players · 5af875d3
bogomil authored Sep 21, 2019

5af875d3

20 Sep, 2019 35 commits
- Merge branch 'master' of... · 25ac5d67
  Sven authored Sep 20, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  25ac5d67
- Stuff · b36460d3
  Sven authored Sep 20, 2019
  
  b36460d3
- Merge branch 'master' of... · effdc46b
  Jonas authored Sep 20, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  effdc46b
- .. · d68bc83b
  Jonas authored Sep 20, 2019
  
  d68bc83b
- Merge branch 'master' of... · 4a47f284
  Patrick Stengel authored Sep 20, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  4a47f284
- System overhaul · 3b6afa8a
  Patrick Stengel authored Sep 20, 2019
  
  3b6afa8a
- Merge branch 'master' of... · 40bee0a0
  Jonas authored Sep 20, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  40bee0a0
- . · d68cfc77
  Jonas authored Sep 20, 2019
  
  d68cfc77
- Merge branch 'master' of... · a7cfca0d
  Sven authored Sep 20, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  a7cfca0d
- Countdownupdate · 5d78ab95
  Sven authored Sep 20, 2019
  
  5d78ab95
- Merge branch 'master' of... · c9c2c256
  Adrian Wegener authored Sep 20, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  c9c2c256
- building pack · ff02979b
  Adrian Wegener authored Sep 20, 2019
  
  ff02979b
- Merge branch 'master' of... · b0bcd2f4
  Jonas authored Sep 20, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  b0bcd2f4
- Merge branch 'master' of... · 346fde90
  Patrick Stengel authored Sep 20, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can

 Conflicts:
	Assets/_Game/Scripts/Input/SwitchPlayerManager.cs
	ProjectSettings/EditorBuildSettings.asset
```
  346fde90
- Begining to change game managing · c4e367e6
  Patrick Stengel authored Sep 20, 2019
  
  c4e367e6
- . · 42fb7454
  Jonas authored Sep 20, 2019
  
  42fb7454
- Char Customization · e04a032a
  Jonas authored Sep 20, 2019
  
  e04a032a
- Merge branch 'master' of... · 3a9e48a7
  Jonas authored Sep 20, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  3a9e48a7
- Char Customization · 0aaf9911
  Jonas authored Sep 20, 2019
  
  0aaf9911
- Merge branch 'master' of... · e19cfea4
  bogomil authored Sep 20, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can

 Conflicts:
	ProjectSettings/EditorBuildSettings.asset
```
  e19cfea4
- nothing · b6a51c70
  bogomil authored Sep 20, 2019
  
  b6a51c70
- update · ab1f674d
  Jonas authored Sep 20, 2019
  
  ab1f674d
- Merge branch 'master' of... · 9d406b15
  Jonas authored Sep 20, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  9d406b15
- nothing important. just for safety · db55eb2b
  Jonas authored Sep 20, 2019
  
  db55eb2b
- Merge branch 'master' of... · 478fb5ff
  Patrick Stengel authored Sep 20, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  478fb5ff
- But here is another change on the input system · 6b503db5
  Patrick Stengel authored Sep 20, 2019
  
  6b503db5
- Switching Players works (Bug if other player doesnt use his controls at roundstart) · df584bbd
  Jonas authored Sep 20, 2019
  
  df584bbd
- Merge branch 'master' of... · e95ede9b
  Jonas authored Sep 20, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  e95ede9b
- Switching Players works (Bug if other player doesnt use his controls at roundstart) · a824b625
  Jonas authored Sep 20, 2019
  
  a824b625
- Merge branch 'master' of... · de3504d6
  Patrick Stengel authored Sep 20, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  de3504d6
- Changes · 620af6f4
  Patrick Stengel authored Sep 20, 2019
  
  620af6f4
- Merge branch 'master' of... · 900fd1fe
  Jonas authored Sep 20, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  900fd1fe
- removed Velocity from that transitioned from previous rounds · 96e953bb
  Jonas authored Sep 20, 2019
  
  96e953bb
- Merge branch 'master' of... · 63da78f7
  Sven authored Sep 20, 2019
```
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
```
  63da78f7
- removed Velocity from that transitioned from previous rounds · 2d53d2e7
  Jonas authored Sep 20, 2019
  
  2d53d2e7