18 files changed, 104 insertions, 140 deletions
diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetAcceleration.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetAcceleration.cs.meta
index 46720f9c..1e8dfda7 100644
--- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetAcceleration.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetAcceleration.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 06e82895d2abea24599ddfd6f0d7386a
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: 06e82895d2abea24599ddfd6f0d7386a
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetAxis.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetAxis.cs
index 64dfc476..00249ff4 100644
--- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetAxis.cs
+++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetAxis.cs
@@ -1,8 +1,4 @@
 using UnityEngine;
-#if CROSS_PLATFORM_INPUT
-using UnityStandardAssets.CrossPlatformInput;
-#endif
-
 
 namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityInput
 {
@@ -20,11 +16,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityInput
 
         public override TaskStatus OnUpdate()
         {
-#if CROSS_PLATFORM_INPUT
-            var axisValue = CrossPlatformInputManager.GetAxis(axisName.Value);
-#else
             var axisValue = Input.GetAxis(axisName.Value);
-#endif
 
             // if variable set to none, assume multiplier of 1
             if (!multiplier.IsNone) {
diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetAxis.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetAxis.cs.meta
index b15eb427..1cd25e75 100644
--- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetAxis.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetAxis.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 84fa68d3aa9286f488ee60bb7f420079
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: 84fa68d3aa9286f488ee60bb7f420079
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetAxisRaw.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetAxisRaw.cs
index 4f3e8916..3a28cd38 100644
--- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetAxisRaw.cs
+++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetAxisRaw.cs
@@ -1,7 +1,4 @@
 using UnityEngine;
-#if CROSS_PLATFORM_INPUT
-using UnityStandardAssets.CrossPlatformInput;
-#endif
 
 namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityInput
 {
@@ -19,11 +16,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityInput
 
         public override TaskStatus OnUpdate()
         {
-#if CROSS_PLATFORM_INPUT
-            var axisValue = CrossPlatformInputManager.GetAxisRaw(axisName.Value);
-#else
             var axisValue = Input.GetAxis(axisName.Value);
-#endif
 
             // if variable set to none, assume multiplier of 1
             if (!multiplier.IsNone) {
diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetAxisRaw.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetAxisRaw.cs.meta
index 9f0257dc..77f25947 100644
--- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetAxisRaw.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetAxisRaw.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: d7ba1768defe9ae4489e2d849801caf2
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: d7ba1768defe9ae4489e2d849801caf2
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetButton.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetButton.cs
index 16ca5592..aafcb287 100644
--- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetButton.cs
+++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetButton.cs
@@ -1,7 +1,4 @@
 using UnityEngine;
-#if CROSS_PLATFORM_INPUT
-using UnityStandardAssets.CrossPlatformInput;
-#endif
 
 namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityInput
 {
@@ -17,11 +14,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityInput
 
         public override TaskStatus OnUpdate()
         {
-#if CROSS_PLATFORM_INPUT
-            storeResult.Value = CrossPlatformInputManager.GetButton(buttonName.Value);
-#else
             storeResult.Value = Input.GetButton(buttonName.Value);
-#endif
             return TaskStatus.Success;
         }
 
diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetButton.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetButton.cs.meta
index 3f0dcc36..faf918f8 100644
--- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetButton.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetButton.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 7ca2e1ded24b0a144b628bb8ed81ccd0
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: 7ca2e1ded24b0a144b628bb8ed81ccd0
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetKey.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetKey.cs.meta
index 250f6552..a2b83cd6 100644
--- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetKey.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetKey.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 8d91595c5c003b948abb908c7465a7ec
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: 8d91595c5c003b948abb908c7465a7ec
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetMouseButton.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetMouseButton.cs.meta
index bef0000b..668f7955 100644
--- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetMouseButton.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetMouseButton.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 3449e6301a95d9e49a8f6b50ef862faa
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: 3449e6301a95d9e49a8f6b50ef862faa
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetMousePosition.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetMousePosition.cs.meta
index 6909b9e2..ecbbec41 100644
--- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetMousePosition.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/GetMousePosition.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: f11dbb85cfc5b3941ae4f82fa54b7d27
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: f11dbb85cfc5b3941ae4f82fa54b7d27
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsButtonDown.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsButtonDown.cs
index 9fd532f7..8a783800 100644
--- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsButtonDown.cs
+++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsButtonDown.cs
@@ -1,7 +1,4 @@
 using UnityEngine;
-#if CROSS_PLATFORM_INPUT
-using UnityStandardAssets.CrossPlatformInput;
-#endif
 
 namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityInput
 {
@@ -14,11 +11,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityInput
 
         public override TaskStatus OnUpdate()
         {
-#if CROSS_PLATFORM_INPUT
-            return CrossPlatformInputManager.GetButtonDown(buttonName.Value) ? TaskStatus.Success : TaskStatus.Failure;
-#else
             return Input.GetButtonDown(buttonName.Value) ? TaskStatus.Success : TaskStatus.Failure;
-#endif
         }
 
         public override void OnReset()
diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsButtonDown.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsButtonDown.cs.meta
index 82b95089..58e45ee8 100644
--- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsButtonDown.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsButtonDown.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 554c281a83ae5bb4bbcdf3bdeac6779e
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: 554c281a83ae5bb4bbcdf3bdeac6779e
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsButtonUp.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsButtonUp.cs
index 6278ceb5..4912f768 100644
--- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsButtonUp.cs
+++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsButtonUp.cs
@@ -1,7 +1,4 @@
 using UnityEngine;
-#if CROSS_PLATFORM_INPUT
-using UnityStandardAssets.CrossPlatformInput;
-#endif
 
 namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityInput
 {
@@ -14,11 +11,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityInput
 
         public override TaskStatus OnUpdate()
         {
-#if CROSS_PLATFORM_INPUT
-            return CrossPlatformInputManager.GetButtonUp(buttonName.Value) ? TaskStatus.Success : TaskStatus.Failure;
-#else
             return Input.GetButtonUp(buttonName.Value) ? TaskStatus.Success : TaskStatus.Failure;
-#endif
         }
 
         public override void OnReset()
diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsButtonUp.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsButtonUp.cs.meta
index 5326dcbc..4708eeea 100644
--- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsButtonUp.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsButtonUp.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 71d9dda886873b943922eae52da81244
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: 71d9dda886873b943922eae52da81244
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsKeyDown.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsKeyDown.cs.meta
index bffece71..51c7860e 100644
--- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsKeyDown.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsKeyDown.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: b4c02f1f071b9604389e1c1f1bfab3eb
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: b4c02f1f071b9604389e1c1f1bfab3eb
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsKeyUp.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsKeyUp.cs.meta
index bbca872f..fc9b37ba 100644
--- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsKeyUp.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsKeyUp.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 7d8622d5540c851448ad036016f0f426
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: 7d8622d5540c851448ad036016f0f426
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsMouseDown.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsMouseDown.cs.meta
index 63169ed0..bb11a39f 100644
--- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsMouseDown.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsMouseDown.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: fd85264410cd9ac45b0c9c2e550f7c46
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: fd85264410cd9ac45b0c9c2e550f7c46
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsMouseUp.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsMouseUp.cs.meta
index 8d3608bf..42a5ef7f 100644
--- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsMouseUp.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Input/IsMouseUp.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: b2ecc8718d19d9b46832c51de0390245
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: b2ecc8718d19d9b46832c51de0390245
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: