diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index b2403e34..addd7e73 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -29,6 +29,7 @@ r.SeparateTranslucency=False r.GenerateMeshDistanceFields=False r.DistanceFieldBuild.EightBit=True r.DistanceFieldBuild.Compress=True +r.ReflectionCaptureResolution=256 [/Script/EngineSettings.GameMapsSettings] GameInstanceClass=/Game/Blueprints/Player/GI.GI_C diff --git a/Content/Blueprints/Player/GI.uasset b/Content/Blueprints/Player/GI.uasset index 19477ce6..3dceca5f 100644 Binary files a/Content/Blueprints/Player/GI.uasset and b/Content/Blueprints/Player/GI.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset b/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset index 0ad67440..d422ab8a 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/Utils/Sky/Sky.uasset b/Content/Blueprints/Utils/Sky/Sky.uasset index 67644e01..b5070f66 100644 Binary files a/Content/Blueprints/Utils/Sky/Sky.uasset and b/Content/Blueprints/Utils/Sky/Sky.uasset differ diff --git a/Content/Blueprints/Utils/Sky/SkyHdri.uasset b/Content/Blueprints/Utils/Sky/SkyHdri.uasset index 62bb22f4..09d00818 100644 Binary files a/Content/Blueprints/Utils/Sky/SkyHdri.uasset and b/Content/Blueprints/Utils/Sky/SkyHdri.uasset differ diff --git a/Content/Instances/Conditioner/MI_Cond.uasset b/Content/Instances/Conditioner/MI_Cond.uasset index d4db335f..98ce297d 100644 Binary files a/Content/Instances/Conditioner/MI_Cond.uasset and b/Content/Instances/Conditioner/MI_Cond.uasset differ diff --git a/Content/Maps/Bake/DayLightStaticH1.umap b/Content/Maps/Bake/DayLightStaticH1.umap new file mode 100644 index 00000000..939e9fb1 Binary files /dev/null and b/Content/Maps/Bake/DayLightStaticH1.umap differ diff --git a/Content/Maps/Bake/DayLightStaticH2.umap b/Content/Maps/Bake/DayLightStaticH2.umap new file mode 100644 index 00000000..e41be3c5 Binary files /dev/null and b/Content/Maps/Bake/DayLightStaticH2.umap differ diff --git a/Content/Maps/Bake/DayLightStaticH4.umap b/Content/Maps/Bake/DayLightStaticH4.umap new file mode 100644 index 00000000..7d5c66ef Binary files /dev/null and b/Content/Maps/Bake/DayLightStaticH4.umap differ diff --git a/Content/Maps/DayLight.umap b/Content/Maps/DayLight.umap index d586982f..8be79da5 100644 Binary files a/Content/Maps/DayLight.umap and b/Content/Maps/DayLight.umap differ diff --git a/Content/Maps/MainScene.umap b/Content/Maps/MainScene.umap index e5e9bc29..49d67700 100644 Binary files a/Content/Maps/MainScene.umap and b/Content/Maps/MainScene.umap differ diff --git a/Content/Maps/NightLight.umap b/Content/Maps/NightLight.umap index f27d62f0..5eb013e3 100644 Binary files a/Content/Maps/NightLight.umap and b/Content/Maps/NightLight.umap differ diff --git a/Content/Maps/S01-04_WallsOutside.umap b/Content/Maps/S01-04_WallsOutside.umap index bb69f1e7..9a9da87f 100644 Binary files a/Content/Maps/S01-04_WallsOutside.umap and b/Content/Maps/S01-04_WallsOutside.umap differ diff --git a/Content/Maps/S01/S01F03Refl.umap b/Content/Maps/S01/S01F03Refl.umap index d92ad6ec..fab767f9 100644 Binary files a/Content/Maps/S01/S01F03Refl.umap and b/Content/Maps/S01/S01F03Refl.umap differ diff --git a/Content/Maps/S02/S02F03Refl.umap b/Content/Maps/S02/S02F03Refl.umap index d4c2439b..9685234a 100644 Binary files a/Content/Maps/S02/S02F03Refl.umap and b/Content/Maps/S02/S02F03Refl.umap differ diff --git a/Content/Maps/S02/S02F05.umap b/Content/Maps/S02/S02F05.umap index a478ede3..8b90698f 100644 Binary files a/Content/Maps/S02/S02F05.umap and b/Content/Maps/S02/S02F05.umap differ diff --git a/Content/Maps/S02/S02F20Refl.umap b/Content/Maps/S02/S02F20Refl.umap index c04af7ce..3ffa39c0 100644 Binary files a/Content/Maps/S02/S02F20Refl.umap and b/Content/Maps/S02/S02F20Refl.umap differ diff --git a/Content/Maps/S04/S04F03/S04F03Refl.umap b/Content/Maps/S04/S04F03/S04F03Refl.umap index fbd755bf..a34f8d1f 100644 Binary files a/Content/Maps/S04/S04F03/S04F03Refl.umap and b/Content/Maps/S04/S04F03/S04F03Refl.umap differ diff --git a/Content/Materials/TV.uasset b/Content/Materials/TV.uasset index 7dc63adf..b87c937e 100644 Binary files a/Content/Materials/TV.uasset and b/Content/Materials/TV.uasset differ diff --git a/Content/Mavis/Materials/Master/M_FakeInterior.uasset b/Content/Mavis/Materials/Master/M_FakeInterior.uasset index 45955d0a..11342a4d 100644 Binary files a/Content/Mavis/Materials/Master/M_FakeInterior.uasset and b/Content/Mavis/Materials/Master/M_FakeInterior.uasset differ diff --git a/Content/Meshes/Danis/Windows_re/SM_S01_FakeWindows.uasset b/Content/Meshes/Danis/Windows_re/SM_S01_FakeWindows.uasset index 30112a72..c36f4108 100644 Binary files a/Content/Meshes/Danis/Windows_re/SM_S01_FakeWindows.uasset and b/Content/Meshes/Danis/Windows_re/SM_S01_FakeWindows.uasset differ diff --git a/Content/Meshes/Danis/Windows_re/SM_S02_FakeWindows.uasset b/Content/Meshes/Danis/Windows_re/SM_S02_FakeWindows.uasset index e7ab83bb..e3d5f93e 100644 Binary files a/Content/Meshes/Danis/Windows_re/SM_S02_FakeWindows.uasset and b/Content/Meshes/Danis/Windows_re/SM_S02_FakeWindows.uasset differ diff --git a/Content/Meshes/Danis/Windows_re/SM_S04_FakeWindows.uasset b/Content/Meshes/Danis/Windows_re/SM_S04_FakeWindows.uasset index 688864ee..911d41a8 100644 Binary files a/Content/Meshes/Danis/Windows_re/SM_S04_FakeWindows.uasset and b/Content/Meshes/Danis/Windows_re/SM_S04_FakeWindows.uasset differ diff --git a/Content/Textures/NewTextureRenderTargetCube.uasset b/Content/Textures/NewTextureRenderTargetCube.uasset index ddcd08ac..6b124cf4 100644 Binary files a/Content/Textures/NewTextureRenderTargetCube.uasset and b/Content/Textures/NewTextureRenderTargetCube.uasset differ diff --git a/Content/Textures/h1Out.uasset b/Content/Textures/h1Out.uasset new file mode 100644 index 00000000..233ce342 Binary files /dev/null and b/Content/Textures/h1Out.uasset differ diff --git a/Content/Textures/h2Out.uasset b/Content/Textures/h2Out.uasset new file mode 100644 index 00000000..3be0d917 Binary files /dev/null and b/Content/Textures/h2Out.uasset differ diff --git a/Content/Textures/h4Out.uasset b/Content/Textures/h4Out.uasset new file mode 100644 index 00000000..bd0e042e Binary files /dev/null and b/Content/Textures/h4Out.uasset differ diff --git a/Onejsky4U.uproject b/Onejsky4U.uproject index 2be76d32..24493e82 100644 --- a/Onejsky4U.uproject +++ b/Onejsky4U.uproject @@ -254,10 +254,6 @@ "Name": "BlueprintFileUtils", "Enabled": true }, - { - "Name": "WebBrowserWidget", - "Enabled": true - }, { "Name": "HoudiniEngine", "Enabled": true diff --git a/Plugins/JPrinter/Source/JPrinter/Private/JPrinter.cpp b/Plugins/JPrinter/Source/JPrinter/Private/JPrinter.cpp index a4a3ebd2..e6cfc9ec 100644 --- a/Plugins/JPrinter/Source/JPrinter/Private/JPrinter.cpp +++ b/Plugins/JPrinter/Source/JPrinter/Private/JPrinter.cpp @@ -1,5 +1,5 @@ // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved. - +#include "JPrinter.h" #include "JPrinterPrivatePCH.h" #define LOCTEXT_NAMESPACE "FJPrinterModule" diff --git a/Plugins/JPrinter/Source/JPrinter/Private/JPrinterBPLibrary.cpp b/Plugins/JPrinter/Source/JPrinter/Private/JPrinterBPLibrary.cpp index a8129ce5..0a8f0da9 100644 --- a/Plugins/JPrinter/Source/JPrinter/Private/JPrinterBPLibrary.cpp +++ b/Plugins/JPrinter/Source/JPrinter/Private/JPrinterBPLibrary.cpp @@ -1,7 +1,7 @@ // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved. - -#include "JPrinterPrivatePCH.h" #include "JPrinterBPLibrary.h" +#include "JPrinterPrivatePCH.h" + #define print(txt) GEngine->AddOnScreenDebugMessage(-1,10,FColor::Green, txt) DEFINE_LOG_CATEGORY_STATIC(JPrinterLog, Log, All);