• 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
..
Bullets Loading commit data...
Extensions Loading commit data...
Generals Loading commit data...
Interactors Loading commit data...
Managers Loading commit data...
Map Loading commit data...
MapEditor Loading commit data...
Bullets.meta Loading commit data...
CameraController.cs Loading commit data...
CameraController.cs.meta Loading commit data...
Extensions.meta Loading commit data...
Generals.meta Loading commit data...
Interactors.meta Loading commit data...
Managers.meta Loading commit data...
Map.meta Loading commit data...
MapEditor.meta Loading commit data...
MapManager.cs Loading commit data...
MapManager.cs.meta Loading commit data...
MirrorReflect.cs Loading commit data...
MirrorReflect.cs.meta Loading commit data...
Player.cs Loading commit data...
Player.cs.meta Loading commit data...
PlayerController.cs Loading commit data...
PlayerController.cs.meta Loading commit data...
TestTools.cs Loading commit data...
TestTools.cs.meta Loading commit data...