Skip to content

M
man-in-the-mirror
Switch branch/tag
  1. 09 Aug, 2019 7 commits
    • 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
    • 18신대성's avatar
      들어올 파일에 맞게 수정 · 2b164633
      18신대성 authored
      2b164633
    • 18신대성's avatar
      기존 맵데이터 싹다 날림 · c1f90ef9
      18신대성 authored
      c1f90ef9
    • 18신대성's avatar
      clearUI에 다음 스테이지가 뭔지 표시되게 만듬 · 87a1abf7
      18신대성 authored
      87a1abf7
    • 18신대성's avatar
      stageN-N꼴로 고쳤음. · 858e1e0c
      18신대성 authored 
      이 브랜치의 스테이지는 테스트용이니 그냥 머지하지 말것
      858e1e0c
    • 18신대성's avatar
      여러번 클릭시 계속 빨라지는거 방지 · b75e4a05
      18신대성 authored
      b75e4a05
    • 18신대성's avatar
      클리어 UI 새로 만듬 · bc9155e0
      18신대성 authored
      bc9155e0
  3. 08 Aug, 2019 7 commits
  5. 07 Aug, 2019 3 commits
  7. 06 Aug, 2019 3 commits
  9. 05 Aug, 2019 5 commits
  11. 04 Aug, 2019 1 commit
  13. 03 Aug, 2019 2 commits
  15. 02 Aug, 2019 4 commits
  17. 30 Jul, 2019 7 commits
  19. 25 Jul, 2019 1 commit