pulled stuff and solved conflict

Guardian of Silverkeep/Assets/Animations/armswing.anim

@@ -0,0 +1,321 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: armswing
+  serializedVersion: 3
+  m_AnimationType: 1
+  m_Compressed: 0
+  m_RotationCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - time: .0166666675
+        value: {x: -.0229914282, y: .706732869, z: -.706733108, w: .0229881089}
+        inSlope: {x: -1.43663967, y: -.0711429119, z: .0711250305, w: 1.43667459}
+        outSlope: {x: -1.43663967, y: -.0711429119, z: .0711250305, w: 1.43667459}
+        tangentMode: -559038737
+      - time: .116666667
+        value: {x: -.165298894, y: .687514484, z: -.687514722, w: .165298432}
+        inSlope: {x: -1.4040426, y: -.312495261, z: .31250599, w: 1.40407932}
+        outSlope: {x: -1.4040426, y: -.312495261, z: .31250599, w: 1.40407932}
+        tangentMode: -559038737
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+    path: 
+  m_CompressedRotationCurves: []
+  m_PositionCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - time: 0
+        value: {x: -11.1188459, y: .216781899, z: -10.5585814}
+        inSlope: {x: -8.53097916, y: 5.10037518, z: 0}
+        outSlope: {x: -8.53097916, y: 5.10037518, z: 0}
+        tangentMode: -559038737
+      - time: .0500000007
+        value: {x: -11.5453949, y: .471800655, z: -10.5585814}
+        inSlope: {x: -6.55201244, y: 2.62479472, z: 0}
+        outSlope: {x: -6.55201244, y: 2.62479472, z: 0}
+        tangentMode: -559038737
+      - time: .116666667
+        value: {x: -11.8502645, y: .481748283, z: -10.5585814}
+        inSlope: {x: -2.29537535, y: -.866664767, z: 0}
+        outSlope: {x: -2.29537535, y: -.866664767, z: 0}
+        tangentMode: -559038737
+      - time: .233333334
+        value: {x: -11.8523302, y: .262118161, z: -10.5585814}
+        inSlope: {x: 1.05440331, y: -2.85234022, z: -4.76837113e-06}
+        outSlope: {x: 1.05440331, y: -2.85234022, z: -4.76837113e-06}
+        tangentMode: -559038737
+      - time: .333333343
+        value: {x: -11.639679, y: -.120095514, z: -10.5585823}
+        inSlope: {x: 2.12651229, y: -3.8221364, z: -9.53674225e-06}
+        outSlope: {x: 2.12651229, y: -3.8221364, z: -9.53674225e-06}
+        tangentMode: -559038737
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+    path: 
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 2
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_MuscleClipInfo:
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - time: 0
+        value: -11.1188459
+        inSlope: -8.53097916
+        outSlope: -8.53097916
+        tangentMode: 10
+      - time: .0500000007
+        value: -11.5453949
+        inSlope: -6.55201244
+        outSlope: -6.55201244
+        tangentMode: 10
+      - time: .116666667
+        value: -11.8502645
+        inSlope: -2.29537535
+        outSlope: -2.29537535
+        tangentMode: 10
+      - time: .233333334
+        value: -11.8523302
+        inSlope: 1.05440331
+        outSlope: 1.05440331
+        tangentMode: 10
+      - time: .333333343
+        value: -11.639679
+        inSlope: 2.12651229
+        outSlope: 2.12651229
+        tangentMode: 10
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+    attribute: m_LocalPosition.x
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - time: 0
+        value: .216781899
+        inSlope: 5.10037518
+        outSlope: 5.10037518
+        tangentMode: 10
+      - time: .0500000007
+        value: .471800655
+        inSlope: 2.62479472
+        outSlope: 2.62479472
+        tangentMode: 10
+      - time: .116666667
+        value: .481748283
+        inSlope: -.866664767
+        outSlope: -.866664767
+        tangentMode: 10
+      - time: .233333334
+        value: .262118161
+        inSlope: -2.85234022
+        outSlope: -2.85234022
+        tangentMode: 10
+      - time: .333333343
+        value: -.120095514
+        inSlope: -3.8221364
+        outSlope: -3.8221364
+        tangentMode: 10
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+    attribute: m_LocalPosition.y
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - time: 0
+        value: -10.5585814
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 10
+      - time: .0500000007
+        value: -10.5585814
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 10
+      - time: .116666667
+        value: -10.5585814
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 10
+      - time: .233333334
+        value: -10.5585814
+        inSlope: -4.76837113e-06
+        outSlope: -4.76837113e-06
+        tangentMode: 10
+      - time: .333333343
+        value: -10.5585823
+        inSlope: -9.53674225e-06
+        outSlope: -9.53674225e-06
+        tangentMode: 10
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+    attribute: m_LocalPosition.z
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - time: .0166666675
+        value: -.0229914282
+        inSlope: -1.43663967
+        outSlope: -1.43663967
+        tangentMode: 0
+      - time: .116666667
+        value: -.165298894
+        inSlope: -1.4040426
+        outSlope: -1.4040426
+        tangentMode: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+    attribute: m_LocalRotation.x
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - time: .0166666675
+        value: .706732869
+        inSlope: -.0711429119
+        outSlope: -.0711429119
+        tangentMode: 0
+      - time: .116666667
+        value: .687514484
+        inSlope: -.312495261
+        outSlope: -.312495261
+        tangentMode: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+    attribute: m_LocalRotation.y
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - time: .0166666675
+        value: -.706733108
+        inSlope: .0711250305
+        outSlope: .0711250305
+        tangentMode: 0
+      - time: .116666667
+        value: -.687514722
+        inSlope: .31250599
+        outSlope: .31250599
+        tangentMode: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+    attribute: m_LocalRotation.z
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - time: .0166666675
+        value: .0229881089
+        inSlope: 1.43667459
+        outSlope: 1.43667459
+        tangentMode: 0
+      - time: .116666667
+        value: .165298432
+        inSlope: 1.40407932
+        outSlope: 1.40407932
+        tangentMode: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+    attribute: m_LocalRotation.w
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  m_EulerEditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - time: .0166666675
+        value: 86.2736893
+        inSlope: -233.116684
+        outSlope: -233.116684
+        tangentMode: 10
+      - time: .116666667
+        value: 62.9620209
+        inSlope: -233.116684
+        outSlope: -233.116684
+        tangentMode: 10
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+    attribute: localEulerAnglesBaked.x
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - time: .0166666675
+        value: 89.9998093
+        inSlope: .00175476074
+        outSlope: .00175476074
+        tangentMode: 10
+      - time: .116666667
+        value: 89.9999847
+        inSlope: .00175476074
+        outSlope: .00175476074
+        tangentMode: 10
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+    attribute: localEulerAnglesBaked.y
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - time: .0166666675
+        value: -90.0004578
+        inSlope: .00396728516
+        outSlope: .00396728516
+        tangentMode: 10
+      - time: .116666667
+        value: -90.000061
+        inSlope: .00396728516
+        outSlope: .00396728516
+        tangentMode: 10
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+    attribute: localEulerAnglesBaked.z
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  m_Events: []

Guardian of Silverkeep/Assets/Game Spirtes/Baddies/Water Baddie/Front/Parts/Materials/Flower_Baddie_0005_bot.mat

@@ -7,7 +7,7 @@ Material:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: Flower_Baddie_0005_bot
-  m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 30, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: []
   m_SavedProperties:
     serializedVersion: 2

Guardian of Silverkeep/Assets/Mats/m_Enemy_Dummy.mat

@@ -24,4 +24,4 @@ Material:
       data:
         first:
           name: _Color
-        second: {r: .941176474, g: .382352948, b: 1, a: 1}
+        second: {r: .168798447, g: .345588207, b: .0991024897, a: 1}