• saad's avatar
    Merge branch 'NewUIv2' into NewUI · d4c56d29
    saad authored
    # Conflicts:
    #	My project/Assets/App/Infrastructure/Core/AppRouter.cs
    #	My project/Assets/AppUI/NewAppUI/Login.uxml
    #	My project/Assets/UniversalRenderPipelineGlobalSettings.asset
    #	My project/ProjectSettings/ProjectVersion.txt
    d4c56d29
Name
Last commit
Last update
..
Scene Loading commit data...
USS Loading commit data...
DotFloating.prefab Loading commit data...
DotFloating.prefab.meta Loading commit data...
DotFloating.renderTexture Loading commit data...
DotFloating.renderTexture.meta Loading commit data...
FPSDisplay.cs Loading commit data...
FPSDisplay.cs.meta Loading commit data...
Login.uxml Loading commit data...
Login.uxml.meta Loading commit data...
Mainmenu.uxml Loading commit data...
Mainmenu.uxml.meta Loading commit data...
Scene.meta Loading commit data...
Segoe UI Emoji Regular.ttf Loading commit data...
Segoe UI Emoji Regular.ttf.meta Loading commit data...
USS.meta Loading commit data...