• saad's avatar
    Merge branch 'mcq_edit' into pt_CS_saad · 7b654ffa
    saad authored
    # Conflicts:
    #	My project/Assets/Prefabs/CS/Canvas.prefab
    #	My project/Assets/ScienceStreet/CS/Scripts/CsUIManager.cs
    #	My project/Assets/WebGLTemplates.meta
    #	My project/Assets/WebGLTemplates/InteractiveVideo/Logo.png
    #	My project/Assets/WebGLTemplates/InteractiveVideo/index.html
    #	My project/Assets/WebGLTemplates/InteractiveVideo/index.html.meta
    #	My project/UserSettings/EditorUserSettings.asset
    #	My project/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
    #	My project/UserSettings/Layouts/default-6000.dwlt
    7b654ffa
Name
Last commit
Last update
..
Packages/com.unity.dedicated-server Loading commit data...
UniText Loading commit data...
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...
MemorySettings.asset Loading commit data...
MultiplayerManager.asset Loading commit data...
NavMeshAreas.asset Loading commit data...
PackageManagerSettings.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...
SceneTemplateSettings.json Loading commit data...
ShaderGraphSettings.asset Loading commit data...
TagManager.asset Loading commit data...
TimeManager.asset Loading commit data...
URPProjectSettings.asset Loading commit data...
UnityConnectSettings.asset Loading commit data...
VFXManager.asset Loading commit data...
VersionControlSettings.asset Loading commit data...
XRSettings.asset Loading commit data...