Merge branch 'main' of https://scovania.duckdns.org/scove/BABA_YAGA

.gitignore

@@ -83,3 +83,4 @@ crashlytics-build.properties
 Assets/Settings/Project Setting/FirebaseConfig.asset
 Assets/Settings/Project Setting/FirebaseConfig.asset.meta
 /BABA_YAGA_Updater/.gemini-workspace-history
+.gemini-pool.json

.idea/.idea.BABA_YAGA/.idea/indexLayout.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="UserContentModel">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>

.idea/.idea.BABA_YAGA/.idea/workspace.xml

@@ -6,23 +6,11 @@
   <component name="ChangeListManager">
     <list default="true" id="d308d1cb-09fc-4331-ba20-00f7b43d1576" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/.idea.BABA_YAGA/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.BABA_YAGA/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Opsive.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/CharacterControllerInstaller.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/CharacterControllerInstaller.cs.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/Icons.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/Icons/FailureDarkIcon.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/Icons/FailureDarkIcon.png.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/Icons/FailureLightIcon.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/Icons/FailureLightIcon.png.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/Icons/SuccessDarkIcon.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/Icons/SuccessDarkIcon.png.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/Icons/SuccessLightIcon.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Opsive/Installer/UltimateCharacterController/Editor/Icons/SuccessLightIcon.png.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ProjectSettings/QualitySettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/QualitySettings.asset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ProjectSettings/URPProjectSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/URPProjectSettings.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Demo.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Demo.unity" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/AssaultRifle/MuzzleFlash.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/AssaultRifle/MuzzleFlash.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/Bullets/BulletDecalWood3.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/Bullets/BulletDecalWood3.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Presets/Character/AirborneJumpPreset.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Presets/Character/AirborneJumpPreset.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Presets/DemoStateConfiguration.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Presets/DemoStateConfiguration.asset" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -37,6 +25,7 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="HighlightingSettingsPerFile">
+    <setting file="file://$PROJECT_DIR$/.gemini-pool.json" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/Scripts/Game/EloData.cs.meta" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/Scripts/Game/MatchEloManager.cs.meta" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/Scripts/GameSetup/Maze/MazeManager.cs.meta" root0="FORCE_HIGHLIGHTING" />
@@ -53,26 +42,27 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.MCP Project settings loaded&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
-    &quot;com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
-    &quot;junie.onboarding.icon.badge.shown&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;to.speed.mode.migration.done&quot;: &quot;true&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ModuleVcsDetector.initialDetectionPerformed": "true",
+    "RunOnceActivity.MCP Project settings loaded": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "RunOnceActivity.typescript.service.memoryLimit.init": "true",
+    "com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1": "true",
+    "git-widget-placeholder": "main",
+    "junie.onboarding.icon.badge.shown": "true",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "terminal",
+    "to.speed.mode.migration.done": "true",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor">
     <configuration name="Start Unity" type="RunUnityExe" factoryName="Unity Executable">
       <option name="EXE_PATH" value="C:\Program Files\Unity\Hub\Editor\6000.3.10f1\Editor\Unity.exe" />
@@ -125,6 +115,7 @@
       <workItem from="1781015858277" duration="4448000" />
       <workItem from="1781181289365" duration="2651000" />
       <workItem from="1781412609976" duration="4823000" />
+      <workItem from="1781599612251" duration="1753000" />
     </task>
     <servers />
   </component>

Assets/Opsive/UltimateCharacterController/Demo/Demo.unity

@@ -119008,13 +119008,13 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EnemyLayers:
     serializedVersion: 2
-    m_Bits: 100663296
+    m_Bits: 0
   m_InvisibleLayers:
     serializedVersion: 2
     m_Bits: 1879048198
   m_SolidObjectLayers:
     serializedVersion: 2
-    m_Bits: 2382364675
+    m_Bits: 2281701379
 --- !u!114 &1278971606
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -135443,10 +135443,10 @@ TextMesh:
   m_GameObject: {fileID: 1485857039}
   m_Text: 'The Aim Assist Component can keep
 
-    your crosshairs centered on a
-    target
+    your crosshairs centered on a target
 
-    based on an influence factor'
+    based
+    on an influence factor'
   m_OffsetZ: 0
   m_CharacterSize: 1
   m_LineSpacing: 1
@@ -171402,7 +171402,7 @@ MonoBehaviour:
   - m_Header: Movement Types
     m_Description: 'The character and camera can change the way they interpret input.
 
-      
+
 
       -
       Press Escape to switch between the movement types.

Assets/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/AssaultRifle/MuzzleFlash.mat

@@ -81,6 +81,6 @@ Material:
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _TintColor: {r: 1, g: 1, b: 1, a: 0}
+    - _TintColor: {r: 0, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []
   m_AllowLocking: 1

Assets/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/Bullets/BulletDecalWood3.mat

@@ -27,6 +27,7 @@ Material:
   disabledShaderPasses:
   - MOTIONVECTORS
   - DepthOnly
+  - SHADOWCASTER
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
@@ -56,7 +57,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: 5e5f571648993e34c92ac3c89a25c156, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
@@ -125,7 +126,7 @@ Material:
     - _ZWrite: 0
     m_Colors:
     - _BaseColor: {r: 0.8901961, g: 0.77254903, b: 0.62745106, a: 1}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 0.8901961, g: 0.77254903, b: 0.62745106, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []

Assets/Opsive/UltimateCharacterController/Demo/Presets/Character/AirborneJumpPreset.asset

@@ -3,8 +3,9 @@
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0