Merge branch 'add-sliding-to-jump-descending-transition' of https://github.com/mtakac/open-project-1 into pr-bashing

# Conflicts:
#	UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/PigChef_TransitionTable.asset
#	UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Idle.asset

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/PigChef_TransitionTable.asset

   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 872cbaa965d1f6e4e98365d74e2060df, type: 3}
-  m_Name: PigChef_TransitionTable
+  m_Name: CharacterTransitionTable
   m_EditorClassIdentifier: 
   _transitions:
   - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
     - ExpectedResult: 1
       Condition: {fileID: 11400000, guid: c5090b215e4f1594f9d1ef6680cd15bb, type: 2}
       Operator: 0
-  - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
-    ToState: {fileID: 11400000, guid: ff92a93d8a8694247b507d811c88e402, type: 2}
-    Conditions:
-    - ExpectedResult: 0
-      Condition: {fileID: 11400000, guid: b33fba8c83df19f4ead430fbcc728687, type: 2}
-      Operator: 0
-  - FromState: {fileID: 11400000, guid: ff92a93d8a8694247b507d811c88e402, type: 2}
-    ToState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
+  - FromState: {fileID: 11400000, guid: 4c2c0dc4f7ee62b4d95b20ac3dce281e, type: 2}
+    ToState: {fileID: 11400000, guid: c57ed1dc57a890943b2648ca8a581075, type: 2}
-    - ExpectedResult: 0
-      Condition: {fileID: 11400000, guid: 2bfa25e0277246b4ba0ea0117c40c18b, type: 2}
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: c7258bdb2558a214f916c8b5b3c0fa1f, type: 2}
       Operator: 0

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Idle.asset

   m_Name: Idle
   m_EditorClassIdentifier: 
   _actions:
-  - {fileID: 11400000, guid: 99b804881a9d5744fb4784c30000c0b5, type: 2}
-  - {fileID: 11400000, guid: c0d0573a78e4c6245ab9676e7af35880, type: 2}
-  - {fileID: 11400000, guid: 7ad91f04f328d9d42a677833fa39748d, type: 2}
+  - {fileID: 11400000, guid: c0d0573a78e4c6245ab9676e7af35880, type: 2}