BTH/vstyler
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Tleety
2016-05-25 23:42:24 +02:00
parent 6bd8afd3e7 456680584f
commit b840315f73
220 changed files with 6486 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Materials/Floor.mat
BIN
View File
Binary file not shown.
Assets/Materials/Floor.mat.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7fcf1e2482cabdd47b7b9456bdd3daf5
timeCreated: 1464204819
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/Materials/M_Door.mat
BIN
View File
Binary file not shown.
Assets/Materials/M_Door.mat.meta
+2 -2
View File
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 14a81ba258471214992c8a8dd99f7e36
timeCreated: 1464200377
guid: d5e45645ac37eec4aa29f1d45a5dac8b
timeCreated: 1464198942
licenseType: Free
NativeFormatImporter:
userData:
Assets/Materials/M_Frame.001.mat
BIN
View File
Binary file not shown.
Assets/Materials/M_Frame.001.mat.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 886005fda69813e49bf629d9a870a0d2
timeCreated: 1464207234
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/Materials/M_Frame.mat
BIN
View File
Binary file not shown.
Assets/Materials/M_Frame.mat.meta
+2 -2
View File
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 778ed9bad4929f04e874fb135e3f7636
timeCreated: 1464200339
guid: cb126faf862491548bd2354abaf1ace4
timeCreated: 1464198942
licenseType: Free
NativeFormatImporter:
userData:
Assets/Materials/M_Glass.mat
BIN
View File
Binary file not shown.
Assets/Materials/M_Glass.mat.meta
+2 -2
View File
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: a1ec97e2c165543448bdc502d495a3c1
timeCreated: 1464200377
guid: a3f641a44fab7644e8f058774c9cd105
timeCreated: 1464198942
licenseType: Free
NativeFormatImporter:
userData:
Assets/Materials/Wall.mat
BIN
View File
Binary file not shown.
Assets/Materials/Wall.mat.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a717ff4c884a19f45a356075b21bc1be
timeCreated: 1464204819
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/Materials/m1.mat
BIN
View File
Binary file not shown.
Assets/Materials/m1.mat.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 01a93b645daea0647b5ab2aaff455f1a
timeCreated: 1464203001
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/Materials/m2.mat
BIN
View File
Binary file not shown.
Assets/Materials/m2.mat.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cfe7f7a220d15e84a9b2253d70f23902
timeCreated: 1464203001
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/Materials/m3.mat
BIN
View File
Binary file not shown.
Assets/Materials/m3.mat.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 286ba9af757e13346ba2f7e077ecb5f6
timeCreated: 1464202998
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/Materials/m5.mat
BIN
View File
Binary file not shown.
Assets/Materials/m5.mat.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 531b69aa96ba9864999470eed2212e54
timeCreated: 1464202997
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/Materials/m6.mat
BIN
View File
Binary file not shown.
Assets/Materials/m6.mat.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 168e69b55bd70c24cba21d5e7364292a
timeCreated: 1464202997
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/Materials/m7.mat
BIN
View File
Binary file not shown.
Assets/Materials/m7.mat.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 44527e996cf8dae4c8f0b1c5d62d3e2f
timeCreated: 1464202998
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant: