• 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
..
InGameDoor Loading commit data...
NormalRoom Loading commit data...
SpecialRoom Loading commit data...
ClearedFog.prefab Loading commit data...
ClearedFog.prefab.meta Loading commit data...
Ghost.prefab Loading commit data...
Ghost.prefab.meta Loading commit data...
InGameDoor.meta Loading commit data...
NormalRoom.meta Loading commit data...
Portal.prefab Loading commit data...
Portal.prefab.meta Loading commit data...
Room.prefab Loading commit data...
Room.prefab.meta Loading commit data...
SpecialRoom.meta Loading commit data...
enemy spot.prefab Loading commit data...
enemy spot.prefab.meta Loading commit data...
fog.prefab Loading commit data...
fog.prefab.meta Loading commit data...