Merge branch 'feature/BasicMovement' into develop

Merge branch 'feature/QTE' into develop
Add RadialProgressBar
2020-08-04 19:35:12 +02:00 · 2020-08-04 19:34:19 +02:00 · 2020-08-04 19:33:09 +02:00 · 2020-08-04 19:08:00 +02:00 · 2020-08-04 19:07:45 +02:00 · 2020-08-04 14:43:01 +02:00
34 changed files with 4 additions and 0 deletions
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@ -25,3 +25,7 @@ GlobalDefaultServerGameMode=None
 +ActiveGameNameRedirects=(OldGameName="TP_BlankBP",NewGameName="/Script/JamTeacher")
 +ActiveGameNameRedirects=(OldGameName="/Script/TP_BlankBP",NewGameName="/Script/JamTeacher")

+[/Script/Engine.RendererSettings]
+r.DefaultFeature.MotionBlur=False
+r.DefaultFeature.AntiAliasing=2
+
--- a/Config/DefaultGame.ini
+++ b/Config/DefaultGame.ini
--- 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/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/NewBlueprint.uasset
+++ b/Content/0_Project/Core/NewBlueprint.uasset
--- a/Content/0_Project/Core/QTE/EEventState.uasset
+++ b/Content/0_Project/Core/QTE/EEventState.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/M_RadialProgressBar.uasset
+++ b/Content/0_Project/Core/QTE/M_RadialProgressBar.uasset
--- a/Content/0_Project/Core/QTE/SEventData.uasset
+++ b/Content/0_Project/Core/QTE/SEventData.uasset
--- a/Content/0_Project/Core/QTE/W_QTEKey.uasset
+++ b/Content/0_Project/Core/QTE/W_QTEKey.uasset
--- a/Content/0_Project/Core/SPMacroLibrary.uasset
+++ b/Content/0_Project/Core/SPMacroLibrary.uasset
--- a/Content/0_Project/Core/SpeechSpawner.uasset
+++ b/Content/0_Project/Core/SpeechSpawner.uasset
--- a/Content/0_Project/Maps/TestMap.umap
+++ b/Content/0_Project/Maps/TestMap.umap
--- a/Content/0_Project/Maps/TestQTE.umap
+++ b/Content/0_Project/Maps/TestQTE.umap
--- a/Content/ControllerIcons_Pack/Xbox_One/XboxOne_A.uasset
+++ b/Content/ControllerIcons_Pack/Xbox_One/XboxOne_A.uasset
--- a/Content/ControllerIcons_Pack/Xbox_One/XboxOne_B.uasset
+++ b/Content/ControllerIcons_Pack/Xbox_One/XboxOne_B.uasset
--- a/Content/ControllerIcons_Pack/Xbox_One/XboxOne_Dpad.uasset
+++ b/Content/ControllerIcons_Pack/Xbox_One/XboxOne_Dpad.uasset
--- a/Content/ControllerIcons_Pack/Xbox_One/XboxOne_Dpad_Down.uasset
+++ b/Content/ControllerIcons_Pack/Xbox_One/XboxOne_Dpad_Down.uasset
--- a/Content/ControllerIcons_Pack/Xbox_One/XboxOne_Dpad_Left.uasset
+++ b/Content/ControllerIcons_Pack/Xbox_One/XboxOne_Dpad_Left.uasset
--- a/Content/ControllerIcons_Pack/Xbox_One/XboxOne_Dpad_Right.uasset
+++ b/Content/ControllerIcons_Pack/Xbox_One/XboxOne_Dpad_Right.uasset
--- a/Content/ControllerIcons_Pack/Xbox_One/XboxOne_Dpad_Up.uasset
+++ b/Content/ControllerIcons_Pack/Xbox_One/XboxOne_Dpad_Up.uasset
--- a/Content/ControllerIcons_Pack/Xbox_One/XboxOne_LB.uasset
+++ b/Content/ControllerIcons_Pack/Xbox_One/XboxOne_LB.uasset
--- a/Content/ControllerIcons_Pack/Xbox_One/XboxOne_LT.uasset
+++ b/Content/ControllerIcons_Pack/Xbox_One/XboxOne_LT.uasset
--- a/Content/ControllerIcons_Pack/Xbox_One/XboxOne_Left_Stick.uasset
+++ b/Content/ControllerIcons_Pack/Xbox_One/XboxOne_Left_Stick.uasset
--- a/Content/ControllerIcons_Pack/Xbox_One/XboxOne_Menu.uasset
+++ b/Content/ControllerIcons_Pack/Xbox_One/XboxOne_Menu.uasset
--- a/Content/ControllerIcons_Pack/Xbox_One/XboxOne_RB.uasset
+++ b/Content/ControllerIcons_Pack/Xbox_One/XboxOne_RB.uasset
--- a/Content/ControllerIcons_Pack/Xbox_One/XboxOne_RT.uasset
+++ b/Content/ControllerIcons_Pack/Xbox_One/XboxOne_RT.uasset
--- a/Content/ControllerIcons_Pack/Xbox_One/XboxOne_Right_Stick.uasset
+++ b/Content/ControllerIcons_Pack/Xbox_One/XboxOne_Right_Stick.uasset
--- a/Content/ControllerIcons_Pack/Xbox_One/XboxOne_Windows.uasset
+++ b/Content/ControllerIcons_Pack/Xbox_One/XboxOne_Windows.uasset
--- a/Content/ControllerIcons_Pack/Xbox_One/XboxOne_X.uasset
+++ b/Content/ControllerIcons_Pack/Xbox_One/XboxOne_X.uasset
--- a/Content/ControllerIcons_Pack/Xbox_One/XboxOne_Y.uasset
+++ b/Content/ControllerIcons_Pack/Xbox_One/XboxOne_Y.uasset
Author	SHA1	Message	Date
LUCASTUCIOUS@Playwing	3b9bee61f7	Merge branch 'feature/BasicMovement' into develop	2020-08-04 19:35:12 +02:00
LUCASTUCIOUS@Playwing	aa15bbf678	Merge branch 'feature/QTE' into develop	2020-08-04 19:34:19 +02:00
LUCASTUCIOUS@Playwing	0304e1537a	Add RadialProgressBar	2020-08-04 19:33:09 +02:00
LUCASTUCIOUS@Playwing	6154033256	Add QTE assets	2020-08-04 19:08:00 +02:00
LUCASTUCIOUS@Playwing	f347e71fe9	Add BaseEnnemie & basePlayer	2020-08-04 19:07:45 +02:00
LUCASTUCIOUS@Playwing	cbd89107bd	Add XboxOne Icons into project	2020-08-04 14:43:01 +02:00
LUCASTUCIOUS@Playwing	36f55a80f8	Update Tilt Shift + Deactivate motion blur	2020-08-04 14:42:34 +02:00
LUCASTUCIOUS@Playwing	2f13d71392	Add TestCharacter + Tilt Shift	2020-08-04 14:18:27 +02:00
LUCASTUCIOUS@Playwing	43d0937cd3	Add QTEMap	2020-08-04 13:43:25 +02:00
LUCASTUCIOUS@Playwing	2a3be020bd	Merge branch 'feature/SpeechRecognition' into develop	2020-08-04 13:43:05 +02:00
LUCASTUCIOUS@Playwing	1e557dd198	Migrate SpeechCode	2020-08-04 13:42:50 +02:00