Add proper player model

2020-08-08 22:30:13 +03:00 · 2020-08-08 22:30:13 +03:00 · b4924df6a8
parent 552b25da7c
commit b4924df6a8
17 changed files with 928 additions and 875 deletions
--- a/Assets/GameObjects/Prefabs/LocalPlayer.prefab
+++ b/Assets/GameObjects/Prefabs/LocalPlayer.prefab
@ -262,10 +262,102 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications:
+    - target: {fileID: 189938521096750990, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 210485940507851359, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 226676148025779264, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 275392907752766965, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 379718841342258282, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 469849513356221995, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 693701775013580798, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 734245462253105457, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 826337160566548380, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 835288951058457063, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 862578697830292961, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 1223871436169882994, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 1258358455157819103, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 1268920614904431368, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 1283897649214343989, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 1299322169775958634, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 1347507413914259859, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
    - target: {fileID: 1536982187247873486, guid: 0bffd92c46c257840806f5e957954800, type: 3}
      propertyPath: m_Layer
      value: 11
      objectReference: {fileID: 0}
+    - target: {fileID: 1553808873421200166, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 1607323028047207915, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 1645411743131557678, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 1740377121794380799, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 1907592298672826822, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 2051656160636863277, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
    - target: {fileID: 2071588178488902664, guid: 0bffd92c46c257840806f5e957954800, type: 3}
      propertyPath: m_Layer
      value: 11
@ -274,14 +366,258 @@ PrefabInstance:
      propertyPath: m_Layer
      value: 11
      objectReference: {fileID: 0}
+    - target: {fileID: 2102068596493624878, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 2233523155413413631, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 2260642755738529211, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 2263886596871094792, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 2337714330520397460, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 2490850930601988967, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 2625022342372208514, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
    - target: {fileID: 2637233632139837434, guid: 0bffd92c46c257840806f5e957954800, type: 3}
      propertyPath: m_LocalPosition.z
      value: 0.093
      objectReference: {fileID: 0}
+    - target: {fileID: 2694226706486366723, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 2761883887606886616, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 2848394240346185500, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 2849627993039758015, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 2970260390919355544, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 3127850458527336865, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 3136159918025411995, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 3308827896908848647, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 3375117351951199547, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 3526340189718481230, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 3605180800927073152, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 3640088268655878748, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 3811958100146932696, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3854780595638606787, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 3950076640448629149, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 3958445304861920097, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 3963383984292051189, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 4064409164125332213, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 4139322742822454851, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 4174043091720226804, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 4308007387802171856, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 4344588326737764943, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 4428424959709993306, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 4541850535848181546, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 4636615210354100796, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 4813311409481419276, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
    - target: {fileID: 4833458671639168932, guid: 0bffd92c46c257840806f5e957954800, type: 3}
      propertyPath: m_RootOrder
      value: 3
      objectReference: {fileID: 0}
+    - target: {fileID: 4888923996379437262, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 4958852355926309971, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 5006885016067218805, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 5038104991856310509, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 5053058788064583583, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 5256298178428887165, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295142692399963827, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 5366397457237793774, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 5692466380122753275, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 5694429146429303696, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 6082498632387735795, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 6146016509198241914, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 6216517685688371983, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 6226943158332587043, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 6255835998616344208, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 6450400593622958737, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 6457464837504659194, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 6486997415959278502, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 6655070116745111794, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 6873936412803804834, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 6951373490603822597, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 6985856213459349397, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 7001377480826233256, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 7054647618419963776, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 7090308929189426308, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 7167715204371112015, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 7198069348688607814, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 7387874237489662019, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
    - target: {fileID: 7391558911651855222, guid: 0bffd92c46c257840806f5e957954800, type: 3}
      propertyPath: m_Layer
      value: 10
@ -322,18 +658,70 @@ PrefabInstance:
      propertyPath: m_Layer
      value: 10
      objectReference: {fileID: 0}
+    - target: {fileID: 7567991705536653133, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
    - target: {fileID: 7583110057160188895, guid: 0bffd92c46c257840806f5e957954800, type: 3}
      propertyPath: m_Layer
      value: 11
      objectReference: {fileID: 0}
+    - target: {fileID: 7611688161795666495, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 8385171899852847987, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 8417386348118694793, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 8425284734120298628, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 8465127946710428990, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 8497661510198077039, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 8581907216520079102, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 8603983469265880431, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 8804417745016863166, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
    - target: {fileID: 8952758565847848432, guid: 0bffd92c46c257840806f5e957954800, type: 3}
      propertyPath: m_Layer
      value: 11
      objectReference: {fileID: 0}
+    - target: {fileID: 9025905213696278765, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 9036805622403712136, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
    - target: {fileID: 9072167075418221456, guid: 0bffd92c46c257840806f5e957954800, type: 3}
      propertyPath: m_Layer
      value: 11
      objectReference: {fileID: 0}
+    - target: {fileID: 9160080545904146799, guid: 0bffd92c46c257840806f5e957954800, type: 3}
+      propertyPath: m_Layer
+      value: 10
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 0bffd92c46c257840806f5e957954800, type: 3}
 --- !u!1 &1618967478166023451 stripped
--- a/Assets/GameObjects/Prefabs/Player.prefab
+++ b/Assets/GameObjects/Prefabs/Player.prefab
--- a/Assets/GameObjects/Scenes/TestScene.unity
+++ b/Assets/GameObjects/Scenes/TestScene.unity
@ -1664,6 +1664,14 @@ PrefabInstance:
      propertyPath: m_Name
      value: LocalPlayer
      objectReference: {fileID: 0}
+    - target: {fileID: 5523869367242952531, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 7561784009771368221, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 8526795833546299750, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3}
      propertyPath: TestingPlayer
      value: 
--- a/Assets/Graphics/Models/Guns.meta
+++ b/Assets/Graphics/Models/Guns.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f9d11a2cdeea0374f82a3b498812aed1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Graphics/Models/Guns/RifleMetal.mat
+++ b/Assets/Graphics/Models/Guns/RifleMetal.mat
@ -0,0 +1,91 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: RifleMetal
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 2000
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: 28182337dddbdfd48812c08a6d68ea8c, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 28182337dddbdfd48812c08a6d68ea8c, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AlphaClip: 0
+    - _Blend: 0
+    - _BumpScale: 1
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DstBlend: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 1
+    - _OcclusionStrength: 1
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.232
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+--- !u!114 &4366056616345760041
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 2
--- a/Assets/Graphics/Models/Guns/RifleMetal.mat.meta
+++ b/Assets/Graphics/Models/Guns/RifleMetal.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ed22b038e8ff59c4a8fdc81878bf1f71
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Graphics/Models/Guns/SniperRifle.fbx
+++ b/Assets/Graphics/Models/Guns/SniperRifle.fbx
--- a/Assets/Graphics/Models/Guns/SniperRifle.fbx.meta
+++ b/Assets/Graphics/Models/Guns/SniperRifle.fbx.meta
@ -0,0 +1,109 @@
+fileFormatVersion: 2
+guid: 4f2bbe1f3791622448504110deb9f847
+ModelImporter:
+  serializedVersion: 20101
+  internalIDToNameTable:
+  - first:
+      74: 7777307288913884677
+    second: Sniper_Rifle|Sniper_RifleAction
+  externalObjects:
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Gear
+    second: {fileID: 2100000, guid: ed22b038e8ff59c4a8fdc81878bf1f71, type: 2}
+  materials:
+    materialImportMode: 1
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Graphics/Textures/Soldier/Gear.png.meta
+++ b/Assets/Graphics/Textures/Soldier/Gear.png.meta
@ -32,7 +32,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    serializedVersion: 2
-    filterMode: -1
+    filterMode: 1
    aniso: -1
    mipBias: -100
    wrapU: -1
@ -66,7 +66,31 @@ TextureImporter:
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
--- a/Assets/Graphics/Textures/Soldier/Soldier.png.meta
+++ b/Assets/Graphics/Textures/Soldier/Soldier.png.meta
@ -32,7 +32,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    serializedVersion: 2
-    filterMode: 0
+    filterMode: 1
    aniso: -1
    mipBias: -100
    wrapU: -1
--- a/Assets/Scripts/Animation/SoldierProceduralAnimator.cs
+++ b/Assets/Scripts/Animation/SoldierProceduralAnimator.cs
@ -4,33 +4,66 @@ using NeonTea.Quakeball.Players;
 namespace NeonTea.Quakeball.Animation {
    /// <summary>Animates the parts that can't be animated via the animation system, e.g. aiming.</summary>
    public class SoldierProceduralAnimator : MonoBehaviour {
-        public Transform Torso;
-        public Transform Head;
        public Player Player;
+        public Animator Soldier;
+        public Transform HeadCollider;

+        private Transform Body;
+        private Transform Torso;
+        private Transform Head;
+
+        private Vector3 BodyBaseEulers;
        private Vector3 TorsoBaseEulers;
        private Vector3 HeadBaseEulers;

+        private Vector3 BodyEulers;
        private Vector3 TorsoEulers;
        private Vector3 HeadEulers;

+        private float BodyYaw = 0;
+
        private void Awake() {
+            Body = Soldier.transform;
+            Torso = GameObject.FindGameObjectWithTag("PlayerTorso").transform;
+            Head = GameObject.FindGameObjectWithTag("PlayerHead").transform;
+            HeadCollider.parent = Head;
+            BodyEulers = BodyBaseEulers = Body.localEulerAngles;
            TorsoEulers = TorsoBaseEulers = Torso.localEulerAngles;
            HeadEulers = HeadBaseEulers = Head.localEulerAngles;
        }

+        private void Update() {
+            Soldier.SetFloat("Movement", Player.GroundVelocity.magnitude / Player.MoveStyle.TargetVelocity);
+        }
+
        private void LateUpdate() {
-            float Yaw = Player.Yaw;
+            if (Player.MoveDirection.magnitude > 0) {
+                float NewBodyYaw = Vector3.SignedAngle(Vector3.forward, Player.MoveDirection, Vector3.up);
+                if (BodyYaw < -90 && NewBodyYaw > 90) {
+                    BodyEulers += new Vector3(0, 360, 0);
+                }
+                if (BodyYaw > 90 && NewBodyYaw < -90) {
+                    BodyEulers -= new Vector3(0, 360, 0);
+                }
+                BodyYaw = NewBodyYaw;
+            }
+            float Yaw = Player.Yaw - BodyYaw;
            while (Yaw < -180) {
                Yaw += 360;
            }
            while (Yaw > 180) {
                Yaw -= 360;
            }
-            Vector3 TargetTorsoEulers = TorsoBaseEulers + new Vector3(0, Yaw * 0.5f, 0);
+
+            Vector3 TargetBodyEulers = BodyBaseEulers + new Vector3(0, BodyYaw, 0);
+            BodyEulers = Vector3.Lerp(BodyEulers, TargetBodyEulers, 10f * Time.deltaTime);
+            Body.localEulerAngles = BodyEulers;
+
+            Vector3 TargetTorsoEulers = TorsoBaseEulers + new Vector3(0, Yaw, 0);
            TorsoEulers = Vector3.Lerp(TorsoEulers, TargetTorsoEulers, 10f * Time.deltaTime);
            Torso.localEulerAngles = TorsoEulers;
-            Vector3 TargetHeadEulers = HeadBaseEulers + new Vector3(-Player.Pitch, Yaw * 0.5f, 0);
+
+            Vector3 TargetHeadEulers = HeadBaseEulers + new Vector3(-Player.Pitch, 0, 0);
            HeadEulers = Vector3.Lerp(HeadEulers, TargetHeadEulers, 10f * Time.deltaTime);
            Head.localEulerAngles = HeadEulers;
        }
--- a/Assets/Scripts/Players/Player.cs
+++ b/Assets/Scripts/Players/Player.cs
@ -20,8 +20,6 @@ namespace NeonTea.Quakeball.Players {
        public float UpdateFrequency = 1f;

        public MoveStyle[] MoveStyles;
-        public Transform Head;
-        public Transform Body;
        public Transform Gun;
        public Animator GunBobber;

@ -53,8 +51,6 @@ namespace NeonTea.Quakeball.Players {
        public float Pitch;
        /// <summary>The total yaw of the player. Head yaw is Yaw - BodyYaw.</summary>
        public float Yaw;
-        /// <summary>The yaw of the player body. Calculated from MoveDirection.</summary>
-        public float BodyYaw;

        [Header("Player movement status")]
        /// <summary>The direction the player is going.</summary>
@ -271,12 +267,6 @@ namespace NeonTea.Quakeball.Players {
                }
            }

-            if (MoveDirection.magnitude > 0) {
-                BodyYaw = Vector3.SignedAngle(Vector3.forward, MoveDirection, Vector3.up);
-            }
-            Body.localRotation = Quaternion.Lerp(Body.localRotation, Quaternion.Euler(0, BodyYaw, 0), 20f * Time.deltaTime);
-            Head.localRotation = Quaternion.Lerp(Head.localRotation, Quaternion.Euler(Pitch, Yaw, 0), 15f * Time.deltaTime);
-
            float TargetLean = -Vector3.Dot(GroundVelocity / MoveStyle.TargetVelocity, CameraRoot.right) * MoveStyle.LeanDegrees;
            Lean = Mathf.Lerp(Lean, TargetLean, 30f * Time.deltaTime);
            CameraRoot.localEulerAngles = new Vector3(Pitch, Yaw, Lean);
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@ -8,6 +8,8 @@ TagManager:
  - RemotePlayer
  - Net
  - DeadScreen
+  - PlayerTorso
+  - PlayerHead
  layers:
  - Default
  - TransparentFX
--- a/RawAssets/Soldier/Drone.blend
+++ b/RawAssets/Soldier/Drone.blend
--- a/RawAssets/Soldier/SniperRifle.blend
+++ b/RawAssets/Soldier/SniperRifle.blend
--- a/RawAssets/Soldier/SoldierF.blend
+++ b/RawAssets/Soldier/SoldierF.blend
--- a/RawAssets/Soldier/SoldierM.blend
+++ b/RawAssets/Soldier/SoldierM.blend