Skip to content

tetra-tower
tetra-tower
Switch branch/tag
Find file
BlameHistoryPermalink
  • 18손재민's avatar
    Merge remote-tracking branch 'origin/enemy2' · c4c3978e
    18손재민 authored 
    # Conflicts:
#	Assets/Prefabs/Rooms/NormalRoom/Room 1.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 12.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 13.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 14.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 20.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 9.prefab
#	Assets/Prefabs/TetrisMap/Tetrimino/Room Tutorial.prefab
    c4c3978e
Room 3.prefab 125 KB