Merge branch 'develop'

Author: JeroenoBoy

Runtime/StateMachine/State.cs

@@ -36,7 +36,7 @@ public abstract class State : MonoBehaviour
         /// <summary>
         /// Internal function of activating the state
         /// </summary>
-        internal virtual bool ActivateState(StateData data)
+        internal bool ActivateState(StateData data)
         {
             try {
                 _timeEnteredState = Time.time;

Runtime/StateMachine/StateMachine.cs

@@ -144,6 +144,30 @@ public bool TryFindState<T>(out T state) where T : State
         }
 
 
+        /// <summary>
+        /// Activates the state machine
+        /// </summary>
+        public void Activate([CanBeNull] StateData data = null)
+        {
+            if (isActive) return;
+            ActivateState(data ?? new StateData());
+        }
+
+
+        /// <summary>
+        /// Continues the queue in the state machine, or deactivates the state if it is the root state machine
+        /// </summary>
+        public new void Deactivate()
+        {
+            if (!isActive) return;
+            if (stateMachine == null) {
+                DeactivateState();
+            } else {
+                base.Deactivate();
+            }
+        }
+
+
         /// <summary>
         /// Internal function for deactivating the state
         /// </summary>
@@ -171,6 +195,7 @@ protected override void Awake()
         protected virtual void Start()
         {
             if (!_autoActivate) return;
+            if (isActive) return;
             ActivateState(new StateData());
         }
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "jutils",
   "displayName": "JUtils",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "description": "A unity utilities library, this contains many handy extensions, components and data structures with custom editors",
   "license": "LGPL-3.0",
   "author": {