diff --git a/Binaries/Win64/MasharovDevEditor.target b/Binaries/Win64/MasharovDevEditor.target index 42ce02790..d8b93f62d 100644 --- a/Binaries/Win64/MasharovDevEditor.target +++ b/Binaries/Win64/MasharovDevEditor.target @@ -12,8 +12,8 @@ { "MajorVersion": 5, "MinorVersion": 3, - "PatchVersion": 1, - "Changelist": 28051148, + "PatchVersion": 2, + "Changelist": 29314046, "CompatibleChangelist": 27405482, "IsLicenseeVersion": 0, "IsPromotedBuild": 0, @@ -101,6 +101,22 @@ "Path": "$(EngineDir)/Binaries/Win64/AgentInterface.pdb", "Type": "SymbolFile" }, + { + "Path": "$(EngineDir)/Binaries/Win64/LinuxArm64/UnrealEditor-LinuxArm64TargetPlatform.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Binaries/Win64/LinuxArm64/UnrealEditor.modules", + "Type": "RequiredResource" + }, + { + "Path": "$(EngineDir)/Binaries/Win64/Linux/UnrealEditor-LinuxTargetPlatform.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Binaries/Win64/Linux/UnrealEditor.modules", + "Type": "RequiredResource" + }, { "Path": "$(EngineDir)/Binaries/Win64/OpenColorIO_2_2.dll", "Type": "DynamicLibrary" @@ -2653,6 +2669,134 @@ "Path": "$(EngineDir)/Plugins/Interchange/Runtime/Binaries/Win64/UnrealEditor.modules", "Type": "RequiredResource" }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/Win64/UnrealEditor-DLSS.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/Win64/UnrealEditor-DLSS.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/Win64/UnrealEditor-DLSSBlueprint.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/Win64/UnrealEditor-DLSSBlueprint.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/Win64/UnrealEditor-DLSSEditor.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/Win64/UnrealEditor-DLSSEditor.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/Win64/UnrealEditor-DLSSUtility.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/Win64/UnrealEditor-DLSSUtility.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/Win64/UnrealEditor-NGXD3D11RHI.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/Win64/UnrealEditor-NGXD3D11RHI.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/Win64/UnrealEditor-NGXD3D12RHI.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/Win64/UnrealEditor-NGXD3D12RHI.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/Win64/UnrealEditor-NGXRHI.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/Win64/UnrealEditor-NGXRHI.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/Win64/UnrealEditor-NGXVulkanRHI.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/Win64/UnrealEditor-NGXVulkanRHI.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/Win64/UnrealEditor-NGXVulkanRHIPreInit.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/Win64/UnrealEditor-NGXVulkanRHIPreInit.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/Win64/UnrealEditor.modules", + "Type": "RequiredResource" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/Win64/UnrealEditor-StreamlineBlueprint.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/Win64/UnrealEditor-StreamlineBlueprint.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/Win64/UnrealEditor-StreamlineCore.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/Win64/UnrealEditor-StreamlineCore.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/Win64/UnrealEditor-StreamlineD3D11RHI.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/Win64/UnrealEditor-StreamlineD3D11RHI.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/Win64/UnrealEditor-StreamlineD3D12RHI.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/Win64/UnrealEditor-StreamlineD3D12RHI.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/Win64/UnrealEditor-StreamlineRHI.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/Win64/UnrealEditor-StreamlineRHI.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/Win64/UnrealEditor-StreamlineShaders.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/Win64/UnrealEditor-StreamlineShaders.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/Win64/UnrealEditor.modules", + "Type": "RequiredResource" + }, { "Path": "$(EngineDir)/Plugins/Marketplace/RuntimeFilesDownloader/Binaries/Win64/UnrealEditor-RuntimeFilesDownloader.dll", "Type": "DynamicLibrary" @@ -23099,6 +23243,70 @@ "Path": "$(EngineDir)/Plugins/Interchange/Runtime/Interchange.uplugin", "Type": "UFS" }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/ThirdParty/Win64/Development/nvngx_dlss.dll", + "Type": "DebugNonUFS" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/ThirdParty/Win64/nvngx_dlss.dll", + "Type": "NonUFS" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/DLSS.uplugin", + "Type": "UFS" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/ThirdParty/Win64/Development/nvngx_dlssg.dll", + "Type": "NonUFS" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/ThirdParty/Win64/Development/sl.common.dll", + "Type": "NonUFS" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/ThirdParty/Win64/Development/sl.dlss_g.dll", + "Type": "NonUFS" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/ThirdParty/Win64/Development/sl.imgui.dll", + "Type": "NonUFS" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/ThirdParty/Win64/Development/sl.imgui.pdb", + "Type": "DebugNonUFS" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/ThirdParty/Win64/Development/sl.interposer.dll", + "Type": "NonUFS" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/ThirdParty/Win64/Development/sl.reflex.dll", + "Type": "NonUFS" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/ThirdParty/Win64/nvngx_dlssg.dll", + "Type": "NonUFS" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/ThirdParty/Win64/sl.common.dll", + "Type": "NonUFS" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/ThirdParty/Win64/sl.dlss_g.dll", + "Type": "NonUFS" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/ThirdParty/Win64/sl.interposer.dll", + "Type": "NonUFS" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Binaries/ThirdParty/Win64/sl.reflex.dll", + "Type": "NonUFS" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/Streamline/Streamline.uplugin", + "Type": "UFS" + }, { "Path": "$(EngineDir)/Plugins/Marketplace/RuntimeFilesDownloader/RuntimeFilesDownloader.uplugin", "Type": "UFS" diff --git a/Binaries/Win64/UnrealEditor-MasharovDev.dll b/Binaries/Win64/UnrealEditor-MasharovDev.dll index 0f02fd9ca..4f1ea07f4 100644 Binary files a/Binaries/Win64/UnrealEditor-MasharovDev.dll and b/Binaries/Win64/UnrealEditor-MasharovDev.dll differ diff --git a/Binaries/Win64/UnrealEditor-MasharovDev.pdb b/Binaries/Win64/UnrealEditor-MasharovDev.pdb index 19067b9fe..45e7a7b1b 100644 Binary files a/Binaries/Win64/UnrealEditor-MasharovDev.pdb and b/Binaries/Win64/UnrealEditor-MasharovDev.pdb differ diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 42dd4b945..8e55e9b72 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -30,7 +30,7 @@ r.DefaultFeature.AntiAliasing=1 r.AntiAliasingMethod=4 r.Lumen.HardwareRayTracing=True r.Lumen.HardwareRayTracing.LightingMode=2 -r.RayTracing.Shadows=True +r.RayTracing.Shadows=False r.DefaultFeature.AmbientOcclusion=False r.Shadow.Virtual.Enable=0 r.RayTracing.Skylight=False diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index ff5675004..d77c4dd80 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -11,7 +11,6 @@ Homepage=Graff.tech Build=IfProjectHasCode BuildConfiguration=PPBC_Development BuildTarget= -StagingDirectory=(Path="") FullRebuild=False ForDistribution=False IncludeDebugFiles=False @@ -20,6 +19,7 @@ bIncludeNativizedAssetsInProjectGeneration=False bExcludeMonolithicEngineHeadersInNativizedCode=False UsePakFile=True bUseIoStore=False +bUseZenStore=False bMakeBinaryConfig=False bGenerateChunks=True bGenerateNoChunks=False @@ -28,14 +28,19 @@ bForceOneChunkPerFile=False MaxChunkSize=0 bBuildHttpChunkInstallData=False HttpChunkInstallDataDirectory=(Path="") +WriteBackMetadataToAssetRegistry=Disabled bCompressed=True -PakFileCompressionFormats=Oodle +PackageCompressionFormat=Oodle bForceUseProjectCompressionFormatIgnoreHardwareOverride=False -PakFileAdditionalCompressionOptions=-compressionblocksize=256KB -PakFileCompressionMethod=Kraken -PakFileCompressionLevel_DebugDevelopment=2 -PakFileCompressionLevel_TestShipping=2 -PakFileCompressionLevel_Distribution=2 +PackageAdditionalCompressionOptions= +PackageCompressionMethod=Kraken +PackageCompressionLevel_DebugDevelopment=1 +PackageCompressionLevel_TestShipping=2 +PackageCompressionLevel_Distribution=3 +PackageCompressionMinBytesSaved=1024 +PackageCompressionMinPercentSaved=5 +bPackageCompressionEnableDDC=False +PackageCompressionMinSizeToConsiderDDC=0 HttpChunkInstallDataVersion= IncludePrerequisites=True IncludeAppLocalPrerequisites=False @@ -62,8 +67,19 @@ bSkipMovies=False -IniKeyDenylist=SigningModulus -IniKeyDenylist=SigningPrivateExponent -IniKeyDenylist=EncryptionKey +-IniKeyDenylist=DevCenterUsername +-IniKeyDenylist=DevCenterPassword +-IniKeyDenylist=IOSTeamID +-IniKeyDenylist=SigningCertificate +-IniKeyDenylist=MobileProvision -IniKeyDenylist=IniKeyDenylist --IniKeyDenylist=IniSectionBlacklist +-IniKeyDenylist=IniSectionDenylist ++IniKeyDenylist=DevCenterUsername ++IniKeyDenylist=DevCenterPassword ++IniKeyDenylist=IOSTeamID ++IniKeyDenylist=SigningCertificate ++IniKeyDenylist=MobileProvision ++IniKeyDenylist=IniSectionDenylist +IniKeyDenylist=KeyStorePassword +IniKeyDenylist=KeyPassword +IniKeyDenylist=rsa.privateexp @@ -76,10 +92,13 @@ bSkipMovies=False +IniKeyDenylist=EncryptionKey +IniKeyDenylist=IniKeyDenylist +IniKeyDenylist=IniSectionBlacklist +-IniSectionDenylist=HordeStorageServers +-IniSectionDenylist=StorageServers ++IniSectionDenylist=HordeStorageServers ++IniSectionDenylist=StorageServers +DirectoriesToAlwaysCook=(Path="/Game/Blueprints/UI/Imgs") ++DirectoriesToAlwaysCook=(Path="/Game/Assetpacks/AnimX") ++DirectoriesToAlwaysCook=(Path="/Game/Assetpacks/CarsPack") +DirectoriesToAlwaysStageAsNonUFS=(Path="Xml") +DirectoriesToAlwaysStageAsNonUFS=(Path="script") -PackageCompressionLevel_DebugDevelopment=1 -PackageCompressionLevel_TestShipping=2 -PackageCompressionLevel_Distribution=3 diff --git a/Content/Blueprints/Lamp/BP_AI_vol3_4_lamp_05_1.uasset b/Content/Blueprints/Lamp/BP_AI_vol3_4_lamp_05_1.uasset index b0c8eed5f..1f73a3151 100644 Binary files a/Content/Blueprints/Lamp/BP_AI_vol3_4_lamp_05_1.uasset and b/Content/Blueprints/Lamp/BP_AI_vol3_4_lamp_05_1.uasset differ diff --git a/Content/Blueprints/Lamp/BP_InteriorLamp.uasset b/Content/Blueprints/Lamp/BP_InteriorLamp.uasset index 074dbe2e3..ff81d83d9 100644 Binary files a/Content/Blueprints/Lamp/BP_InteriorLamp.uasset and b/Content/Blueprints/Lamp/BP_InteriorLamp.uasset differ diff --git a/Content/Blueprints/Lamp/BP_InteriorLamp_BedroomLamp.uasset b/Content/Blueprints/Lamp/BP_InteriorLamp_BedroomLamp.uasset index 09a6366fb..6827fe75e 100644 Binary files a/Content/Blueprints/Lamp/BP_InteriorLamp_BedroomLamp.uasset and b/Content/Blueprints/Lamp/BP_InteriorLamp_BedroomLamp.uasset differ diff --git a/Content/Blueprints/Lamp/BP_InteriorLamp_Bedroom_Table.uasset b/Content/Blueprints/Lamp/BP_InteriorLamp_Bedroom_Table.uasset index 1012ca04b..15fe6bcef 100644 Binary files a/Content/Blueprints/Lamp/BP_InteriorLamp_Bedroom_Table.uasset and b/Content/Blueprints/Lamp/BP_InteriorLamp_Bedroom_Table.uasset differ diff --git a/Content/Blueprints/Lamp/BP_InteriorLamp_Bedroom_Table_2.uasset b/Content/Blueprints/Lamp/BP_InteriorLamp_Bedroom_Table_2.uasset index dc4918f00..004ef6e67 100644 Binary files a/Content/Blueprints/Lamp/BP_InteriorLamp_Bedroom_Table_2.uasset and b/Content/Blueprints/Lamp/BP_InteriorLamp_Bedroom_Table_2.uasset differ diff --git a/Content/Blueprints/Lamp/BP_InteriorLamp_Big_Square.uasset b/Content/Blueprints/Lamp/BP_InteriorLamp_Big_Square.uasset index d485e057e..cb0a627b3 100644 Binary files a/Content/Blueprints/Lamp/BP_InteriorLamp_Big_Square.uasset and b/Content/Blueprints/Lamp/BP_InteriorLamp_Big_Square.uasset differ diff --git a/Content/Blueprints/Lamp/BP_InteriorLamp_Big_Square_80angle.uasset b/Content/Blueprints/Lamp/BP_InteriorLamp_Big_Square_80angle.uasset index 9b99dbd39..224824e2b 100644 Binary files a/Content/Blueprints/Lamp/BP_InteriorLamp_Big_Square_80angle.uasset and b/Content/Blueprints/Lamp/BP_InteriorLamp_Big_Square_80angle.uasset differ diff --git a/Content/Blueprints/Lamp/BP_InteriorLamp_Chandelier.uasset b/Content/Blueprints/Lamp/BP_InteriorLamp_Chandelier.uasset index 98566410e..799b68ce4 100644 Binary files a/Content/Blueprints/Lamp/BP_InteriorLamp_Chandelier.uasset and b/Content/Blueprints/Lamp/BP_InteriorLamp_Chandelier.uasset differ diff --git a/Content/Blueprints/Lamp/BP_InteriorLamp_Chandelier_2.uasset b/Content/Blueprints/Lamp/BP_InteriorLamp_Chandelier_2.uasset index c2ccbfdbc..288ab983a 100644 Binary files a/Content/Blueprints/Lamp/BP_InteriorLamp_Chandelier_2.uasset and b/Content/Blueprints/Lamp/BP_InteriorLamp_Chandelier_2.uasset differ diff --git a/Content/Blueprints/Lamp/BP_InteriorLamp_Child.uasset b/Content/Blueprints/Lamp/BP_InteriorLamp_Child.uasset index b839d0698..5ef4782cb 100644 Binary files a/Content/Blueprints/Lamp/BP_InteriorLamp_Child.uasset and b/Content/Blueprints/Lamp/BP_InteriorLamp_Child.uasset differ diff --git a/Content/Blueprints/Lamp/BP_InteriorLamp_CylLamp.uasset b/Content/Blueprints/Lamp/BP_InteriorLamp_CylLamp.uasset index 3f8a202da..403b3fee4 100644 Binary files a/Content/Blueprints/Lamp/BP_InteriorLamp_CylLamp.uasset and b/Content/Blueprints/Lamp/BP_InteriorLamp_CylLamp.uasset differ diff --git a/Content/Blueprints/Lamp/BP_InteriorLamp_CylLamp_Angle80.uasset b/Content/Blueprints/Lamp/BP_InteriorLamp_CylLamp_Angle80.uasset index 62e1765f0..6ebfca65c 100644 Binary files a/Content/Blueprints/Lamp/BP_InteriorLamp_CylLamp_Angle80.uasset and b/Content/Blueprints/Lamp/BP_InteriorLamp_CylLamp_Angle80.uasset differ diff --git a/Content/Blueprints/Lamp/BP_InteriorLamp_FloorLamp.uasset b/Content/Blueprints/Lamp/BP_InteriorLamp_FloorLamp.uasset index 27bf45560..9f949a6a7 100644 Binary files a/Content/Blueprints/Lamp/BP_InteriorLamp_FloorLamp.uasset and b/Content/Blueprints/Lamp/BP_InteriorLamp_FloorLamp.uasset differ diff --git a/Content/Blueprints/Lamp/BP_InteriorLamp_Kidroom.uasset b/Content/Blueprints/Lamp/BP_InteriorLamp_Kidroom.uasset index 296a1a877..93f6e27f1 100644 Binary files a/Content/Blueprints/Lamp/BP_InteriorLamp_Kidroom.uasset and b/Content/Blueprints/Lamp/BP_InteriorLamp_Kidroom.uasset differ diff --git a/Content/Blueprints/Lamp/BP_InteriorLamp_Small_Square.uasset b/Content/Blueprints/Lamp/BP_InteriorLamp_Small_Square.uasset index 568298634..5a192de13 100644 Binary files a/Content/Blueprints/Lamp/BP_InteriorLamp_Small_Square.uasset and b/Content/Blueprints/Lamp/BP_InteriorLamp_Small_Square.uasset differ diff --git a/Content/Blueprints/Lamp/BP_InteriorLamp_Small_Square_80Angle.uasset b/Content/Blueprints/Lamp/BP_InteriorLamp_Small_Square_80Angle.uasset index fc592dff6..ba96207fd 100644 Binary files a/Content/Blueprints/Lamp/BP_InteriorLamp_Small_Square_80Angle.uasset and b/Content/Blueprints/Lamp/BP_InteriorLamp_Small_Square_80Angle.uasset differ diff --git a/Content/Blueprints/Lamp/BP_Light_Corridor.uasset b/Content/Blueprints/Lamp/BP_Light_Corridor.uasset index 8bb51957f..282f0326e 100644 Binary files a/Content/Blueprints/Lamp/BP_Light_Corridor.uasset and b/Content/Blueprints/Lamp/BP_Light_Corridor.uasset differ diff --git a/Content/Blueprints/Lamp/BP_Light_Corridor_Vol.uasset b/Content/Blueprints/Lamp/BP_Light_Corridor_Vol.uasset index 9f2e7f0a1..009302026 100644 Binary files a/Content/Blueprints/Lamp/BP_Light_Corridor_Vol.uasset and b/Content/Blueprints/Lamp/BP_Light_Corridor_Vol.uasset differ diff --git a/Content/Blueprints/Lamp/BP_MOP_Lamp_3.uasset b/Content/Blueprints/Lamp/BP_MOP_Lamp_3.uasset index d7a6b5d33..0cfe453dc 100644 Binary files a/Content/Blueprints/Lamp/BP_MOP_Lamp_3.uasset and b/Content/Blueprints/Lamp/BP_MOP_Lamp_3.uasset differ diff --git a/Content/Blueprints/Lamp/BP_MOP_Lamp_4.uasset b/Content/Blueprints/Lamp/BP_MOP_Lamp_4.uasset index 34911065a..12cf224e0 100644 Binary files a/Content/Blueprints/Lamp/BP_MOP_Lamp_4.uasset and b/Content/Blueprints/Lamp/BP_MOP_Lamp_4.uasset differ diff --git a/Content/Blueprints/Lamp/BP_streetLamp.uasset b/Content/Blueprints/Lamp/BP_streetLamp.uasset index ac2ebd21e..605a60a54 100644 Binary files a/Content/Blueprints/Lamp/BP_streetLamp.uasset and b/Content/Blueprints/Lamp/BP_streetLamp.uasset differ diff --git a/Content/Blueprints/Player/GI.uasset b/Content/Blueprints/Player/GI.uasset index d3455a0ec..b03543af4 100644 Binary files a/Content/Blueprints/Player/GI.uasset and b/Content/Blueprints/Player/GI.uasset differ diff --git a/Content/Blueprints/Player/GameplayFunctions.uasset b/Content/Blueprints/Player/GameplayFunctions.uasset index f862d8a81..3821546c1 100644 Binary files a/Content/Blueprints/Player/GameplayFunctions.uasset and b/Content/Blueprints/Player/GameplayFunctions.uasset differ diff --git a/Content/Blueprints/Player/MyPawn.uasset b/Content/Blueprints/Player/MyPawn.uasset index 5a877b05a..e6144aac6 100644 Binary files a/Content/Blueprints/Player/MyPawn.uasset and b/Content/Blueprints/Player/MyPawn.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Elements/slider.uasset b/Content/Blueprints/UI/WBPS/Elements/slider.uasset index a16bde1d2..af8ca94d8 100644 Binary files a/Content/Blueprints/UI/WBPS/Elements/slider.uasset and b/Content/Blueprints/UI/WBPS/Elements/slider.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset b/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset index 8e0f2b8b7..f978a2e14 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset and b/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/settings.uasset b/Content/Blueprints/UI/WBPS/Menu/settings.uasset index 82d790577..0e9776913 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/settings.uasset and b/Content/Blueprints/UI/WBPS/Menu/settings.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/timePanel.uasset b/Content/Blueprints/UI/WBPS/Menu/timePanel.uasset index d35a00ed9..ad4164a5e 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/timePanel.uasset and b/Content/Blueprints/UI/WBPS/Menu/timePanel.uasset differ diff --git a/Content/Blueprints/UI/WBPS/filter/Filter.uasset b/Content/Blueprints/UI/WBPS/filter/Filter.uasset index c23230de2..4511600e6 100644 Binary files a/Content/Blueprints/UI/WBPS/filter/Filter.uasset and b/Content/Blueprints/UI/WBPS/filter/Filter.uasset differ diff --git a/Content/Blueprints/UI/mainHUD.uasset b/Content/Blueprints/UI/mainHUD.uasset index 79d38e131..8144e4d96 100644 Binary files a/Content/Blueprints/UI/mainHUD.uasset and b/Content/Blueprints/UI/mainHUD.uasset differ diff --git a/Content/Blueprints/Utils/Generators/HumanAI/manChar_Child.uasset b/Content/Blueprints/Utils/Generators/HumanAI/manChar_Child.uasset index 77945c8c3..3dad0ff39 100644 Binary files a/Content/Blueprints/Utils/Generators/HumanAI/manChar_Child.uasset and b/Content/Blueprints/Utils/Generators/HumanAI/manChar_Child.uasset differ diff --git a/Content/Blueprints/Utils/dayTime.uasset b/Content/Blueprints/Utils/dayTime.uasset index 7aa3c23f1..a35fa839e 100644 Binary files a/Content/Blueprints/Utils/dayTime.uasset and b/Content/Blueprints/Utils/dayTime.uasset differ diff --git a/Content/Blueprints/world/BP_Door_Outer.uasset b/Content/Blueprints/world/BP_Door_Outer.uasset index 3bda81046..0e8161dc6 100644 Binary files a/Content/Blueprints/world/BP_Door_Outer.uasset and b/Content/Blueprints/world/BP_Door_Outer.uasset differ diff --git a/Content/Blueprints/world/BP_Door_Outer_GP7_Cjild.uasset b/Content/Blueprints/world/BP_Door_Outer_GP7_Cjild.uasset index 17a738d87..c7a6993e9 100644 Binary files a/Content/Blueprints/world/BP_Door_Outer_GP7_Cjild.uasset and b/Content/Blueprints/world/BP_Door_Outer_GP7_Cjild.uasset differ diff --git a/Content/Blueprints/world/BP_HouseGP2.uasset b/Content/Blueprints/world/BP_HouseGP2.uasset index e215c2968..c998dba35 100644 Binary files a/Content/Blueprints/world/BP_HouseGP2.uasset and b/Content/Blueprints/world/BP_HouseGP2.uasset differ diff --git a/Content/Blueprints/world/BP_HouseGP7-1.uasset b/Content/Blueprints/world/BP_HouseGP7-1.uasset index f9834b5a0..7d8766931 100644 Binary files a/Content/Blueprints/world/BP_HouseGP7-1.uasset and b/Content/Blueprints/world/BP_HouseGP7-1.uasset differ diff --git a/Content/Blueprints/world/BP_HouseGP9.uasset b/Content/Blueprints/world/BP_HouseGP9.uasset index b83297b10..1ec3a846e 100644 Binary files a/Content/Blueprints/world/BP_HouseGP9.uasset and b/Content/Blueprints/world/BP_HouseGP9.uasset differ diff --git a/Content/Furniture/All/Meshes/Furniture/Lamps/SM_AI_vol3_4_lamp_05_1.uasset b/Content/Furniture/All/Meshes/Furniture/Lamps/SM_AI_vol3_4_lamp_05_1.uasset index 2460e2e9b..0f0206fff 100644 Binary files a/Content/Furniture/All/Meshes/Furniture/Lamps/SM_AI_vol3_4_lamp_05_1.uasset and b/Content/Furniture/All/Meshes/Furniture/Lamps/SM_AI_vol3_4_lamp_05_1.uasset differ diff --git a/Content/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Meshes/Bathroom/PB_MirrorLight_001.uasset b/Content/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Meshes/Bathroom/PB_MirrorLight_001.uasset index 392d0f5a6..ebab1cf0f 100644 Binary files a/Content/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Meshes/Bathroom/PB_MirrorLight_001.uasset and b/Content/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Meshes/Bathroom/PB_MirrorLight_001.uasset differ diff --git a/Content/Maps/Interior/Parking/Parking_GP9.umap b/Content/Maps/Interior/Parking/Parking_GP9.umap index 61a6add2b..d07d198c0 100644 Binary files a/Content/Maps/Interior/Parking/Parking_GP9.umap and b/Content/Maps/Interior/Parking/Parking_GP9.umap differ diff --git a/Content/Maps/Masharov_Buildings.umap b/Content/Maps/Masharov_Buildings.umap index 39b827758..355409c3c 100644 Binary files a/Content/Maps/Masharov_Buildings.umap and b/Content/Maps/Masharov_Buildings.umap differ diff --git a/Content/Maps/lighting.umap b/Content/Maps/lighting.umap index 058f5d48d..7c6a520dd 100644 Binary files a/Content/Maps/lighting.umap and b/Content/Maps/lighting.umap differ diff --git a/Content/Maps/mainScene.umap b/Content/Maps/mainScene.umap index cd76a3252..63f8dcf10 100644 Binary files a/Content/Maps/mainScene.umap and b/Content/Maps/mainScene.umap differ diff --git a/Content/Materials/Masharov_Interior/Palette/MI_Emissive_Cold_1.uasset b/Content/Materials/Masharov_Interior/Palette/MI_Emissive_Cold_1.uasset index db740cc7d..06860c37d 100644 Binary files a/Content/Materials/Masharov_Interior/Palette/MI_Emissive_Cold_1.uasset and b/Content/Materials/Masharov_Interior/Palette/MI_Emissive_Cold_1.uasset differ diff --git a/Content/Meshes/Exterior/Main/SM_S7_Se01_FasadWindows.uasset b/Content/Meshes/Exterior/Main/SM_S7_Se01_FasadWindows.uasset index 875d02c51..1270f6e0d 100644 Binary files a/Content/Meshes/Exterior/Main/SM_S7_Se01_FasadWindows.uasset and b/Content/Meshes/Exterior/Main/SM_S7_Se01_FasadWindows.uasset differ diff --git a/Content/Meshes/Exterior/Main/SM_S7_Se02_FasadWindows.uasset b/Content/Meshes/Exterior/Main/SM_S7_Se02_FasadWindows.uasset index 5d07adf94..527b108ab 100644 Binary files a/Content/Meshes/Exterior/Main/SM_S7_Se02_FasadWindows.uasset and b/Content/Meshes/Exterior/Main/SM_S7_Se02_FasadWindows.uasset differ diff --git a/Content/Meshes/Exterior/Main/SM_S7_Se03_FasadWindows.uasset b/Content/Meshes/Exterior/Main/SM_S7_Se03_FasadWindows.uasset index d5169bee4..cf81c5168 100644 Binary files a/Content/Meshes/Exterior/Main/SM_S7_Se03_FasadWindows.uasset and b/Content/Meshes/Exterior/Main/SM_S7_Se03_FasadWindows.uasset differ diff --git a/Content/Meshes/Exterior/Main/SM_S9_Se01_Facade.uasset b/Content/Meshes/Exterior/Main/SM_S9_Se01_Facade.uasset index fd39cecb5..c14537469 100644 Binary files a/Content/Meshes/Exterior/Main/SM_S9_Se01_Facade.uasset and b/Content/Meshes/Exterior/Main/SM_S9_Se01_Facade.uasset differ diff --git a/Content/Meshes/Exterior/Main/SM_S9_Se01_FacadeWindows.uasset b/Content/Meshes/Exterior/Main/SM_S9_Se01_FacadeWindows.uasset index 72e20415f..b4b73d49d 100644 Binary files a/Content/Meshes/Exterior/Main/SM_S9_Se01_FacadeWindows.uasset and b/Content/Meshes/Exterior/Main/SM_S9_Se01_FacadeWindows.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Circle.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Circle.uasset index 974284a88..684c1b21c 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Circle.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Circle.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Circle_Ceiling.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Circle_Ceiling.uasset index 21280a864..35d1e0deb 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Circle_Ceiling.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Circle_Ceiling.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Circle_Wall.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Circle_Wall.uasset index f7333fd01..0cba64145 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Circle_Wall.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Circle_Wall.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_CylLamp_Angle80_10LUM.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_CylLamp_Angle80_10LUM.uasset index 3a7ff3b06..e1edb4afd 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_CylLamp_Angle80_10LUM.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_CylLamp_Angle80_10LUM.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_CylLamp_Angle80_v2.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_CylLamp_Angle80_v2.uasset index b5e66e0ea..9cc09f001 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_CylLamp_Angle80_v2.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_CylLamp_Angle80_v2.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Eclipse_Type_A.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Eclipse_Type_A.uasset index ac0823ab9..7a19f6b6b 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Eclipse_Type_A.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Eclipse_Type_A.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Eclipse_Type_B.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Eclipse_Type_B.uasset index 589d6f98f..f746f93a5 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Eclipse_Type_B.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Eclipse_Type_B.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Line.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Line.uasset index 3d284f90f..12308641b 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Line.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Line.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_LineLamp.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_LineLamp.uasset index c67412b9a..f4ec987bf 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_LineLamp.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_LineLamp.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_SpotLightSingle.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_SpotLightSingle.uasset index b32106752..ebadfe8f1 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_SpotLightSingle.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_SpotLightSingle.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_SpotLightSingle_V2.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_SpotLightSingle_V2.uasset index 05013b91a..f30341251 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_SpotLightSingle_V2.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_SpotLightSingle_V2.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Type_Fascio.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Type_Fascio.uasset index e90b5b9d4..54ee12549 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Type_Fascio.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_Type_Fascio.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_vedro_light.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_vedro_light.uasset index 5b7cd2c1a..8f4433266 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_vedro_light.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_InteriorLamp_vedro_light.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_ParkingLamp.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_ParkingLamp.uasset index ee4098251..351452930 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_ParkingLamp.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_ParkingLamp.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_ParkingLamp_SpotLight.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_ParkingLamp_SpotLight.uasset index f16b48a5f..13dd6a4ed 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_ParkingLamp_SpotLight.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_ParkingLamp_SpotLight.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_ParkingSpotLIght_Lamp.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_ParkingSpotLIght_Lamp.uasset index aba1b7fb2..3b2d27b2d 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_ParkingSpotLIght_Lamp.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/BP_ParkingSpotLIght_Lamp.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Circle_Lamp_Ceiling.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Circle_Lamp_Ceiling.uasset index d22f43c46..a93585d66 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Circle_Lamp_Ceiling.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Circle_Lamp_Ceiling.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Eclipse_Type_A.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Eclipse_Type_A.uasset index 8494a4560..b097c6a13 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Eclipse_Type_A.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Eclipse_Type_A.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Eclipse_Type_B.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Eclipse_Type_B.uasset index 600055644..c076801d8 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Eclipse_Type_B.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Eclipse_Type_B.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Eclipse_Type_C.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Eclipse_Type_C.uasset index f50cb1544..5a1c5b2e6 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Eclipse_Type_C.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Eclipse_Type_C.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Floor_Lamp_Fascio.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Floor_Lamp_Fascio.uasset index 72fbc7c84..d4c629391 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Floor_Lamp_Fascio.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Floor_Lamp_Fascio.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Lamp_Circle.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Lamp_Circle.uasset index d70845392..03319f533 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Lamp_Circle.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Lamp_Circle.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Lamp_Circle_Wall.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Lamp_Circle_Wall.uasset index c31b16cf9..fd9ac73cd 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Lamp_Circle_Wall.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Lamp_Circle_Wall.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Lamp_Odeon_Line.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Lamp_Odeon_Line.uasset index a2d000238..895a7963e 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Lamp_Odeon_Line.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Lamp_Odeon_Line.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_LineLamp_SM_LineLamp_Straight.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_LineLamp_SM_LineLamp_Straight.uasset index 7aeda403f..31873cf15 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_LineLamp_SM_LineLamp_Straight.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_LineLamp_SM_LineLamp_Straight.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_SpotLight.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_SpotLight.uasset index 28a1a7a00..13ead317b 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_SpotLight.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_SpotLight.uasset differ diff --git a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Vedro_Light.uasset b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Vedro_Light.uasset index 34b9f7a7d..6290ec46f 100644 Binary files a/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Vedro_Light.uasset and b/Content/Meshes/Interior/Furniture/GP3/Lamp_Light_GP3/SM_Vedro_Light.uasset differ diff --git a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_BEdroom_Light.uasset b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_BEdroom_Light.uasset index ef86c4d59..dec57e4cc 100644 Binary files a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_BEdroom_Light.uasset and b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_BEdroom_Light.uasset differ diff --git a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_1.uasset b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_1.uasset index e199e5db4..447237b07 100644 Binary files a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_1.uasset and b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_1.uasset differ diff --git a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_2.uasset b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_2.uasset index 074cb8b93..380067847 100644 Binary files a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_2.uasset and b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_2.uasset differ diff --git a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_Lamp_2_V2.uasset b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_Lamp_2_V2.uasset index dd18c98ca..7a3cc9aae 100644 Binary files a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_Lamp_2_V2.uasset and b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_Lamp_2_V2.uasset differ diff --git a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_Lamp_V2.uasset b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_Lamp_V2.uasset index 11c4756d4..9193ac587 100644 Binary files a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_Lamp_V2.uasset and b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_Lamp_V2.uasset differ diff --git a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_V2.uasset b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_V2.uasset index 347fbae94..f2e92ad3f 100644 Binary files a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_V2.uasset and b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_V2.uasset differ diff --git a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Corridor_light_2.uasset b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Corridor_light_2.uasset index b5b4ddd09..2758fca43 100644 Binary files a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Corridor_light_2.uasset and b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Corridor_light_2.uasset differ diff --git a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_CylLamp_AI.uasset b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_CylLamp_AI.uasset index 8ab4ee2e6..47cdd3397 100644 Binary files a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_CylLamp_AI.uasset and b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_CylLamp_AI.uasset differ diff --git a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Mirror_Light_1.uasset b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Mirror_Light_1.uasset index 45bc63027..92fe1dd94 100644 Binary files a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Mirror_Light_1.uasset and b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Mirror_Light_1.uasset differ diff --git a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Mirror_Light_2.uasset b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Mirror_Light_2.uasset index 23b16f0eb..aac3538f2 100644 Binary files a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Mirror_Light_2.uasset and b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Mirror_Light_2.uasset differ diff --git a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Torchere_2.uasset b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Torchere_2.uasset index e76d048ef..4cc68417e 100644 Binary files a/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Torchere_2.uasset and b/Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Torchere_2.uasset differ diff --git a/Content/Meshes/Interior/GP2/MOP/SM_LampLoopRound_PartTopCeiling.uasset b/Content/Meshes/Interior/GP2/MOP/SM_LampLoopRound_PartTopCeiling.uasset index db19faa15..f90009554 100644 Binary files a/Content/Meshes/Interior/GP2/MOP/SM_LampLoopRound_PartTopCeiling.uasset and b/Content/Meshes/Interior/GP2/MOP/SM_LampLoopRound_PartTopCeiling.uasset differ diff --git a/Content/Meshes/Interior/GP3/Parking/SM_Celling_Lamp_1.uasset b/Content/Meshes/Interior/GP3/Parking/SM_Celling_Lamp_1.uasset index de864c024..7a9ba9b10 100644 Binary files a/Content/Meshes/Interior/GP3/Parking/SM_Celling_Lamp_1.uasset and b/Content/Meshes/Interior/GP3/Parking/SM_Celling_Lamp_1.uasset differ diff --git a/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/BP_CeilingLampLine_MOP7.uasset b/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/BP_CeilingLampLine_MOP7.uasset index ba01357bb..58795f251 100644 Binary files a/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/BP_CeilingLampLine_MOP7.uasset and b/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/BP_CeilingLampLine_MOP7.uasset differ diff --git a/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/BP_MOPLamp_GP7.uasset b/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/BP_MOPLamp_GP7.uasset index 4b8d92d21..0b4258a68 100644 Binary files a/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/BP_MOPLamp_GP7.uasset and b/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/BP_MOPLamp_GP7.uasset differ diff --git a/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/BP_MOPLamp_Square_GP7.uasset b/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/BP_MOPLamp_Square_GP7.uasset index faeb5a58d..e06d6e47c 100644 Binary files a/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/BP_MOPLamp_Square_GP7.uasset and b/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/BP_MOPLamp_Square_GP7.uasset differ diff --git a/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/BP_Rectangular_Ceiling_Lamp.uasset b/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/BP_Rectangular_Ceiling_Lamp.uasset index 1d60ec940..e985a5983 100644 Binary files a/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/BP_Rectangular_Ceiling_Lamp.uasset and b/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/BP_Rectangular_Ceiling_Lamp.uasset differ diff --git a/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/BP_Rectangular_DoorLamp.uasset b/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/BP_Rectangular_DoorLamp.uasset index dfed9dde0..64fbefe44 100644 Binary files a/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/BP_Rectangular_DoorLamp.uasset and b/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/BP_Rectangular_DoorLamp.uasset differ diff --git a/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/SM_CeilingLamp_Line_MOP7.uasset b/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/SM_CeilingLamp_Line_MOP7.uasset index 2208bb2ee..520e95c82 100644 Binary files a/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/SM_CeilingLamp_Line_MOP7.uasset and b/Content/Meshes/Interior/GP7/Se01/MOP_Se01/Furniture/SM_CeilingLamp_Line_MOP7.uasset differ diff --git a/Content/Sequence/shots.uasset b/Content/Sequence/shots.uasset index 86b115f6b..7ce34d266 100644 Binary files a/Content/Sequence/shots.uasset and b/Content/Sequence/shots.uasset differ diff --git a/Content/UltraDynamicSky/Blueprints/Ultra_Dynamic_Sky.uasset b/Content/UltraDynamicSky/Blueprints/Ultra_Dynamic_Sky.uasset index 6fb4174d3..31288294d 100644 Binary files a/Content/UltraDynamicSky/Blueprints/Ultra_Dynamic_Sky.uasset and b/Content/UltraDynamicSky/Blueprints/Ultra_Dynamic_Sky.uasset differ diff --git a/Content/Xml/xmlConfig.ini b/Content/Xml/xmlConfig.ini index 6afcc2530..53c0a5ebd 100644 --- a/Content/Xml/xmlConfig.ini +++ b/Content/Xml/xmlConfig.ini @@ -1,2 +1,2 @@ url=https://pb13648.profitbase.ru/export/profitbase_xml/f79ccf5afb4d0463c69bcdba8c57b564 -houseIds=(96158=1,96043=1,96152=2,96162=2,96154=2,99490=3,102908=3,102900=3,111228=7,113076=7) \ No newline at end of file +houseIds=(96158=1,96043=1,96152=2,96162=2,96154=2,99490=3,102908=3,102900=3,111228=7,113076=7,118239=9,118339=9) \ No newline at end of file diff --git a/Source/MasharovDev/cppGI.cpp b/Source/MasharovDev/cppGI.cpp index c467acba4..62fda7a07 100644 --- a/Source/MasharovDev/cppGI.cpp +++ b/Source/MasharovDev/cppGI.cpp @@ -80,7 +80,7 @@ void UcppGI::cppLvlManage(UObject* WorldContextObject, Fcppcoords currentCoords, } else { bool b; - if (ULevelStreamingDynamic* newlvl = ULevelStreamingDynamic::LoadLevelInstance(WorldContextObject, lvl.path, FVector(0, 0, lvl.Z), FRotator(), b, instanceStr)) { + if (ULevelStreamingDynamic* newlvl = ULevelStreamingDynamic::LoadLevelInstance(WorldContextObject, lvl.path, FVector(0, 0, lvl.Z), FRotator(0), b, instanceStr)) { newlvl->SetPriority(lvl.coords.flat == -1 ? 1 : 0); newlvl->bShouldBlockOnLoad = lvl.dontUnload; cppdynamicLvls.Add(instanceName);