Skip to content
  • Jonas's avatar
    Merge remote-tracking branch 'origin/master' · 563cd657
    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
    563cd657