Merge branch 'feature/QTE' into develop

2020-08-05 00:33:27 +02:00 · 2020-08-05 00:33:27 +02:00 · 6596349242
commit 6596349242
parent 3b9bee61f7 267df3c730
17 changed files with 1 additions and 0 deletions
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@ -28,4 +28,5 @@ GlobalDefaultServerGameMode=None
 [/Script/Engine.RendererSettings]
 r.DefaultFeature.MotionBlur=False
 r.DefaultFeature.AntiAliasing=2
+r.DefaultFeature.AutoExposure=False

--- a/Config/DefaultInput.ini
+++ b/Config/DefaultInput.ini
--- a/Content/0_Project/Core/BaseEnnemies.uasset
+++ b/Content/0_Project/Core/BaseEnnemies.uasset
--- a/Content/0_Project/Core/BasePawn.uasset
+++ b/Content/0_Project/Core/BasePawn.uasset
--- a/Content/0_Project/Core/BasePlayer.uasset
+++ b/Content/0_Project/Core/BasePlayer.uasset
--- a/Content/0_Project/Core/Engine/MyPlayerController.uasset
+++ b/Content/0_Project/Core/Engine/MyPlayerController.uasset
--- a/Content/0_Project/Core/Engine/My_GameMode.uasset
+++ b/Content/0_Project/Core/Engine/My_GameMode.uasset
--- a/Content/0_Project/Core/Engine/SPPlayerController.uasset
+++ b/Content/0_Project/Core/Engine/SPPlayerController.uasset
--- a/Content/0_Project/Core/QTE/EEventState.uasset
+++ b/Content/0_Project/Core/QTE/EEventState.uasset
--- a/Content/0_Project/Core/QTE/EKeyInputType.uasset
+++ b/Content/0_Project/Core/QTE/EKeyInputType.uasset
--- a/Content/0_Project/Core/QTE/M_Icon.uasset
+++ b/Content/0_Project/Core/QTE/M_Icon.uasset
--- a/Content/0_Project/Core/QTE/SEventData.uasset
+++ b/Content/0_Project/Core/QTE/SEventData.uasset
--- a/Content/0_Project/Core/QTE/SInput.uasset
+++ b/Content/0_Project/Core/QTE/SInput.uasset
--- a/Content/0_Project/Core/QTE/W_QTEKey.uasset
+++ b/Content/0_Project/Core/QTE/W_QTEKey.uasset
--- a/Content/0_Project/Core/SPFunctionLibrary.uasset
+++ b/Content/0_Project/Core/SPFunctionLibrary.uasset
--- a/Content/0_Project/Core/SPMacroLibrary.uasset
+++ b/Content/0_Project/Core/SPMacroLibrary.uasset
--- a/Content/0_Project/Maps/TestQTE.umap
+++ b/Content/0_Project/Maps/TestQTE.umap