Merge remote-tracking branch 'origin/develop' into develop

Merge branch 'feature/QTE' into develop
Update QTE map
2020-08-05 00:33:39 +02:00 · 2020-08-05 00:33:27 +02:00 · 2020-08-05 00:32:35 +02:00 · 2020-08-05 00:32:25 +02:00 · 2020-08-05 00:28:21 +02:00 · 2020-08-04 22:33:46 +02:00
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
Author	SHA1	Message	Date
LUCASTUCIOUS@Playwing	3b2d11223f	Merge remote-tracking branch 'origin/develop' into develop	2020-08-05 00:33:39 +02:00
lucasdlk	6596349242	Merge branch 'feature/QTE' into develop	2020-08-05 00:33:27 +02:00
LUCASTUCIOUS@Playwing	267df3c730	Update QTE map	2020-08-05 00:32:35 +02:00
LUCASTUCIOUS@Playwing	ca4dd6cee2	Add gamepad joystick to debug input	2020-08-05 00:32:25 +02:00
LUCASTUCIOUS@Playwing	69a4c123cb	Add StartQTE	2020-08-05 00:28:21 +02:00
LUCASTUCIOUS@Playwing	a1c4af382d	Update macroLibrarie	2020-08-04 22:33:46 +02:00
LUCASTUCIOUS@Playwing	8b8e9a4c3a	Detect Player Input type	2020-08-04 22:09:15 +02:00