Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
tetra-tower
tetra-tower
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Labels
    • Milestones
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • Oenos
  • tetra-towertetra-tower
  • Repository

Switch branch/tag
  • tetra-tower
  • Assets
  • Sprites
  • Enemy
  • Goblin
  • attack
  • goblin_attack6.png.meta
Find file
BlameHistoryPermalink
  • 18류지석's avatar
    Merge branch 'tetris' into enemy 고블린 스프라이트 크기와 콜라이더 크기 수정, 고블린 생성 버튼 복구할것 · dd04ff2a
    18류지석 authored Feb 01, 2019
    # Conflicts:
    #	Assets/Prefabs/Characters/Player.prefab
    #	Assets/Prefabs/Rooms/SpecialRoom/Room Start.prefab
    #	Assets/Prefabs/TetrisMap/TestTools.prefab
    #	Assets/Scenes/PlayScene.unity
    dd04ff2a
goblin_attack6.png.meta 2.14 KB
EditWeb IDE

Replace goblin_attack6.png.meta

Attach a file by drag & drop or click to upload


Cancel
A new branch will be created in your fork and a new merge request will be started.