Skip to content

M
man-in-the-mirror
Switch branch/tag
History Find file
  • 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
..
default_mannequin.prefab Loading commit data...
default_mannequin.prefab.meta Loading commit data...
mannequin (1).prefab Loading commit data...
mannequin (1).prefab.meta Loading commit data...
mannequin (2).prefab Loading commit data...
mannequin (2).prefab.meta Loading commit data...
mannequin (3).prefab Loading commit data...
mannequin (3).prefab.meta Loading commit data...
mannequin (4).prefab Loading commit data...
mannequin (4).prefab.meta Loading commit data...
mannequin (5).prefab Loading commit data...
mannequin (5).prefab.meta Loading commit data...
mannequin_scattered_black.prefab Loading commit data...
mannequin_scattered_black.prefab.meta Loading commit data...
mannequin_scattered_white.prefab Loading commit data...
mannequin_scattered_white.prefab.meta Loading commit data...
stage1_1.json Loading commit data...
stage1_1.json.meta Loading commit data...
stage1_2.json Loading commit data...
stage1_2.json.meta Loading commit data...
stage1_3.json Loading commit data...
stage1_3.json.meta Loading commit data...
stage1_4.json Loading commit data...
stage1_4.json.meta Loading commit data...
stage2_1.json Loading commit data...
stage2_1.json.meta Loading commit data...
stage2_2.json Loading commit data...
stage2_2.json.meta Loading commit data...
stage2_3.json Loading commit data...
stage2_3.json.meta Loading commit data...
stage2_4.json Loading commit data...
stage2_4.json.meta Loading commit data...
stage3_1.json Loading commit data...
stage3_1.json.meta Loading commit data...
stage3_2.json Loading commit data...
stage3_2.json.meta Loading commit data...
stage3_3.json Loading commit data...
stage3_3.json.meta Loading commit data...
stage3_4.json Loading commit data...
stage3_4.json.meta Loading commit data...
stage3_5.json Loading commit data...
stage3_5.json.meta Loading commit data...