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

# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Maps/MainScene.umap

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

@@ -199,9 +199,9 @@ 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

Config/DefaultGame.ini

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

Content/Xml/API.txt

@@ -1,2 +1,2 @@
 partners=https://crm.enco72.ru/crm4devNoPWD/hs/extint/api/VR_partners
-interactive=https://crm.enco72.ru/crm4devNoPWD/hs/extint/api/interactive
+interactive=https://macrocrm-api.enco.ru/web/tilda/610/g81fzYYD1jz8Pk3ukZR30bBWjr0T35DLW1pnXYcPsqnvFKaHnYAR7JG5uVF_4kkUgSz-53p39Wl8MTczMTA1NzQ4Nnw0YTI1Nw/

Content/Xml/xmlConfig.ini

@@ -1,2 +1,2 @@
-url=https://enco.ru/upload/import/import.xml
-houseIds=3800148=1.1,3800163=2.1
+url=https://macrocrm-api.enco.ru/estate/export/yandex/6Aut9yCC1NDSjZx3jADNZQI4J_ztP647vSkpoGu_ZfkE3Dp-aqgRjEX2pUJhC_h-cn-SFopASu1w6GAhk9M_P93lTvBsVQiEitZivt_ogI_pwQ0AJzNbA0dIc2o7FQZ6QM25I1TvknwxNzI2NjMwMzU2fDg4MmE0/610-yandex.xml?feed_id=2647
+houseIds=3788640=7,3788654=8

plugins/antiDublicate/Binaries/Win64/UnrealEditor.modules

@@ -0,0 +1,7 @@
+{
+	"BuildId": "27405482",
+	"Modules": 
+	{
+		"antiDublicate": "UnrealEditor-antiDublicate.dll"
+	}
+}

plugins/antiDublicate/Source/antiDublicate/Private/antiDublicate.cpp

@@ -0,0 +1,88 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "antiDublicate.h"
+#include "kismet/KismetSystemLibrary.h"
+#include <windows.h>
+#include <psapi.h>
+
+#define LOCTEXT_NAMESPACE "FantiDublicateModule"
+
+void FantiDublicateModule::StartupModule()
+{
+	FString pname = FPlatformProcess::ExecutableName(false);
+	if (pname == L"UnrealEditor.exe") return;
+	auto pname1 = []() {
+		TArray<FString> foundFiles;
+		IFileManager& fileManager = IFileManager::Get();
+
+		FString pattern = FPaths::RootDir();
+
+		pattern += TEXT("*.exe");
+
+		fileManager.FindFiles(foundFiles, *pattern, true, false);
+
+		if (foundFiles.Num() > 0) {
+			return foundFiles[0];
+		}
+
+		return FString();
+		}();
+
+#ifdef GetCommandLine
+#undef GetCommandLine
+#endif // GetCommandLine
+	if (UKismetSystemLibrary::GetCommandLine().Contains("-PixelStreamingIP")) return;
+
+	// Get the list of process identifiers.
+
+	DWORD aProcesses[1024], cbNeeded, cProcesses;
+	unsigned int i;
+	TCHAR szProcessName[MAX_PATH] = TEXT("<unknown>");
+	TArray<FString> fprocesses;
+
+	if (!EnumProcesses(aProcesses, sizeof(aProcesses), &cbNeeded)) return;
+
+	cProcesses = cbNeeded / sizeof(DWORD);
+	int copies = 0;
+	for (i = 0; i < cProcesses; i++)
+	{
+		if (aProcesses[i] != 0)
+		{
+			HANDLE hProcess = OpenProcess(PROCESS_QUERY_INFORMATION |
+				PROCESS_VM_READ,
+				FALSE, aProcesses[i]);
+
+			// Get the process name.
+
+			if (NULL != hProcess)
+			{
+				HMODULE hMod;
+				if (EnumProcessModules(hProcess, &hMod, sizeof(hMod), &cbNeeded))
+				{
+					GetModuleBaseName(hProcess, hMod, szProcessName, sizeof(szProcessName) / sizeof(TCHAR));
+
+					if (FString(szProcessName) == pname || (FString(szProcessName)==pname1&& !pname1.IsEmpty())) copies++;
+				}
+				// Release the handle to the process.
+				CloseHandle(hProcess);
+			}
+			if (copies > 2) {
+				FGenericPlatformMisc::RequestExit(false, L"PIDOR DETECTED");
+				return;
+			}
+		}
+	}
+
+
+
+}
+
+void FantiDublicateModule::ShutdownModule()
+{
+	// This function may be called during shutdown to clean up your module.  For modules that support dynamic reloading,
+	// we call this function before unloading the module.
+}
+
+#undef LOCTEXT_NAMESPACE
+
+IMPLEMENT_MODULE(FantiDublicateModule, antiDublicate)

plugins/antiDublicate/Source/antiDublicate/Public/antiDublicate.h

@@ -0,0 +1,15 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Modules/ModuleManager.h"
+
+class FantiDublicateModule : public IModuleInterface
+{
+public:
+
+	/** IModuleInterface implementation */
+	virtual void StartupModule() override;
+	virtual void ShutdownModule() override;
+};

plugins/antiDublicate/Source/antiDublicate/antiDublicate.Build.cs

@@ -0,0 +1,53 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+using UnrealBuildTool;
+
+public class antiDublicate : ModuleRules
+{
+	public antiDublicate(ReadOnlyTargetRules Target) : base(Target)
+	{
+		PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
+		
+		PublicIncludePaths.AddRange(
+			new string[] {
+				// ... add public include paths required here ...
+			}
+			);
+				
+		
+		PrivateIncludePaths.AddRange(
+			new string[] {
+				// ... add other private include paths required here ...
+			}
+			);
+			
+		
+		PublicDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"Core",
+				// ... add other public dependencies that you statically link with here ...
+			}
+			);
+			
+		
+		PrivateDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"CoreUObject",
+				"Engine",
+				"Slate",
+				"SlateCore",
+				// ... add private dependencies that you statically link with here ...	
+			}
+			);
+		
+		
+		DynamicallyLoadedModuleNames.AddRange(
+			new string[]
+			{
+				// ... add any modules that your module loads dynamically here ...
+			}
+			);
+	}
+}

plugins/antiDublicate/antiDublicate.uplugin

@@ -0,0 +1,24 @@
+{
+	"FileVersion": 3,
+	"Version": 1,
+	"VersionName": "1.0",
+	"FriendlyName": "antiDublicate",
+	"Description": "if enabled prevent app to be launched many times. Except pixel streaming config and editor",
+	"Category": "Other",
+	"CreatedBy": "Dron",
+	"CreatedByURL": "https://github.com/Andron666",
+	"DocsURL": "",
+	"MarketplaceURL": "",
+	"SupportURL": "",
+	"CanContainContent": false,
+	"IsBetaVersion": false,
+	"IsExperimentalVersion": false,
+	"Installed": false,
+	"Modules": [
+		{
+			"Name": "antiDublicate",
+			"Type": "CookedOnly",
+			"LoadingPhase": "EarliestPossible"
+		}
+	]
+}