Assets/Prefabs/Rooms/NormalRoom · 4109d6508fb514522c5d467ed280a8b996468a85 · Oenos / tetra-tower

Merge branch 'prefab' into tetris · 4109d650

18손재민 authored Jan 26, 2019

# Conflicts:
#	Assets/Prefabs/Rooms/NormalRoom/Room 4(FR).prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 4.prefab

4109d650

Name	Last commit	Last update
..
Room 0.prefab		Loading commit data...
Room 0.prefab.meta		Loading commit data...
Room 1(FR).prefab		Loading commit data...
Room 1(FR).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(FR).prefab		Loading commit data...
Room 11(FR).prefab.meta		Loading commit data...
Room 11.prefab		Loading commit data...
Room 11.prefab.meta		Loading commit data...
Room 12(FR).prefab		Loading commit data...
Room 12(FR).prefab.meta		Loading commit data...
Room 12.prefab		Loading commit data...
Room 12.prefab.meta		Loading commit data...
Room 13(FR).prefab		Loading commit data...
Room 13(FR).prefab.meta		Loading commit data...
Room 13.prefab		Loading commit data...
Room 13.prefab.meta		Loading commit data...
Room 14(FR).prefab		Loading commit data...
Room 14(FR).prefab.meta		Loading commit data...
Room 14.prefab		Loading commit data...
Room 14.prefab.meta		Loading commit data...
Room 15(FR).prefab		Loading commit data...
Room 15(FR).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(FR).prefab		Loading commit data...
Room 19(FR).prefab.meta		Loading commit data...
Room 19.prefab		Loading commit data...
Room 19.prefab.meta		Loading commit data...
Room 2(FR).prefab		Loading commit data...
Room 2(FR).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 3(FR).prefab		Loading commit data...
Room 3(FR).prefab.meta		Loading commit data...
Room 3.prefab		Loading commit data...
Room 3.prefab.meta		Loading commit data...
Room 4(FR).prefab		Loading commit data...
Room 4(FR).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(FR).prefab		Loading commit data...
Room 7(FR).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(FR).prefab		Loading commit data...
Room 9(FR).prefab.meta		Loading commit data...
Room 9.prefab		Loading commit data...
Room 9.prefab.meta		Loading commit data...
outerwall.prefab		Loading commit data...
outerwall.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...

Download source code

Download this directory