Tleety b840315f73 Merge remote-tracking branch 'origin/master' into Templates ...

Conflicts:
	Assets/Door.FBX.meta
	Assets/DoorFrame.FBX.meta
	Assets/Materials/M_Door.mat
	Assets/Materials/M_Door.mat.meta
	Assets/Materials/M_Frame.mat
	Assets/Materials/M_Frame.mat.meta
	Assets/Materials/M_Glass.mat
	Assets/Materials/M_Glass.mat.meta
	Assets/WindowFrame.FBX.meta

2016-05-25 23:42:24 +02:00

Assets

Merge remote-tracking branch 'origin/master' into Templates

2016-05-25 23:42:24 +02:00

ProjectSettings

Outline for selected objects

2016-05-25 23:39:41 +02:00

.gitignore

Unity gitignore

2016-05-18 19:58:42 +02:00

S

Description

No description provided

177 MiB

Languages

C# 98.2%

ShaderLab 1.8%