Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky

# Conflicts:
#	Content/Maps/MainScene.umap

Binaries/Win64/Ivazowsky-Win64-Shipping.target

@@ -3466,6 +3466,10 @@
 			"Path": "$(ProjectDir)/Plugins/JPrinter/JPrinter.uplugin",
 			"Type": "UFS"
 		},
+		{
+			"Path": "$(ProjectDir)/Plugins/antiDublicate/antiDublicate.uplugin",
+			"Type": "UFS"
+		},
 		{
 			"Path": "$(ProjectDir)/Plugins/approximatedSpline/approximatedSpline.uplugin",
 			"Type": "UFS"

Binaries/Win64/Ivazowsky.target

@@ -3542,6 +3542,10 @@
 			"Path": "$(ProjectDir)/Plugins/JPrinter/JPrinter.uplugin",
 			"Type": "UFS"
 		},
+		{
+			"Path": "$(ProjectDir)/Plugins/antiDublicate/antiDublicate.uplugin",
+			"Type": "UFS"
+		},
 		{
 			"Path": "$(ProjectDir)/Plugins/approximatedSpline/approximatedSpline.uplugin",
 			"Type": "UFS"

Config/DefaultEngine.ini

@@ -1,6 +1,6 @@
 [/Script/EngineSettings.GameMapsSettings]
 GameDefaultMap=/Game/Maps/starter.starter
-EditorStartupMap=/Game/Maps/MainScene.MainScene
+EditorStartupMap=
 GlobalDefaultGameMode=/Game/Blueprints/Player/myGM.myGM_C
 GameInstanceClass=/Game/Blueprints/Player/GI.GI_C
 
@@ -33,7 +33,7 @@ r.AllowOcclusionQueries=True
 r.MinScreenRadiusForLights=0.010000
 r.DefaultFeature.AntiAliasing=2
 r.TessellationAdaptivePixelsPerTriangle=1024.000000
-r.RayTracing.Shadows=False
+r.RayTracing.Shadows=True
 r.RayTracing.Skylight=False
 r.Lumen.HardwareRayTracing=True
 r.ReflectionMethod=1
@@ -47,6 +47,7 @@ SkeletalMesh.UseExperimentalChunking=1
 r.SkinCache.DefaultBehavior=0
 r.GenerateMeshDistanceFields=True
 r.DynamicGlobalIlluminationMethod=1
+r.AllowStaticLighting=False
 
 [/Script/Engine.UserInterfaceSettings]
 UIScaleCurve=(EditorCurveData=(Keys=((Time=540.000000,Value=0.250000),(Time=2160.000000,Value=1.000000)),DefaultValue=340282346638528859811704183484516925440.000000,PreInfinityExtrap=RCCE_Constant,PostInfinityExtrap=RCCE_Constant),ExternalCurve=None)
@@ -192,12 +193,12 @@ DefaultBindPort=1488
 [/Script/DLSS.DLSSSettings]
 bEnableDLSSVulkan=False
 bEnableDLSSD3D11=False
-bEnableDLSSInEditorViewports=True
-bEnableDLSSInPlayInEditorViewports=True
-bShowDLSSSDebugOnScreenMessages=True
+bEnableDLSSInEditorViewports=False
+bEnableDLSSInPlayInEditorViewports=False
+bShowDLSSSDebugOnScreenMessages=False
 
 [/Script/Engine.GarbageCollectionSettings]
-gc.IncrementalBeginDestroyEnabled=False
+gc.IncrementalBeginDestroyEnabled=True
 gc.MaxObjectsInGame=25165824
 
 [/Script/Engine.AudioSettings]

Config/DefaultGame.ini

@@ -2,7 +2,7 @@
 
 [/Script/EngineSettings.GeneralProjectSettings]
 ProjectID=B89CCC284A7D213231762AB505314AAD
-ProjectVersion=2.39
+ProjectVersion=3.0
 ProjectName=Ivazowsky
 CompanyName=GraffInteractive
 Homepage=Graff.tech