• 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
..
Mannequin Loading commit data...
Map Loading commit data...
MapEditor Loading commit data...
MapObjects Loading commit data...
Objects Loading commit data...
UIs Loading commit data...
GameManager.prefab Loading commit data...
GameManager.prefab.meta Loading commit data...
Mannequin.meta Loading commit data...
Map.meta Loading commit data...
MapEditor.meta Loading commit data...
MapManager.prefab Loading commit data...
MapManager.prefab.meta Loading commit data...
MapObjects.meta Loading commit data...
Navmesh.prefab Loading commit data...
Navmesh.prefab.meta Loading commit data...
Objects.meta Loading commit data...
Player.prefab Loading commit data...
Player.prefab.meta Loading commit data...
PlayerController.prefab Loading commit data...
PlayerController.prefab.meta Loading commit data...
TestTools.prefab Loading commit data...
TestTools.prefab.meta Loading commit data...
UIs.meta Loading commit data...