Merge branch 'master' into new-cache

rjkiv · Apr 7, 2023 · 6506a3d · 6506a3d
2 parents df401e9 + 0ab0a0c
commit 6506a3d
Show file tree

Hide file tree

Showing 78 changed files with 2,449 additions and 734 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+RawAssets/** filter=lfs diff=lfs merge=lfs -text
diff --git a/Assets/Art/Materials/PlayMode/Needle.mat b/Assets/Art/Materials/PlayMode/Needle.mat
@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: Needle
   m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
   - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords: []
@@ -23,12 +21,11 @@ Material:
   disabledShaderPasses:
   - DepthOnly
   - SHADOWCASTER
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
     - _BaseMap:
-        m_Texture: {fileID: 2800000, guid: 04355d8d4a32b09448fc74fad73a3e72, type: 3}
+        m_Texture: {fileID: 2800000, guid: 8b68a573841c0df43b615b07a9fa8a80, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
@@ -52,7 +49,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 04355d8d4a32b09448fc74fad73a3e72, type: 3}
+        m_Texture: {fileID: 2800000, guid: 8b68a573841c0df43b615b07a9fa8a80, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

diff --git a/Assets/Art/Textures/PlayMode/Needle.png b/Assets/Art/Textures/PlayMode/Needle.png
diff --git a/Assets/Art/Textures/PlayMode/Needles.meta b/Assets/Art/Textures/PlayMode/Needles.meta
diff --git a/Assets/Art/Textures/PlayMode/Needles/Needle_1.png b/Assets/Art/Textures/PlayMode/Needles/Needle_1.png
diff --git a/Assets/Art/Textures/PlayMode/Needle.png.meta → ...xtures/PlayMode/Needles/Needle_1.png.meta b/Assets/Art/Textures/PlayMode/Needle.png.meta → ...xtures/PlayMode/Needles/Needle_1.png.meta
diff --git a/Assets/Art/Textures/PlayMode/Needles/Needle_2.png b/Assets/Art/Textures/PlayMode/Needles/Needle_2.png
diff --git a/Assets/Art/Textures/PlayMode/Needles/Needle_2.png.meta b/Assets/Art/Textures/PlayMode/Needles/Needle_2.png.meta
diff --git a/Assets/Art/Textures/PlayMode/Needles/Needle_3.png b/Assets/Art/Textures/PlayMode/Needles/Needle_3.png
diff --git a/Assets/Art/Textures/PlayMode/Needles/Needle_3.png.meta b/Assets/Art/Textures/PlayMode/Needles/Needle_3.png.meta
diff --git a/Assets/Art/Textures/PlayMode/Needles/Needle_4.png b/Assets/Art/Textures/PlayMode/Needles/Needle_4.png
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		RawAssets/** filter=lfs diff=lfs merge=lfs -text