Merge branch 'develop' into sam/feat/dedicated-server-support

# Conflicts:
#	Assets/Prefabs/CharGFX/VandalImpGraphics.prefab
#	Assets/Scripts/Gameplay/ConnectionManagement/ServerGameNetPortal.cs

Author: SamuelBellomo

Assets/GameData/Action/VandalImp.meta

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

Assets/GameData/Action/VandalImp/ImpToss.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f657f7081f4fb2c005104ef7612e7c8816ac8ce2aa6485b146767190c7264841
+size 408

Assets/GameData/Action/VandalImp/ImpToss.asset.meta

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6135b8795be90c0ee170bfdd401595eaa0892ba2b54f3b1f8771b5da9ce81cd7
+size 666

Assets/GameData/Character/Imp/VandalImp.asset

@@ -0,0 +1,14 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!134 &13400000
+PhysicMaterial:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ImpTossPhysics
+  dynamicFriction: 0.1
+  staticFriction: 0.6
+  bounciness: 1
+  frictionCombine: 0
+  bounceCombine: 0

Assets/GameData/Character/VandalImp.meta

@@ -1245,7 +1245,6 @@ GameObject:
   - component: {fileID: -559815779163765970}
   - component: {fileID: -8995571906845300287}
   - component: {fileID: 6030569013059244219}
-  - component: {fileID: -823941263164167683}
   - component: {fileID: 1324944314608130499}
   m_Layer: 6
   m_Name: VandalImpGraphics
@@ -1324,13 +1323,13 @@ MonoBehaviour:
   m_EventsOnNodeEntry:
   - m_AnimatorNodeName: Attack1
     m_AnimatorNodeNameHash: -47317214
-    m_Prefab: {fileID: 1652666497380707034, guid: abf9f7de0d4eb4941a1b17568597deb2, type: 3}
+    m_Prefab: {fileID: 0}
     m_PrefabSpawnDelaySeconds: 0.8
     m_PrefabCanBeAbortedUntilSecs: 0
     m_PrefabParent: {fileID: 0}
     m_PrefabParentOffset: {x: 0, y: 0, z: 0}
     m_DeParentPrefab: 0
-    m_SoundEffect: {fileID: 8300000, guid: 808ba00e4b69fe8489fd8020ec50ed2d, type: 3}
+    m_SoundEffect: {fileID: 8300000, guid: a08cbad8bcaf8c345aa6ae1e7578eee9, type: 3}
     m_SoundStartDelaySeconds: 0
     m_VolumeMultiplier: 1
     m_LoopSound: 0
@@ -1767,23 +1766,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e8d0727d5ae3244e3b569694d3912374, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Animator: {fileID: 0}
---- !u!114 &-823941263164167683
-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
+  m_Animator: {fileID: 234724737205816310}
 --- !u!114 &1324944314608130499
 MonoBehaviour:
   m_ObjectHideFlags: 0