• 18신대성's avatar
    Merge remote-tracking branch 'origin/map' into polish · 425b0e0a
    18신대성 authored
    # Conflicts:
    #	Assets/Prefabs/Objects/Mannequin/stage1_1.json
    #	Assets/Prefabs/Objects/Mannequin/stage1_1.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage1_2.json
    #	Assets/Prefabs/Objects/Mannequin/stage1_2.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage1_3.json
    #	Assets/Prefabs/Objects/Mannequin/stage1_3.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage1_4.json
    #	Assets/Prefabs/Objects/Mannequin/stage1_4.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage2_1.json
    #	Assets/Prefabs/Objects/Mannequin/stage2_1.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage2_2.json
    #	Assets/Prefabs/Objects/Mannequin/stage2_2.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage2_3.json
    #	Assets/Prefabs/Objects/Mannequin/stage2_3.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage2_4.json
    #	Assets/Prefabs/Objects/Mannequin/stage2_4.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage3_1.json
    #	Assets/Prefabs/Objects/Mannequin/stage3_1.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage3_2.json
    #	Assets/Prefabs/Objects/Mannequin/stage3_2.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage3_3.json
    #	Assets/Prefabs/Objects/Mannequin/stage3_3.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage3_4.json
    #	Assets/Prefabs/Objects/Mannequin/stage3_4.json.meta
    #	Assets/Prefabs/Objects/Mannequin/stage3_5.json
    #	Assets/Prefabs/Objects/Mannequin/stage3_5.json.meta
    425b0e0a
Name
Last commit
Last update
..
Bullets Loading commit data...
MapEditor Loading commit data...
MapObjects Loading commit data...
Objects Loading commit data...
UIs Loading commit data...
Bullets.meta Loading commit data...
EmptyMap.prefab Loading commit data...
EmptyMap.prefab.meta Loading commit data...
GameManager.prefab Loading commit data...
GameManager.prefab.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...
PlayerController.prefab Loading commit data...
PlayerController.prefab.meta Loading commit data...
Stage Select.prefab Loading commit data...
Stage Select.prefab.meta Loading commit data...
TestTools.prefab Loading commit data...
TestTools.prefab.meta Loading commit data...
UIs.meta Loading commit data...