after merge

2025-02-10 13:58:04 +01:00
parent f20d52edb0
commit 1d8f6c55cf
4 changed files with 667 additions and 488 deletions
--- a/Assets/PlayMaker/Editor/Resources/EditorStartupPrefs.asset
+++ b/Assets/PlayMaker/Editor/Resources/EditorStartupPrefs.asset
@@ -16,5 +16,5 @@ MonoBehaviour:
  playmakerVersion: 
  showWelcomeScreen: 0
  showUpgradeGuide: 0
-  lastAutoUpdateSignature: 6000.0.35f1__/Users/marcin/projects/beyondGit/Assets__0.0.0.0
+  lastAutoUpdateSignature: 6000.0.36f1__G:/PROJEKTY/BEYOND/BeyonGit/Assets__0.0.0.0
  useLegacyNetworking: 0
--- a/3/Resources/ES3/ES3Defaults.asset
+++ b/3/Resources/ES3/ES3Defaults.asset
@@ -36,9 +36,9 @@ MonoBehaviour:
    - NavMeshComponents
    - Boxophobic.Utils.Editor
    - FullSerializer
-    - PPv2URPConverters
    - fluxy
    - StompyRobot.SRDebugger
+    - PPv2URPConverters
    - Boxophobic.AtmosphericHeightFog.Editor
    - Sirenix.OdinInspector.Modules.UnityLocalization.Editor
    - StompyRobot.SRF.Editor
--- a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity
+++ b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity