Skip to content

tetra-tower
tetra-tower
Switch branch/tag
History Find file
  • 18류지석's avatar
    Merge branch 'master' into tetris · 538d6e4d
    18류지석 authored 
    # Conflicts:
#	Assets/Prefabs/Rooms/NormalRoom/Room 11(FR).prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 14.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 15.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 18.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 19(FR).prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 2(FR).prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 20.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 3.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 4(FR).prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 4.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 8.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 9.prefab
#	Assets/Prefabs/Rooms/SpecialRoom/Room Boss 1-1.prefab
#	Assets/Prefabs/Rooms/SpecialRoom/Room Boss 1-2.prefab
#	Assets/Prefabs/Rooms/SpecialRoom/Room Boss 1-3.prefab
#	Assets/Prefabs/Rooms/SpecialRoom/Room Item 1-1.prefab
#	Assets/Prefabs/Rooms/SpecialRoom/Room Start 1-3(FR).prefab
    538d6e4d
Name
Last commit
 Last update
..
Room Amethyst.prefab Loading commit data...
Room Amethyst.prefab.meta Loading commit data...
Room Boss 1-1.prefab Loading commit data...
Room Boss 1-1.prefab.meta Loading commit data...
Room Boss 1-2.prefab Loading commit data...
Room Boss 1-2.prefab.meta Loading commit data...
Room Boss 1-3.prefab Loading commit data...
Room Boss 1-3.prefab.meta Loading commit data...
Room Boss.prefab Loading commit data...
Room Boss.prefab.meta Loading commit data...
Room BothSide.prefab Loading commit data...
Room BothSide.prefab.meta Loading commit data...
Room Gold.prefab Loading commit data...
Room Gold.prefab.meta Loading commit data...
Room Item 1-1.prefab Loading commit data...
Room Item 1-1.prefab.meta Loading commit data...
Room Item.prefab Loading commit data...
Room Item.prefab.meta Loading commit data...
Room Start 1-1(FR).prefab Loading commit data...
Room Start 1-1(FR).prefab.meta Loading commit data...
Room Start 1-3(FR).prefab Loading commit data...
Room Start 1-3(FR).prefab.meta Loading commit data...
Room Start.prefab Loading commit data...
Room Start.prefab.meta Loading commit data...