diff options
| author | Jakob Stendahl <jakst070500@ntvgs.no> | 2017-09-29 12:42:11 +0200 |
|---|---|---|
| committer | Jakob Stendahl <jakst070500@ntvgs.no> | 2017-09-29 12:42:11 +0200 |
| commit | 76cf99ade6530bdad81088295fb4cf73f5c5b118 (patch) | |
| tree | e3cf549687d164c11d6b292d771534e98bcc97a8 /td/Assets/Materials | |
| parent | 608b6a0e692a580f0dfabef0b2ef1a59f0a37234 (diff) | |
| parent | 9a00d03f80eee94c9fe52f832a0127d9375ad375 (diff) | |
| download | TD-76cf99ade6530bdad81088295fb4cf73f5c5b118.tar.gz TD-76cf99ade6530bdad81088295fb4cf73f5c5b118.zip | |
Merge branch 'master' of https://github.com/JakobS1n/unityTest
Diffstat (limited to 'td/Assets/Materials')
| -rw-r--r-- | td/Assets/Materials/Dirt.mat | bin | 0 -> 5012 bytes | |||
| -rw-r--r-- | td/Assets/Materials/Dirt.mat.meta | 9 | ||||
| -rw-r--r-- | td/Assets/Materials/Enemy one.mat | bin | 0 -> 5056 bytes | |||
| -rw-r--r-- | td/Assets/Materials/Enemy one.mat.meta | 9 | ||||
| -rw-r--r-- | td/Assets/Materials/Grass.mat | bin | 0 -> 5016 bytes | |||
| -rw-r--r-- | td/Assets/Materials/Grass.mat.meta | 9 |
6 files changed, 27 insertions, 0 deletions
diff --git a/td/Assets/Materials/Dirt.mat b/td/Assets/Materials/Dirt.mat Binary files differnew file mode 100644 index 0000000..a493af1 --- /dev/null +++ b/td/Assets/Materials/Dirt.mat diff --git a/td/Assets/Materials/Dirt.mat.meta b/td/Assets/Materials/Dirt.mat.meta new file mode 100644 index 0000000..b15b482 --- /dev/null +++ b/td/Assets/Materials/Dirt.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: d42374425bef54eea804d401e3bcc9c6 +timeCreated: 1506603097 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/td/Assets/Materials/Enemy one.mat b/td/Assets/Materials/Enemy one.mat Binary files differnew file mode 100644 index 0000000..22b9592 --- /dev/null +++ b/td/Assets/Materials/Enemy one.mat diff --git a/td/Assets/Materials/Enemy one.mat.meta b/td/Assets/Materials/Enemy one.mat.meta new file mode 100644 index 0000000..ba04a9c --- /dev/null +++ b/td/Assets/Materials/Enemy one.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 3880498a088cc48f69fe11e905a82185 +timeCreated: 1506604738 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/td/Assets/Materials/Grass.mat b/td/Assets/Materials/Grass.mat Binary files differnew file mode 100644 index 0000000..061cd3a --- /dev/null +++ b/td/Assets/Materials/Grass.mat diff --git a/td/Assets/Materials/Grass.mat.meta b/td/Assets/Materials/Grass.mat.meta new file mode 100644 index 0000000..4f9c01e --- /dev/null +++ b/td/Assets/Materials/Grass.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: ed001c552b4734cbfaf2a11dbf59102c +timeCreated: 1506602894 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: |