diff --git a/.gitignore b/.gitignore index ec16edb0c..4f1be06f1 100644 --- a/.gitignore +++ b/.gitignore @@ -85,4 +85,5 @@ Users/ # UnrealCLR Managed/ -Releases/ \ No newline at end of file +Releases/ +Plugins/FSR2/ diff --git a/20.JPG b/20.JPG index 94477c9e6..2a1c220d8 100644 Binary files a/20.JPG and b/20.JPG differ diff --git a/4.jpg b/4.jpg new file mode 100644 index 000000000..90d1e92c7 Binary files /dev/null and b/4.jpg differ diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 9be04dc46..f4e49debe 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -26,9 +26,8 @@ r.DefaultFeature.AmbientOcclusionStaticFraction=False r.Shadow.UnbuiltPreviewInGame=False r.RayTracing.UseTextureLod=False r.DefaultFeature.MotionBlur=False +r.TemporalAA.Upsampling=True -[/Script/WindowsTargetPlatform.WindowsTargetSettings] -DefaultGraphicsRHI=DefaultGraphicsRHI_DX12 [/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) @@ -71,3 +70,12 @@ DirtyAreaWarningSizeThreshold=-1.000000 SupportedAgentsMask=(bSupportsAgent0=True,bSupportsAgent1=True,bSupportsAgent2=True,bSupportsAgent3=True,bSupportsAgent4=True,bSupportsAgent5=True,bSupportsAgent6=True,bSupportsAgent7=True,bSupportsAgent8=True,bSupportsAgent9=True,bSupportsAgent10=True,bSupportsAgent11=True,bSupportsAgent12=True,bSupportsAgent13=True,bSupportsAgent14=True,bSupportsAgent15=True) DirtyAreasUpdateFreq=60.000000 +[/Script/FSR2TemporalUpscaling.FSR2Settings] +r.FidelityFX.FSR2.EnabledInEditorViewport=False +r.FidelityFX.FSR2.UseSSRExperimentalDenoiser=False +r.FidelityFX.FSR2.UseNativeDX12=True +r.FidelityFX.FSR2.UseNativeVulkan=True + +[/Script/WindowsTargetPlatform.WindowsTargetSettings] +DefaultGraphicsRHI=DefaultGraphicsRHI_DX12 + diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index 6e6ace8e1..c1a5cb496 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -76,4 +76,5 @@ bSkipMovies=False +DirectoriesToAlwaysCook=(Path="/Game/Blueprints/UI/Imgs") +DirectoriesToAlwaysCook=(Path="/Game/Maps/Interior") +DirectoriesToAlwaysStageAsNonUFS=(Path="Xml") ++DirectoriesToAlwaysStageAsNonUFS=(Path="script") diff --git a/Content/Blueprints/Lamp/BP_streetLamp.uasset b/Content/Blueprints/Lamp/BP_streetLamp.uasset index 4bf8e5eed..2f3e4dd7e 100644 Binary files a/Content/Blueprints/Lamp/BP_streetLamp.uasset and b/Content/Blueprints/Lamp/BP_streetLamp.uasset differ diff --git a/Content/Blueprints/Lamp/BP_streetLamp_Child_6m.uasset b/Content/Blueprints/Lamp/BP_streetLamp_Child_6m.uasset index 3dc6a0fc7..90644a1bc 100644 Binary files a/Content/Blueprints/Lamp/BP_streetLamp_Child_6m.uasset and b/Content/Blueprints/Lamp/BP_streetLamp_Child_6m.uasset differ diff --git a/Content/Blueprints/Player/CM.uasset b/Content/Blueprints/Player/CM.uasset index c60135f4c..24cb91729 100644 Binary files a/Content/Blueprints/Player/CM.uasset and b/Content/Blueprints/Player/CM.uasset differ diff --git a/Content/Blueprints/Player/GI.uasset b/Content/Blueprints/Player/GI.uasset index 7762f6acf..515339429 100644 Binary files a/Content/Blueprints/Player/GI.uasset and b/Content/Blueprints/Player/GI.uasset differ diff --git a/Content/Blueprints/Player/MathAndConvertFns.uasset b/Content/Blueprints/Player/MathAndConvertFns.uasset index 12a0a9c47..01d6d3ae1 100644 Binary files a/Content/Blueprints/Player/MathAndConvertFns.uasset and b/Content/Blueprints/Player/MathAndConvertFns.uasset differ diff --git a/Content/Blueprints/Player/MyPawn.uasset b/Content/Blueprints/Player/MyPawn.uasset index 75b0474f4..9df2a3b3e 100644 Binary files a/Content/Blueprints/Player/MyPawn.uasset and b/Content/Blueprints/Player/MyPawn.uasset differ diff --git a/Content/Blueprints/Player/WalkingPawn.uasset b/Content/Blueprints/Player/WalkingPawn.uasset index 29136b8e1..5a55112e1 100644 Binary files a/Content/Blueprints/Player/WalkingPawn.uasset and b/Content/Blueprints/Player/WalkingPawn.uasset differ diff --git a/Content/Blueprints/Player/cameraCustomLocation.uasset b/Content/Blueprints/Player/cameraCustomLocation.uasset new file mode 100644 index 000000000..2e90b44d4 Binary files /dev/null and b/Content/Blueprints/Player/cameraCustomLocation.uasset differ diff --git a/Content/Blueprints/Player/cameraSlowShake.uasset b/Content/Blueprints/Player/cameraSlowShake.uasset new file mode 100644 index 000000000..f546ec289 Binary files /dev/null and b/Content/Blueprints/Player/cameraSlowShake.uasset differ diff --git a/Content/Blueprints/Player/myGM.uasset b/Content/Blueprints/Player/myGM.uasset index df075ea02..6cd184bf9 100644 Binary files a/Content/Blueprints/Player/myGM.uasset and b/Content/Blueprints/Player/myGM.uasset differ diff --git a/Content/Blueprints/UI/Actors/FloorPoint.uasset b/Content/Blueprints/UI/Actors/FloorPoint.uasset index 234fce7fe..d32aa58a4 100644 Binary files a/Content/Blueprints/UI/Actors/FloorPoint.uasset and b/Content/Blueprints/UI/Actors/FloorPoint.uasset differ diff --git a/Content/Blueprints/UI/Actors/InfraPoint.uasset b/Content/Blueprints/UI/Actors/InfraPoint.uasset index 6c0a344cd..05a8bec5b 100644 Binary files a/Content/Blueprints/UI/Actors/InfraPoint.uasset and b/Content/Blueprints/UI/Actors/InfraPoint.uasset differ diff --git a/Content/Blueprints/UI/Actors/KPmaker.uasset b/Content/Blueprints/UI/Actors/KPmaker.uasset index 7012ceafc..e378c32f8 100644 Binary files a/Content/Blueprints/UI/Actors/KPmaker.uasset and b/Content/Blueprints/UI/Actors/KPmaker.uasset differ diff --git a/Content/Blueprints/UI/Imgs/Offer2LevelA4WithManager-1.uasset b/Content/Blueprints/UI/Imgs/Offer2LevelA4WithManager-1.uasset new file mode 100644 index 000000000..8a4e3ff2f Binary files /dev/null and b/Content/Blueprints/UI/Imgs/Offer2LevelA4WithManager-1.uasset differ diff --git a/Content/Blueprints/UI/Imgs/Offer2LevelA4WithManager.uasset b/Content/Blueprints/UI/Imgs/Offer2LevelA4WithManager.uasset new file mode 100644 index 000000000..d7bdb60b1 Binary files /dev/null and b/Content/Blueprints/UI/Imgs/Offer2LevelA4WithManager.uasset differ diff --git a/Content/Blueprints/UI/Imgs/OfferA4WithManager-1.uasset b/Content/Blueprints/UI/Imgs/OfferA4WithManager-1.uasset new file mode 100644 index 000000000..85f5e723c Binary files /dev/null and b/Content/Blueprints/UI/Imgs/OfferA4WithManager-1.uasset differ diff --git a/Content/Blueprints/UI/Imgs/OfferA4WithManager.uasset b/Content/Blueprints/UI/Imgs/OfferA4WithManager.uasset new file mode 100644 index 000000000..73ee92010 Binary files /dev/null and b/Content/Blueprints/UI/Imgs/OfferA4WithManager.uasset differ diff --git a/Content/Blueprints/UI/Materials/M_KPrender.uasset b/Content/Blueprints/UI/Materials/M_KPrender.uasset index b41569852..607aa4b3f 100644 Binary files a/Content/Blueprints/UI/Materials/M_KPrender.uasset and b/Content/Blueprints/UI/Materials/M_KPrender.uasset differ diff --git a/Content/Blueprints/UI/Others/FlatData.uasset b/Content/Blueprints/UI/Others/FlatData.uasset index 1747e90f1..ab00caae4 100644 Binary files a/Content/Blueprints/UI/Others/FlatData.uasset and b/Content/Blueprints/UI/Others/FlatData.uasset differ diff --git a/Content/Blueprints/UI/Others/clientData.uasset b/Content/Blueprints/UI/Others/clientData.uasset index 265e9f3dd..6251e8dbf 100644 Binary files a/Content/Blueprints/UI/Others/clientData.uasset and b/Content/Blueprints/UI/Others/clientData.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Elements/MenuBtn.uasset b/Content/Blueprints/UI/WBPS/Elements/MenuBtn.uasset index b2fe06c4c..1a8b8283a 100644 Binary files a/Content/Blueprints/UI/WBPS/Elements/MenuBtn.uasset and b/Content/Blueprints/UI/WBPS/Elements/MenuBtn.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Elements/styledText.uasset b/Content/Blueprints/UI/WBPS/Elements/styledText.uasset index bcc78b84b..d39ead5e3 100644 Binary files a/Content/Blueprints/UI/WBPS/Elements/styledText.uasset and b/Content/Blueprints/UI/WBPS/Elements/styledText.uasset differ diff --git a/Content/Blueprints/UI/WBPS/KPWidget.uasset b/Content/Blueprints/UI/WBPS/KPWidget.uasset index c68401323..15bbcf86c 100644 Binary files a/Content/Blueprints/UI/WBPS/KPWidget.uasset and b/Content/Blueprints/UI/WBPS/KPWidget.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/InfoPanel.uasset b/Content/Blueprints/UI/WBPS/Menu/InfoPanel.uasset index 96449e019..022f1a251 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/InfoPanel.uasset and b/Content/Blueprints/UI/WBPS/Menu/InfoPanel.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset b/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset index d99af2e6e..f0190c814 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/bottomMenu.uasset b/Content/Blueprints/UI/WBPS/Menu/bottomMenu.uasset index d0ab0e221..48c427f48 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/bottomMenu.uasset and b/Content/Blueprints/UI/WBPS/Menu/bottomMenu.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/flatInfoBig.uasset b/Content/Blueprints/UI/WBPS/Menu/flatInfoBig.uasset index bd8e86c3f..777527cdd 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/flatInfoBig.uasset and b/Content/Blueprints/UI/WBPS/Menu/flatInfoBig.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/floorInfo.uasset b/Content/Blueprints/UI/WBPS/Menu/floorInfo.uasset index c82056ede..be22383b4 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/floorInfo.uasset and b/Content/Blueprints/UI/WBPS/Menu/floorInfo.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/houseInfo.uasset b/Content/Blueprints/UI/WBPS/Menu/houseInfo.uasset index 6a7c94811..0562e5984 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/houseInfo.uasset and b/Content/Blueprints/UI/WBPS/Menu/houseInfo.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/saveData.uasset b/Content/Blueprints/UI/WBPS/Menu/saveData.uasset index 106af65e6..9d432d0f2 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/saveData.uasset and b/Content/Blueprints/UI/WBPS/Menu/saveData.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/welcomeData.uasset b/Content/Blueprints/UI/WBPS/Menu/welcomeData.uasset index 8c37c5a77..73a42c21c 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/welcomeData.uasset and b/Content/Blueprints/UI/WBPS/Menu/welcomeData.uasset differ diff --git a/Content/Blueprints/UI/WBPS/filter/Filter.uasset b/Content/Blueprints/UI/WBPS/filter/Filter.uasset index 5d83d8a51..7a6091b16 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/WBPS/filter/FlatCard.uasset b/Content/Blueprints/UI/WBPS/filter/FlatCard.uasset index adacc4b07..a7ec6aa2c 100644 Binary files a/Content/Blueprints/UI/WBPS/filter/FlatCard.uasset and b/Content/Blueprints/UI/WBPS/filter/FlatCard.uasset differ diff --git a/Content/Blueprints/UI/WBPS/filter/FlatCardBig.uasset b/Content/Blueprints/UI/WBPS/filter/FlatCardBig.uasset index a06e5c1ea..2dd7f191f 100644 Binary files a/Content/Blueprints/UI/WBPS/filter/FlatCardBig.uasset and b/Content/Blueprints/UI/WBPS/filter/FlatCardBig.uasset differ diff --git a/Content/Blueprints/UI/WBPS/widgetActions.uasset b/Content/Blueprints/UI/WBPS/widgetActions.uasset index 7b9fb26aa..a759a3450 100644 Binary files a/Content/Blueprints/UI/WBPS/widgetActions.uasset and b/Content/Blueprints/UI/WBPS/widgetActions.uasset differ diff --git a/Content/Blueprints/Utils/Generators/HumanAI/peopleNavAreaNull.uasset b/Content/Blueprints/Utils/Generators/HumanAI/peopleNavAreaNull.uasset deleted file mode 100644 index fea5f7985..000000000 Binary files a/Content/Blueprints/Utils/Generators/HumanAI/peopleNavAreaNull.uasset and /dev/null differ diff --git a/Content/Blueprints/Utils/Generators/HumanAI/peopleNull.uasset b/Content/Blueprints/Utils/Generators/HumanAI/peopleNull.uasset new file mode 100644 index 000000000..7674b3fa6 Binary files /dev/null and b/Content/Blueprints/Utils/Generators/HumanAI/peopleNull.uasset differ diff --git a/Content/Blueprints/Utils/Generators/splineMoverBoat.uasset b/Content/Blueprints/Utils/Generators/splineMoverBoat.uasset deleted file mode 100644 index d779a6e9e..000000000 Binary files a/Content/Blueprints/Utils/Generators/splineMoverBoat.uasset and /dev/null differ diff --git a/Content/Blueprints/Utils/RTManage.uasset b/Content/Blueprints/Utils/RTManage.uasset index 26493fa58..1a2987bb5 100644 Binary files a/Content/Blueprints/Utils/RTManage.uasset and b/Content/Blueprints/Utils/RTManage.uasset differ diff --git a/Content/Maps/Interior/GP2/S02F02.umap b/Content/Maps/Interior/GP2/S02F02.umap index 41dbd1066..62b1ed3a9 100644 Binary files a/Content/Maps/Interior/GP2/S02F02.umap and b/Content/Maps/Interior/GP2/S02F02.umap differ diff --git a/Content/Maps/Interior/GP2/S02F03-12.umap b/Content/Maps/Interior/GP2/S02F03-12.umap index 1604d97ea..c57aa581c 100644 Binary files a/Content/Maps/Interior/GP2/S02F03-12.umap and b/Content/Maps/Interior/GP2/S02F03-12.umap differ diff --git a/Content/Maps/Interior/GP2/S02F13-16.umap b/Content/Maps/Interior/GP2/S02F13-16.umap index e23b09433..668eba02b 100644 Binary files a/Content/Maps/Interior/GP2/S02F13-16.umap and b/Content/Maps/Interior/GP2/S02F13-16.umap differ diff --git a/Content/Maps/Interior/GP2/S02F17-18.umap b/Content/Maps/Interior/GP2/S02F17-18.umap index e4462ebda..2b300f44f 100644 Binary files a/Content/Maps/Interior/GP2/S02F17-18.umap and b/Content/Maps/Interior/GP2/S02F17-18.umap differ diff --git a/Content/Maps/Interior/GP2/S02F19.umap b/Content/Maps/Interior/GP2/S02F19.umap index d2e8fa11c..22502c11c 100644 Binary files a/Content/Maps/Interior/GP2/S02F19.umap and b/Content/Maps/Interior/GP2/S02F19.umap differ diff --git a/Content/Maps/Interior/GP2/S02F20.umap b/Content/Maps/Interior/GP2/S02F20.umap index 396f9db41..4d47e3c9c 100644 Binary files a/Content/Maps/Interior/GP2/S02F20.umap and b/Content/Maps/Interior/GP2/S02F20.umap differ diff --git a/Content/Maps/Masharov_Yard.umap b/Content/Maps/Masharov_Yard.umap index 2ecd45036..61e2d7299 100644 Binary files a/Content/Maps/Masharov_Yard.umap and b/Content/Maps/Masharov_Yard.umap differ diff --git a/Content/Maps/mainScene.umap b/Content/Maps/mainScene.umap index c5022605d..f34212914 100644 Binary files a/Content/Maps/mainScene.umap and b/Content/Maps/mainScene.umap differ diff --git a/Content/Maps/test1.umap b/Content/Maps/test1.umap index dbdb040c3..effb6b486 100644 Binary files a/Content/Maps/test1.umap and b/Content/Maps/test1.umap differ diff --git a/Masharov.uproject b/Masharov.uproject index 0c61e6435..3fa1b50c7 100644 --- a/Masharov.uproject +++ b/Masharov.uproject @@ -341,6 +341,13 @@ "Win64", "Android" ] + }, + { + "Name": "FSR2", + "Enabled": false, + "SupportedTargetPlatforms": [ + "Win64" + ] } ] } \ No newline at end of file