Skip to content

tetra-tower
tetra-tower
Switch branch/tag
History Find file
  • 18손재민's avatar
    Merge branch 'tetris' · f3ccf6ed
    18손재민 authored 
    # Conflicts:
#	Assets/Prefabs/MapManager.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 1.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 10.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 11.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 15.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 16.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 17.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 18.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 19.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 2.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 20.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 3.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 4.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 5.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 6.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 7.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 8.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 9.prefab
#	Assets/Prefabs/Rooms/SpecialRoom/Room Amethyst.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 Start.prefab
#	Assets/Scripts/CameraController.cs
    f3ccf6ed
Name
Last commit
 Last update
..
Room 0.prefab Loading commit data...
Room 0.prefab.meta Loading commit data...
Room 1.prefab Loading commit data...
Room 1.prefab.meta Loading commit data...
Room 10.prefab Loading commit data...
Room 10.prefab.meta Loading commit data...
Room 11.prefab Loading commit data...
Room 11.prefab.meta Loading commit data...
Room 12.prefab Loading commit data...
Room 12.prefab.meta Loading commit data...
Room 13.prefab Loading commit data...
Room 13.prefab.meta Loading commit data...
Room 14.prefab Loading commit data...
Room 14.prefab.meta Loading commit data...
Room 15.prefab Loading commit data...
Room 15.prefab.meta Loading commit data...
Room 16.prefab Loading commit data...
Room 16.prefab.meta Loading commit data...
Room 17.prefab Loading commit data...
Room 17.prefab.meta Loading commit data...
Room 18.prefab Loading commit data...
Room 18.prefab.meta Loading commit data...
Room 19.prefab Loading commit data...
Room 19.prefab.meta Loading commit data...
Room 2.prefab Loading commit data...
Room 2.prefab.meta Loading commit data...
Room 20.prefab Loading commit data...
Room 20.prefab.meta Loading commit data...
Room 21.prefab Loading commit data...
Room 21.prefab.meta Loading commit data...
Room 3.prefab Loading commit data...
Room 3.prefab.meta Loading commit data...
Room 4.prefab Loading commit data...
Room 4.prefab.meta Loading commit data...
Room 5.prefab Loading commit data...
Room 5.prefab.meta Loading commit data...
Room 6.prefab Loading commit data...
Room 6.prefab.meta Loading commit data...
Room 7.prefab Loading commit data...
Room 7.prefab.meta Loading commit data...
Room 8.prefab Loading commit data...
Room 8.prefab.meta Loading commit data...
Room 9.prefab Loading commit data...
Room 9.prefab.meta Loading commit data...
platform.prefab Loading commit data...
platform.prefab.meta Loading commit data...
rope.prefab Loading commit data...
rope.prefab.meta Loading commit data...
spike.prefab Loading commit data...
spike.prefab.meta Loading commit data...