Assets/Sprites/Rooms/Stage1 · 54d73ac17a846138bd0d4a07261c775c02fa5d5a · Oenos / tetra-tower · GitLab

History Find file

Merge remote-tracking branch 'origin/item' into tetris · cb8d562e
18손재민 authored Feb 26, 2019
```
# Conflicts:
#	ProjectSettings/TagManager.asset
```
cb8d562e

Name	Last commit	Last update
..
RoomAmethyst1.png		Loading commit data...
RoomAmethyst1.png.meta		Loading commit data...
RoomBoss1.png		Loading commit data...
RoomBoss1.png.meta		Loading commit data...
RoomBothSIde1.png		Loading commit data...
RoomBothSIde1.png.meta		Loading commit data...
RoomCurrent1.png		Loading commit data...
RoomCurrent1.png.meta		Loading commit data...
RoomGold1.png		Loading commit data...
RoomGold1.png.meta		Loading commit data...
RoomItem1.png		Loading commit data...
RoomItem1.png.meta		Loading commit data...
RoomNormal1_0.png		Loading commit data...
RoomNormal1_0.png.meta		Loading commit data...
RoomNormal1_1.png		Loading commit data...
RoomNormal1_1.png.meta		Loading commit data...
RoomNormal1_2.png		Loading commit data...
RoomNormal1_2.png.meta		Loading commit data...
RoomNormal1_3.png		Loading commit data...
RoomNormal1_3.png.meta		Loading commit data...