Merge branch 'main' into feature/Cabinet

# Conflicts: # Content/Levels/Test_room.umap
2 years ago · db4425cb6f
parent 0d7f0ef267 e36d15af8e
commit db4425cb6f
8 changed files with 17 additions and 10 deletions
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@ -90,6 +90,7 @@ r.Shadow.Virtual.Enable=1
 r.DefaultFeature.LocalExposure.HighlightContrastScale=0.8

 r.DefaultFeature.LocalExposure.ShadowContrastScale=0.8
+r.DefaultFeature.MotionBlur=False

 [/Script/WindowsTargetPlatform.WindowsTargetSettings]
 DefaultGraphicsRHI=DefaultGraphicsRHI_DX12
--- a/Content/FPSPuzzleSP/Blueprints/CH_Actor.uasset
+++ b/Content/FPSPuzzleSP/Blueprints/CH_Actor.uasset
--- a/Content/InteractionSystem/Blueprints/Items/Master/BP_Item.uasset
+++ b/Content/InteractionSystem/Blueprints/Items/Master/BP_Item.uasset
--- a/Content/Levels/Level_alpha.umap
+++ b/Content/Levels/Level_alpha.umap
--- a/Content/Levels/Test_room.umap
+++ b/Content/Levels/Test_room.umap
--- a/Content/Levels/_GENERATED/imoro/Box_5927DA05.uasset
+++ b/Content/Levels/_GENERATED/imoro/Box_5927DA05.uasset
--- a/Content/Levels/_GENERATED/imoro/Box_6FD81623.uasset
+++ b/Content/Levels/_GENERATED/imoro/Box_6FD81623.uasset
--- a/beta.pdf
+++ b/beta.pdf