• 18손재민's avatar
    Merge remote-tracking branch 'origin/BS' · ec3bda99
    18손재민 authored
    # Conflicts:
    #	Assets/Data.meta
    #	Assets/Models/Animation.meta
    #	Assets/Prefabs/UIs.meta
    #	Assets/Scripts/Interactors/Mannequin.cs
    #	Assets/Scripts/PlayerController.cs
    ec3bda99
Name
Last commit
Last update
..
AudioManager.asset Loading commit data...
ClusterInputManager.asset Loading commit data...
DynamicsManager.asset Loading commit data...
EditorBuildSettings.asset Loading commit data...
EditorSettings.asset Loading commit data...
GraphicsSettings.asset Loading commit data...
InputManager.asset Loading commit data...
NavMeshAreas.asset Loading commit data...
NetworkManager.asset Loading commit data...
Physics2DSettings.asset Loading commit data...
PresetManager.asset Loading commit data...
ProjectSettings.asset Loading commit data...
ProjectVersion.txt Loading commit data...
QualitySettings.asset Loading commit data...
TagManager.asset Loading commit data...
TimeManager.asset Loading commit data...
UnityConnectSettings.asset Loading commit data...
VFXManager.asset Loading commit data...