- 21 Sep, 2019 40 commits
-
-
Jonas authored
-
Jonas authored
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can Conflicts: Assets/_Game/Materials/Materials.meta
-
Jonas authored
-
Jonas authored
-
Sven authored
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
-
Sven authored
-
Jonas authored
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
-
Jonas authored
-
bogomil authored
-
bogomil authored
-
Sven authored
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
-
Sven authored
-
Patrick Stengel authored
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
-
Patrick Stengel authored
-
Jonas authored
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
-
Jonas authored
-
Jonas authored
-
Patrick Stengel authored
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
-
Patrick Stengel authored
-
Jonas authored
-
Jonas authored
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
-
Jonas authored
-
bogomil authored
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
-
bogomil authored
-
Jonas authored
# 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
-
Jonas authored
-
Patrick Stengel authored
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
-
Patrick Stengel authored
-
bogomil authored
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
-
bogomil authored
-
Jonas authored
-
Patrick Stengel authored
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can Conflicts: Assets/ShowCountdown.cs
-
Patrick Stengel authored
-
Sven authored
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
-
Sven authored
-
Adrian Wegener authored
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
-
Adrian Wegener authored
-
bogomil authored
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
-
bogomil authored
-
Jonas authored
Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
-