Fixed shiny textures on clothes, temporarily disabled button north as…

… jump button, added temporary music to GameFinish scene
grabermtw · Sep 17, 2020 · f47c054 · f47c054
1 parent 939b76a
commit f47c054
Show file tree

Hide file tree

Showing 22 changed files with 332 additions and 358 deletions.
diff --git a/Assets/Characters/Shared Character Assets/PlayerControls.inputactions b/Assets/Characters/Shared Character Assets/PlayerControls.inputactions
@@ -163,17 +163,6 @@
                     "isComposite": false,
                     "isPartOfComposite": false
                 },
-                {
-                    "name": "",
-                    "id": "36890f0a-186a-4327-aeb1-3fb53d7728f6",
-                    "path": "<Gamepad>/buttonNorth",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "",
-                    "action": "Jump",
-                    "isComposite": false,
-                    "isPartOfComposite": false
-                },
                 {
                     "name": "",
                     "id": "34945bb4-4a9b-498b-8717-fb4b013d8728",

diff --git a/Assets/GameFinish/Music.meta b/Assets/GameFinish/Music.meta
diff --git a/Assets/GameFinish/Music/Timmy Stroika Noika.mp3 b/Assets/GameFinish/Music/Timmy Stroika Noika.mp3
diff --git a/Assets/GameFinish/Music/Timmy Stroika Noika.mp3.meta b/Assets/GameFinish/Music/Timmy Stroika Noika.mp3.meta
diff --git a/Assets/Mixamo/jesse_quarantine/Materials/Bottommat.mat b/Assets/Mixamo/jesse_quarantine/Materials/Bottommat.mat
@@ -60,7 +60,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
-    - _GlossMapScale: 1
+    - _GlossMapScale: 0.158
     - _Glossiness: 0
     - _GlossyReflections: 1
     - _Metallic: 0

diff --git a/Assets/Mixamo/jesse_quarantine/Materials/Shoesmat.mat b/Assets/Mixamo/jesse_quarantine/Materials/Shoesmat.mat
@@ -60,7 +60,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
-    - _GlossMapScale: 1
+    - _GlossMapScale: 0.213
     - _Glossiness: 0
     - _GlossyReflections: 1
     - _Metallic: 0

diff --git a/Assets/Mixamo/jesse_quarantine/Materials/Topmat.mat b/Assets/Mixamo/jesse_quarantine/Materials/Topmat.mat
@@ -60,7 +60,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
-    - _GlossMapScale: 1
+    - _GlossMapScale: 0.274
     - _Glossiness: 0
     - _GlossyReflections: 1
     - _Metallic: 0

diff --git a/Assets/Mixamo/jesse_suit/Materials/Bottommat.mat b/Assets/Mixamo/jesse_suit/Materials/Bottommat.mat
@@ -60,7 +60,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
-    - _GlossMapScale: 1
+    - _GlossMapScale: 0.189
     - _Glossiness: 0
     - _GlossyReflections: 1
     - _Metallic: 0

diff --git a/Assets/Mixamo/jesse_suit/Materials/Shoesmat.mat b/Assets/Mixamo/jesse_suit/Materials/Shoesmat.mat
@@ -60,7 +60,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
-    - _GlossMapScale: 1
+    - _GlossMapScale: 0.957
     - _Glossiness: 0
     - _GlossyReflections: 1
     - _Metallic: 0

diff --git a/Assets/Mixamo/jesse_suit/Materials/Topmat.mat b/Assets/Mixamo/jesse_suit/Materials/Topmat.mat
@@ -60,7 +60,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
-    - _GlossMapScale: 1
+    - _GlossMapScale: 0.177
     - _Glossiness: 0
     - _GlossyReflections: 1
     - _Metallic: 0

diff --git a/Assets/Mixamo/vorsteg_beard/Materials/Bottommat.mat b/Assets/Mixamo/vorsteg_beard/Materials/Bottommat.mat
@@ -60,7 +60,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
-    - _GlossMapScale: 1
+    - _GlossMapScale: 0.079
     - _Glossiness: 0
     - _GlossyReflections: 1
     - _Metallic: 0

diff --git a/Assets/Mixamo/vorsteg_beard/Materials/Shoesmat.mat b/Assets/Mixamo/vorsteg_beard/Materials/Shoesmat.mat
@@ -60,7 +60,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
-    - _GlossMapScale: 1
+    - _GlossMapScale: 0.103
     - _Glossiness: 0
     - _GlossyReflections: 1
     - _Metallic: 0

diff --git a/Assets/Mixamo/vorsteg_beard/Materials/Topmat.mat b/Assets/Mixamo/vorsteg_beard/Materials/Topmat.mat
@@ -60,7 +60,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
-    - _GlossMapScale: 1
+    - _GlossMapScale: 0.061
     - _Glossiness: 0
     - _GlossyReflections: 1
     - _Metallic: 0

diff --git a/Assets/Mixamo/vorsteg_mustache/Materials/Bottommat.mat b/Assets/Mixamo/vorsteg_mustache/Materials/Bottommat.mat
@@ -60,7 +60,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
-    - _GlossMapScale: 1
+    - _GlossMapScale: 0
     - _Glossiness: 0
     - _GlossyReflections: 1
     - _Metallic: 0

diff --git a/Assets/Mixamo/vorsteg_mustache/Materials/Shoesmat.mat b/Assets/Mixamo/vorsteg_mustache/Materials/Shoesmat.mat
@@ -60,7 +60,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
-    - _GlossMapScale: 1
+    - _GlossMapScale: 0.122
     - _Glossiness: 0
     - _GlossyReflections: 1
     - _Metallic: 0

diff --git a/Assets/Mixamo/vorsteg_mustache/Materials/Topmat.mat b/Assets/Mixamo/vorsteg_mustache/Materials/Topmat.mat
@@ -60,7 +60,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
-    - _GlossMapScale: 1
+    - _GlossMapScale: 0.164
     - _Glossiness: 0
     - _GlossyReflections: 1
     - _Metallic: 0

diff --git a/Assets/Mixamo/vorsteg_mustache_shirtless/Materials/Bottommat.mat b/Assets/Mixamo/vorsteg_mustache_shirtless/Materials/Bottommat.mat
@@ -60,7 +60,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
-    - _GlossMapScale: 1
+    - _GlossMapScale: 0
     - _Glossiness: 0
     - _GlossyReflections: 1
     - _Metallic: 0

diff --git a/Assets/Mixamo/vorsteg_mustache_shirtless/Materials/Shoesmat.mat b/Assets/Mixamo/vorsteg_mustache_shirtless/Materials/Shoesmat.mat
@@ -60,7 +60,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
-    - _GlossMapScale: 1
+    - _GlossMapScale: 0.109
     - _Glossiness: 0
     - _GlossyReflections: 1
     - _Metallic: 0