tmorgner
diff --git a/‎Assembly-CSharp-firstpass.csproj.DotSettings‎
Lines changed: 2 additions & 0 deletions b/‎Assembly-CSharp-firstpass.csproj.DotSettings‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎Assets/Plugins/UnityTutorialSystem/Scenes/Scripts/CharacterBehaviour.cs‎
Lines changed: 43 additions & 23 deletions b/‎Assets/Plugins/UnityTutorialSystem/Scenes/Scripts/CharacterBehaviour.cs‎
Lines changed: 43 additions & 23 deletions
diff --git a/‎Assets/Plugins/UnityTutorialSystem/Scenes/TutorialAssembly.unity‎
Lines changed: 5 additions & 5 deletions b/‎Assets/Plugins/UnityTutorialSystem/Scenes/TutorialAssembly.unity‎
Lines changed: 5 additions & 5 deletions
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cplugins/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
@@ -1,27 +1,55 @@
-using UnityEngine;
+using NaughtyAttributes;
+using UnityEngine;
 using UnityEngine.Events;
 
-namespace TutorialSystem.Scenes.Scripts
+namespace UnityTutorialSystem.Scenes.Scripts
 {
+    /// <summary>
+    ///   A basic character controller that allows WASD movement and mouse look in a single script.
+    /// </summary>
     [RequireComponent(typeof(CharacterController))]
     public class CharacterBehaviour : MonoBehaviour
     {
+        [BoxGroup("Movement")]
+        [Tooltip("Modifier Key to enable strafing movement")]
         [SerializeField] KeyCode strafeKey;
+        
+        [BoxGroup("Movement")]
+        [Tooltip("Alternative modifier Key to enable strafing movement")]
         [SerializeField] KeyCode strafeKey2;
+        
+        [BoxGroup("Movement")]
+        [SerializeField] bool independentHeadMovement;
+
+        [BoxGroup("Movement")]
+        [SerializeField] bool invertHeadLook;
+        [BoxGroup("Movement")]
+        [SerializeField] bool mouseMovement;
+
+        [BoxGroup("Movement Speed")]
         [SerializeField] float forwardMovementSpeed;
+        [BoxGroup("Movement Speed")]
         [SerializeField] float reverseMovementSpeed;
+        [BoxGroup("Movement Speed")]
         [SerializeField] float strafeSpeed;
-        [SerializeField] float movementThreshold;
+        [BoxGroup("Movement Speed")]
         [SerializeField] float rotationSpeed;
-        [SerializeField] bool independentHeadMovement;
-        [SerializeField] bool invertHeadLook;
+        [BoxGroup("Movement Speed")]
+        [Tooltip("At which velocity does the animation system show an movement animation?")]
+        [SerializeField] float movementThreshold;
+        
+        [BoxGroup("Internal")]
         [SerializeField] Transform head;
-        [SerializeField] bool mouseMovement;
+        
         CharacterController characterController;
-        public UnityEvent MovementBlocked;
-        public UnityEvent Moving;
+        [SerializeField] UnityEvent movementBlocked;
+        [SerializeField] UnityEvent moving;
 
-        public CollisionFlags MovementResult { get; set; }
+        public UnityEvent MovementBlocked => movementBlocked;
+
+        public UnityEvent Moving => moving;
+
+        public CollisionFlags MovementResult { get; private set; }
 
         void Reset()
         {
@@ -39,14 +67,6 @@ void Awake()
             characterController = GetComponent<CharacterController>();
         }
 
-        void OnEnable()
-        {
-        }
-
-        void OnDisable()
-        {
-        }
-
         void FixedUpdate()
         {
             var h = Input.GetAxis("Horizontal");
@@ -77,23 +97,23 @@ void FixedUpdate()
 
             if (mouseMovement)
             {
-                HandleMouseLook();
+                head.localRotation = HandleMouseLook();
             }
 
             MovementResult = characterController.Move(velocity);
 
             if (MovementResult != 0)
             {
-                MovementBlocked?.Invoke();
+                movementBlocked?.Invoke();
             }
 
             if (characterController.velocity.magnitude > movementThreshold)
             {
-                Moving?.Invoke();
+                moving?.Invoke();
             }
         }
 
-        void HandleMouseLook()
+        Quaternion HandleMouseLook()
         {
             var mouseLookAxisX = independentHeadMovement ? Input.GetAxis("Mouse X") : 0;
             var mouseLookAxisY = Input.GetAxis("Mouse Y") * (invertHeadLook ? 1 : -1);
@@ -103,8 +123,8 @@ void HandleMouseLook()
             var eulers = head.localRotation.eulerAngles;
             eulers.y += angleY;
             eulers.x = Mathf.Clamp(Mathf.DeltaAngle(0, eulers.x + angleX), -45, 45);
-
-            head.localRotation = Quaternion.Euler(eulers.x, eulers.y, 0);
+            eulers.z = 0;
+            return Quaternion.Euler(eulers);
         }
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">`
	`2`	`+ <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cplugins/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>`