• 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
..
Animation Loading commit data...
Materials Loading commit data...
texture Loading commit data...
Animation.meta Loading commit data...
Materials.meta Loading commit data...
camera.fbx Loading commit data...
camera.fbx.meta Loading commit data...
case.fbx Loading commit data...
case.fbx.meta Loading commit data...
floor.fbx Loading commit data...
floor.fbx.meta Loading commit data...
jackson.fbx Loading commit data...
jackson.fbx.meta Loading commit data...
mannequin.fbx Loading commit data...
mannequin.fbx.meta Loading commit data...
texture.meta Loading commit data...
wall.fbx Loading commit data...
wall.fbx.meta Loading commit data...