Skip to content

tetra-tower
tetra-tower
Switch branch/tag
History Find file
  • 18손재민's avatar
    Merge remote-tracking branch 'origin/prefab' · b7e42d4b
    18손재민 authored 
    # Conflicts:
#	Assets/Prefabs/Rooms/NormalRoom/Room 1.prefab
#	Assets/Prefabs/Rooms/SpecialRoom/Room Start 1-1.prefab
#	Assets/Prefabs/Rooms/SpecialRoom/Room Start 1-3.prefab
#	Assets/Resources/Tiles/ForestRuin/Rope/11ropeu.asset.meta
    b7e42d4b
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 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 1-2.prefab Loading commit data...
Room Item 1-2.prefab.meta Loading commit data...
Room Item.prefab Loading commit data...
Room Item.prefab.meta Loading commit data...
Room Start 1-1.prefab Loading commit data...
Room Start 1-1.prefab.meta Loading commit data...
Room Start 1-2.prefab Loading commit data...
Room Start 1-2.prefab.meta Loading commit data...
Room Start.prefab Loading commit data...
Room Start.prefab.meta Loading commit data...
Room Tutorial.prefab Loading commit data...
Room Tutorial.prefab.meta Loading commit data...