Merge branch 'develop' into feature/on-transport-failure-handling

Author: LPLafontaineB

Assets/GameData/Action/VandalImp/ImpToss.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e00e1324dfeec11224fd0f99393c9c0b04e50932abeba8e408c135fc3d6aa79a
-size 1073
+oid sha256:2ddd66833c793d93eb956aa3ceb8b580db3ab92a46334b0e60bb7a99e5636005
+size 1153

Assets/GameData/Transforms/NetworkGameState.asset

@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Head_Imp_Bomb
+  m_Name: Head_Imp_Vandal
   m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
   m_ValidKeywords: []
   m_InvalidKeywords:
@@ -82,6 +82,8 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _RimAmount: 0.667
     - _RimThreshold: 0
     - _SmoothnessTextureChannel: 0

Assets/Material/Characters/Toon/Head_Imp_Bomb.mat renamed to Assets/Material/Characters/Toon/Head_Imp_Vandal.mat

@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Torso_Imp_Bomb
+  m_Name: Torso_Imp_Vandal
   m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
   m_ValidKeywords: []
   m_InvalidKeywords:
@@ -82,6 +82,8 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _RimAmount: 0.366
     - _RimThreshold: 0
     - _SmoothnessTextureChannel: 0

Assets/Material/Characters/Toon/Head_Imp_Bomb.mat.meta renamed to Assets/Material/Characters/Toon/Head_Imp_Vandal.mat.meta

@@ -23,3 +23,11 @@ AnimatorOverrideController:
     m_OverrideClip: {fileID: -3770237558735227746, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
   - m_OriginalClip: {fileID: -5612658629409835226, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
     m_OverrideClip: {fileID: 8009636489596012282, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
+  - m_OriginalClip: {fileID: -4852724403241161369, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
+    m_OverrideClip: {fileID: -4852724403241161369, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
+  - m_OriginalClip: {fileID: -1504929105726005784, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
+    m_OverrideClip: {fileID: -4852724403241161369, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
+  - m_OriginalClip: {fileID: -565464528270119969, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
+    m_OverrideClip: {fileID: 7923818702227147186, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
+  - m_OriginalClip: {fileID: 7291507243818066706, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
+    m_OverrideClip: {fileID: -4852724403241161369, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}

Assets/Material/Characters/Toon/Torso_Imp_Bomb.mat renamed to Assets/Material/Characters/Toon/Torso_Imp_Vandal.mat

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f1324c45a2ff9a17ad7db32c93dae3d4cf9469eef00db17878be315346fc3801
-size 8036416
+oid sha256:8a581198ea826f5ccad6a6a04045a5771381855629ef1a006711add744e50278
+size 8035376

Assets/Material/Characters/Toon/Torso_Imp_Bomb.mat.meta renamed to Assets/Material/Characters/Toon/Torso_Imp_Vandal.mat.meta

@@ -1245,6 +1245,7 @@ GameObject:
   - component: {fileID: -559815779163765970}
   - component: {fileID: -8995571906845300287}
   - component: {fileID: 6030569013059244219}
+  - component: {fileID: -1890528778572688093}
   m_Layer: 6
   m_Name: VandalImpGraphics
   m_TagString: Untagged
@@ -1322,12 +1323,12 @@ MonoBehaviour:
   - m_AnimatorNodeName: Attack1
     m_AnimatorNodeNameHash: -47317214
     m_Prefab: {fileID: 0}
-    m_PrefabSpawnDelaySeconds: 0.8
+    m_PrefabSpawnDelaySeconds: 0
     m_PrefabCanBeAbortedUntilSecs: 0
     m_PrefabParent: {fileID: 0}
     m_PrefabParentOffset: {x: 0, y: 0, z: 0}
     m_DeParentPrefab: 0
-    m_SoundEffect: {fileID: 8300000, guid: a08cbad8bcaf8c345aa6ae1e7578eee9, type: 3}
+    m_SoundEffect: {fileID: 0}
     m_SoundStartDelaySeconds: 0
     m_VolumeMultiplier: 1
     m_LoopSound: 0
@@ -1358,6 +1359,7 @@ MonoBehaviour:
   m_AudioSources:
   - {fileID: -8069025211240352543}
   - {fileID: -4965377615854939036}
+  - {fileID: -4965377615854939036}
   m_Animator: {fileID: 234724737205816310}
   m_ClientCharacterVisualization: {fileID: 0}
 --- !u!82 &-8069025211240352543
@@ -1765,6 +1767,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Animator: {fileID: 234724737205816310}
+--- !u!114 &-1890528778572688093
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6839301660383890230}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GlobalObjectIdHash: 951099334
+  AlwaysReplicateAsRoot: 0
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
 --- !u!1 &7108127146651356877
 GameObject:
   m_ObjectHideFlags: 0
@@ -2071,7 +2089,7 @@ GameObject:
   - component: {fileID: 8731501901720154717}
   - component: {fileID: 4907214515068745264}
   m_Layer: 6
-  m_Name: Imp_WeaponR
+  m_Name: Imp_TossedObject
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Models/Animation Controllers/CharacterSetController_VandalImp.overrideController

@@ -7,6 +7,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 176558388678216186}
     m_Modifications:
+    - target: {fileID: -1890528778572688093, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3}
+      propertyPath: GlobalObjectIdHash
+      value: 951099334
+      objectReference: {fileID: 0}
     - target: {fileID: -823941263164167683, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3}
       propertyPath: GlobalObjectIdHash
       value: 951099334
@@ -168,6 +172,10 @@ PrefabInstance:
       propertyPath: m_ClientCharacterVisualization
       value: 
       objectReference: {fileID: 3806176119258990995}
+    - target: {fileID: 8398944656959553575, guid: 64cfd098f62285f42918875fef849e88, type: 3}
+      propertyPath: m_KilledDestroyDelaySeconds
+      value: 2
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 64cfd098f62285f42918875fef849e88, type: 3}
 --- !u!1 &176558388678216176 stripped