summaryrefslogtreecommitdiff
path: root/Assets/Materials
diff options
context:
space:
mode:
authorAndrew Lee <alee14498@protonmail.com>2020-04-20 13:23:57 -0400
committerAndrew Lee <alee14498@protonmail.com>2020-04-20 13:23:57 -0400
commit0382584a77aed5dc926909b7dad6159ae0757e38 (patch)
tree7aaef7f6c98bd5ae3ed28db39ae898d266b6d81e /Assets/Materials
parentb45cbdab7ba1217347fc67863cc9d3c90ef74bf9 (diff)
downloadProject-Sandbox-0382584a77aed5dc926909b7dad6159ae0757e38.tar.gz
Project-Sandbox-0382584a77aed5dc926909b7dad6159ae0757e38.tar.bz2
Project-Sandbox-0382584a77aed5dc926909b7dad6159ae0757e38.zip
Added jumping and gun (not functional)
Diffstat (limited to 'Assets/Materials')
-rw-r--r--Assets/Materials/Ground.mat (renamed from Assets/Materials/Green.mat)2
-rw-r--r--Assets/Materials/Ground.mat.meta (renamed from Assets/Materials/Green.mat.meta)0
-rw-r--r--Assets/Materials/Player.mat (renamed from Assets/Materials/Blue.mat)2
-rw-r--r--Assets/Materials/Player.mat.meta (renamed from Assets/Materials/Blue.mat.meta)0
4 files changed, 2 insertions, 2 deletions
diff --git a/Assets/Materials/Green.mat b/Assets/Materials/Ground.mat
index 7027b71..7b5824a 100644
--- a/Assets/Materials/Green.mat
+++ b/Assets/Materials/Ground.mat
@@ -7,7 +7,7 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Green
+ m_Name: Ground
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
diff --git a/Assets/Materials/Green.mat.meta b/Assets/Materials/Ground.mat.meta
index 3b8447a..3b8447a 100644
--- a/Assets/Materials/Green.mat.meta
+++ b/Assets/Materials/Ground.mat.meta
diff --git a/Assets/Materials/Blue.mat b/Assets/Materials/Player.mat
index f5b83e1..676f18b 100644
--- a/Assets/Materials/Blue.mat
+++ b/Assets/Materials/Player.mat
@@ -7,7 +7,7 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Blue
+ m_Name: Player
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
diff --git a/Assets/Materials/Blue.mat.meta b/Assets/Materials/Player.mat.meta
index 21dbc8b..21dbc8b 100644
--- a/Assets/Materials/Blue.mat.meta
+++ b/Assets/Materials/Player.mat.meta