Gate created and player tagged correctly

Assets/Prefabs/Environment.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d808f60ee05185d43a154521748992a0
+guid: d8346ea4dac8f744d9b0f28eac5eee5f
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Prefabs/Environment/Gate.prefab

@@ -0,0 +1,258 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6150409028514810267
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6150409028514810262}
+  - component: {fileID: 6150409028514810263}
+  - component: {fileID: 6150409028514810264}
+  - component: {fileID: 6150409028514810265}
+  - component: {fileID: 6150409028514810266}
+  m_Layer: 0
+  m_Name: RightDoor
+  m_TagString: kickable
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6150409028514810262
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409028514810267}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 7.25, y: 0, z: 17.02}
+  m_LocalScale: {x: 3, y: 6.0429916, z: 1}
+  m_Children: []
+  m_Father: {fileID: 6150409029086178024}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &6150409028514810263
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409028514810267}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &6150409028514810264
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409028514810267}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &6150409028514810265
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409028514810267}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!54 &6150409028514810266
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409028514810267}
+  serializedVersion: 2
+  m_Mass: 20
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 1
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!1 &6150409029086178026
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6150409029086178024}
+  m_Layer: 0
+  m_Name: Gate
+  m_TagString: kickable
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6150409029086178024
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409029086178026}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -13.5969095, y: 3.74, z: 36.95}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 6150409029095057644}
+  - {fileID: 6150409028514810262}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6150409029095057617
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6150409029095057644}
+  - component: {fileID: 6150409029095057645}
+  - component: {fileID: 6150409029095057646}
+  - component: {fileID: 6150409029095057647}
+  - component: {fileID: 6150409029095057616}
+  m_Layer: 0
+  m_Name: LeftDoor
+  m_TagString: kickable
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6150409029095057644
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409029095057617}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 4.12, y: 0, z: 17.02}
+  m_LocalScale: {x: 3, y: 6.0429916, z: 1}
+  m_Children: []
+  m_Father: {fileID: 6150409029086178024}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &6150409029095057645
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409029095057617}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &6150409029095057646
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409029095057617}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &6150409029095057647
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409029095057617}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!54 &6150409029095057616
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409029095057617}
+  serializedVersion: 2
+  m_Mass: 20
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 1
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0

Assets/Prefabs/Environment/Gate.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b95800967feee2a46a6c25838eb2fc6c
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Lobby/LobbyUI.prefab

@@ -284,7 +284,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &914205285
 RectTransform:
   m_ObjectHideFlags: 0
@@ -496,7 +496,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1063540716
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2624,14 +2624,22 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3190317820503267266, guid: 25b0bd1c83713d44ab76eaa07a6357fa, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -104.4
+      objectReference: {fileID: 0}
     - target: {fileID: 3190317820503267266, guid: 25b0bd1c83713d44ab76eaa07a6357fa, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: 35
       objectReference: {fileID: 0}
     - target: {fileID: 4237331793813064128, guid: 25b0bd1c83713d44ab76eaa07a6357fa, type: 3}
       propertyPath: m_Name
       value: LobbyPlayerCard (1)
       objectReference: {fileID: 0}
+    - target: {fileID: 7093129836083058353, guid: 25b0bd1c83713d44ab76eaa07a6357fa, type: 3}
+      propertyPath: m_IsOn
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 25b0bd1c83713d44ab76eaa07a6357fa, type: 3}
 --- !u!114 &5410293112989509655 stripped
@@ -2749,9 +2757,13 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3190317820503267266, guid: 25b0bd1c83713d44ab76eaa07a6357fa, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -105
+      objectReference: {fileID: 0}
     - target: {fileID: 3190317820503267266, guid: 25b0bd1c83713d44ab76eaa07a6357fa, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: 35
       objectReference: {fileID: 0}
     - target: {fileID: 4237331793813064128, guid: 25b0bd1c83713d44ab76eaa07a6357fa, type: 3}
       propertyPath: m_Name

Assets/Scenes/Demos/MovementScene.unity

@@ -938,7 +938,11 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1818923263116056088, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
       propertyPath: wallMaxDistance
-      value: 1
+      value: 0.8
+      objectReference: {fileID: 0}
+    - target: {fileID: 3607330906377400225, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
+      propertyPath: m_TagString
+      value: Player
       objectReference: {fileID: 0}
     - target: {fileID: 5633209979457551608, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
       propertyPath: m_Name
@@ -954,7 +958,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 4.14
+      value: 7.4
       objectReference: {fileID: 0}
     - target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
       propertyPath: m_LocalPosition.z
@@ -988,6 +992,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8100520363622627413, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
+      propertyPath: kickPow
+      value: 150
+      objectReference: {fileID: 0}
     - target: {fileID: 8100520363622627413, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
       propertyPath: hasWallrun
       value: 1
@@ -1540,3 +1548,60 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2061208975}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1001 &6150409027306451727
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_RootOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -13.5969095
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 3.74
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 36.95
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178026, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_Name
+      value: Gate
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}

Assets/Scenes/Lobby.unity

@@ -429,18 +429,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 914205284, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1063540715, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1241626722294251337, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 2240580173848419138, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
       propertyPath: m_AnchorMax.x
       value: 0
@@ -501,14 +489,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4620280530732948611, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5364737552827907105, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
-      propertyPath: m_IsOn
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 7203582894680926279, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
       propertyPath: m_AnchorMax.x
       value: 0

Assets/Scripts/Environment.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f3064a5694a1bdf489cf61344dfc527e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dKickController.cs

@@ -28,8 +28,6 @@ public class dKickController : NetworkBehaviour
     }
 
     void Kick(){
-        //Note: when we merge this into PlayerMovement, we may want to change isgrounded to our 
-        //custom is grounded
         if (Input.GetKeyDown(KeyCode.F) && isKicking == false && characterController.isGrounded == false)
         {
             Debug.Log("dive");
@@ -67,6 +65,9 @@ public class dKickController : NetworkBehaviour
         //if (!IsLocalPlayer) { return; }
         Collider myCollider = collision.contacts[0].thisCollider;
         if (collision.transform.CompareTag("kickable") && myCollider == leg.GetComponent<Collider>()){
+            if(collision.gameObject.GetComponent<Rigidbody>().isKinematic == true){
+                collision.gameObject.GetComponent<Rigidbody>().isKinematic = false;
+            }
             Vector3 direction = this.transform.forward;
             Debug.Log(direction);
             collision.rigidbody.AddForce(direction * pStats.KickPow, ForceMode.Impulse);

Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dWallRun.cs

@@ -7,7 +7,7 @@ using UnityEngine.Rendering;
 public class dWallRun : NetworkBehaviour
 {
 
-    public float wallMaxDistance = 5;
+    public float wallMaxDistance = .8f;
     public float wallSpeedMultiplier = 1.2f;
     public float minimumHeight = .1f;
     public float maxAngleRoll = 20;
@@ -32,7 +32,6 @@ public class dWallRun : NetworkBehaviour
     float elapsedTimeSinceJump = 0;
     float elapsedTimeSinceWallAttach = 0;
     float elapsedTimeSinceWallDetatch = 0;
-    bool attachOnce = false;
     bool jumping;
 
     bool isPlayergrounded() => playerMovementController.isGrounded;
@@ -177,9 +176,8 @@ public class dWallRun : NetworkBehaviour
 
             playerMovementController.SetPlayerVelocity(moveToSet);
             isWallRunning = true;
-            if(!attachOnce && playerMovementController.curJumpNum != 0){
-                playerMovementController.curJumpNum = playerMovementController.curJumpNum - 2 ;
-                attachOnce = true;
+            if(playerMovementController.curJumpNum != 0){
+                playerMovementController.curJumpNum = 0 ;
             }
             
         }
@@ -199,10 +197,6 @@ public class dWallRun : NetworkBehaviour
 
     public Vector3 GetWallJumpDirection() //Add call in jump where if we are wallrunning and jump, the jump vector is multiplied by this
     {
-        if(isWallRunning)
-        {
-            return lastWallNormal * wallBouncing + Vector3.up;
-        }
-        return Vector3.zero;
-    } 
+        return lastWallNormal * wallBouncing + (transform.up);
+    }
 }

Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs

@@ -65,7 +65,7 @@ public class dPlayerMovement : NetworkBehaviour
     private Rigidbody rB;
     private CapsuleCollider capCol;
     private bool firstHit = false;
-    private bool heldDown = false;
+    //private bool heldDown = false; //Variable for testing Ragdoll reenable if needed
     private bool beginRagTimer = false;
     private float ragTime; 
     private Vector3 prevRot;
@@ -262,7 +262,8 @@ public class dPlayerMovement : NetworkBehaviour
         if (Input.GetAxis("Jump") != 0 && !jumpPressed && curJumpNum + 1 < pStats.JumpNum && !isSliding)
         {
             if(wallRun.IsWallRunning()){
-                AddImpact((wallRun.GetWallJumpDirection()), pStats.JumpPow);
+                AddImpact((wallRun.GetWallJumpDirection()), pStats.JumpPow * 1.3f);
+                AddImpact(transform.up, pStats.JumpPow);
             }
             else{
                 AddImpact(transform.up, pStats.JumpPow);
@@ -367,8 +368,6 @@ public class dPlayerMovement : NetworkBehaviour
         else{
             vel.y -= pStats.PlayerGrav * Time.deltaTime;
         }
-                                                             //If gliding 
-                                                             //Go down slowly
     }
 
 

Assets/Scripts/PlayerScripts/KickController.cs

@@ -62,11 +62,14 @@ public class KickController : NetworkBehaviour
 
     }
 
-    private void OnCollisionEnter(Collision collision)
+  private void OnCollisionEnter(Collision collision)
     {
         //if (!IsLocalPlayer) { return; }
         Collider myCollider = collision.contacts[0].thisCollider;
         if (collision.transform.CompareTag("kickable") && myCollider == leg.GetComponent<Collider>()){
+            if(collision.gameObject.GetComponent<Rigidbody>().isKinematic == true){
+                collision.gameObject.GetComponent<Rigidbody>().isKinematic = false;
+            }
             Vector3 direction = this.transform.forward;
             Debug.Log(direction);
             collision.rigidbody.AddForce(direction * pStats.KickPow, ForceMode.Impulse);

Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 286df2f965f4f3c4eb74950f0550e68f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/WallRun.cs

@@ -7,7 +7,7 @@ using UnityEngine.Rendering;
 public class WallRun : NetworkBehaviour
 {
 
-    public float wallMaxDistance = 5;
+     public float wallMaxDistance = 5;
     public float wallSpeedMultiplier = 1.2f;
     public float minimumHeight = .1f;
     public float maxAngleRoll = 20;
@@ -83,14 +83,14 @@ public class WallRun : NetworkBehaviour
             {
                 Vector3 dir = transform.TransformDirection(directions[i]);
                 Physics.Raycast(transform.position, dir, out hits[i], wallMaxDistance);
-                // if(hits[i].collider != null)
-                // {
-                //     Debug.DrawRay(transform.position, dir * hits[i].distance, Color.green);
-                // }
-                // else
-                // {
-                //     Debug.DrawRay(transform.position, dir * wallMaxDistance, Color.red);
-                // }
+                if(hits[i].collider != null)
+                {
+                    Debug.DrawRay(transform.position, dir * hits[i].distance, Color.green);
+                }
+                else
+                {
+                    Debug.DrawRay(transform.position, dir * wallMaxDistance, Color.red);
+                }
             }
 
             if(CanWallRun())
@@ -159,7 +159,6 @@ public class WallRun : NetworkBehaviour
 
             if((moveToSetNorm.x < 0 && velNorm.x > 0)){
                 moveToSet.x = (moveToSet.x * -velNorm.x);
-                Debug.Log("x");
             }
             else if((moveToSetNorm.x > 0 && velNorm.x < 0) ){
                 moveToSet.x = (-moveToSet.x * -velNorm.x);
@@ -167,7 +166,6 @@ public class WallRun : NetworkBehaviour
 
             if((moveToSetNorm.z < 0 && velNorm.z > 0)){
                 moveToSet.z =  (moveToSet.z * -velNorm.z);
-                Debug.Log("z");
             }
             else if((moveToSetNorm.z > 0 && velNorm.z < 0)){
                 moveToSet.z =  (-moveToSet.z * -velNorm.z);
@@ -178,6 +176,10 @@ public class WallRun : NetworkBehaviour
 
             playerMovementController.SetPlayerVelocity(moveToSet);
             isWallRunning = true;
+            if(playerMovementController.curJumpNum != 0){
+                playerMovementController.curJumpNum = 0 ;
+            }
+            
         }
     }
 
@@ -195,10 +197,6 @@ public class WallRun : NetworkBehaviour
 
     public Vector3 GetWallJumpDirection() //Add call in jump where if we are wallrunning and jump, the jump vector is multiplied by this
     {
-        if(isWallRunning)
-        {
-            return lastWallNormal * wallBouncing + Vector3.up;
-        }
-        return Vector3.zero;
+        return lastWallNormal * wallBouncing + (transform.up);
     } 
 }

Assets/Scripts/PlayerScripts/PlayerMovement.cs

@@ -26,7 +26,7 @@ public class PlayerMovement : NetworkBehaviour
     private CharacterController moveController;
 
     //Jump value
-    private int curJumpNum;
+    public int curJumpNum;
     private bool jumpPressed;
     bool tempSet = false;
     float tempTraction = 0.0f;
@@ -65,7 +65,7 @@ public class PlayerMovement : NetworkBehaviour
     private Rigidbody rB;
     private CapsuleCollider capCol;
     private bool firstHit = false;
-    private bool heldDown = false;
+    //private bool heldDown = false;  //Variable for testing ragdoll reenable if needed
     private bool beginRagTimer = false;
     private float ragTime; 
     private Vector3 prevRot;
@@ -239,7 +239,13 @@ public class PlayerMovement : NetworkBehaviour
         //If space is pressed apply an upwards force to the player
         if (Input.GetAxis("Jump") != 0 && !jumpPressed && curJumpNum + 1 < pStats.JumpNum && !isSliding)
         {
-            AddImpact(transform.up, pStats.JumpPow);
+            if(wallRun.IsWallRunning()){
+                AddImpact((wallRun.GetWallJumpDirection()), pStats.JumpPow * 1.3f);
+                AddImpact(transform.up, pStats.JumpPow);
+            }
+            else{
+                AddImpact(transform.up, pStats.JumpPow);
+            }
             curJumpNum++;
             jumpPressed = true;
         }
@@ -328,7 +334,7 @@ public class PlayerMovement : NetworkBehaviour
                 tempSet = true;
             }
         }
-        else{
+        else if(!jumpPressed && pStats.HasGlider){
 
             if(tempSet == true){
                pStats.Traction = tempTraction;
@@ -340,9 +346,11 @@ public class PlayerMovement : NetworkBehaviour
         }
 
         //Wallrunning
-        if (pStats.HasWallrun) { wallRun.WallRunRoutine(); } //adjusted later if we are wallrunning
-                                                             //If gliding 
-                                                             //Go down slowly
+        else if (pStats.HasWallrun) { wallRun.WallRunRoutine(); } //adjusted later if we are wallrunning
+
+        else{
+            vel.y -= pStats.PlayerGrav * Time.deltaTime;
+        }
     }
 
 

Assets/Scripts/PlayerScripts/PlayerStats.cs

@@ -55,7 +55,7 @@ public class PlayerStats : MonoBehaviour
     }
 
     //Player Kick Power
-    [SerializeField] private float kickPow = 100.0f;
+    [SerializeField] private float kickPow = 150.0f;
     public float KickPow{
         get{ return kickPow; }
         set{ kickPow = value; }
@@ -68,7 +68,6 @@ public class PlayerStats : MonoBehaviour
         set{ recovTime = value; }
     }
 
-    //MAY BE UNNECCESARY DEPENDING ON HOW GLIDER TURNS OUT
     //Gravity Affecting the player
     [SerializeField] private float playerGrav = 20.0f;
     public float PlayerGrav{

ProjectSettings/DynamicsManager.asset

@@ -3,10 +3,11 @@
 --- !u!55 &1
 PhysicsManager:
   m_ObjectHideFlags: 0
-  serializedVersion: 11
+  serializedVersion: 13
   m_Gravity: {x: 0, y: -9.81, z: 0}
   m_DefaultMaterial: {fileID: 0}
   m_BounceThreshold: 2
+  m_DefaultMaxDepenetrationVelocity: 10
   m_SleepThreshold: 0.005
   m_DefaultContactOffset: 0.01
   m_DefaultSolverIterations: 6
@@ -22,7 +23,8 @@ PhysicsManager:
   m_AutoSyncTransforms: 0
   m_ReuseCollisionCallbacks: 1
   m_ClothInterCollisionSettingsToggle: 0
-  m_ContactPairsMode: 0
+  m_ClothGravity: {x: 0, y: -9.81, z: 0}
+  m_ContactPairsMode: 3
   m_BroadphaseType: 0
   m_WorldBounds:
     m_Center: {x: 0, y: 0, z: 0}
@@ -31,4 +33,5 @@ PhysicsManager:
   m_FrictionType: 0
   m_EnableEnhancedDeterminism: 0
   m_EnableUnifiedHeightmaps: 1
-  m_DefaultMaxAngluarSpeed: 7
+  m_SolverType: 0
+  m_DefaultMaxAngularSpeed: 7

UserSettings/EditorUserSettings.asset

@@ -24,16 +24,16 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
       flags: 0
     RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
+      value: 22424703114646680e0b0227036c731f1415016439262f2434
       flags: 0
     RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036c731f1415016439262f2434
+      value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
       flags: 0
     RecentlyUsedScenePath-8:
       value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
       flags: 0
     RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036c731f1415016439262f2434
+      value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
       flags: 0
     UnityRemoteCompression:
       value: 337f73