diff --git a/MGA_Project/Config/DefaultInput.ini b/MGA_Project/Config/DefaultInput.ini index 2ffd379485d8a38d9882b68a764279417c79502c..92d624cf51489d8484e0d87c22126f9b1ad70e6e 100644 --- a/MGA_Project/Config/DefaultInput.ini +++ b/MGA_Project/Config/DefaultInput.ini @@ -70,7 +70,9 @@ bCaptureMouseOnLaunch=True bEnableLegacyInputScales=True bEnableMotionControls=True bFilterInputByPlatformUser=False +bEnableInputDeviceSubsystem=True bShouldFlushPressedKeysOnViewportFocusLost=True +bEnableDynamicComponentInputBinding=True bAlwaysShowTouchInterface=False bShowConsoleOnFourFingerTap=True bEnableGestureRecognizer=False @@ -79,6 +81,7 @@ DefaultViewportMouseCaptureMode=CapturePermanently_IncludingInitialMouseDown DefaultViewportMouseLockMode=LockOnCapture FOVScale=0.011110 DoubleClickTime=0.200000 ++ActionMappings=(ActionName="sprint",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftShift) DefaultPlayerInputClass=/Script/EnhancedInput.EnhancedPlayerInput DefaultInputComponentClass=/Script/EnhancedInput.EnhancedInputComponent DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.DefaultVirtualJoysticks diff --git a/MGA_Project/Content/StarterContent/Materials/M_Metal_Burnished_Steel.uasset b/MGA_Project/Content/StarterContent/Materials/M_Metal_Burnished_Steel.uasset index 5091518e90b56fecb5bcbbe612679f2a3bd77605..32bb61036a4bedf5ca3c9e131c2380afd92b2230 100644 Binary files a/MGA_Project/Content/StarterContent/Materials/M_Metal_Burnished_Steel.uasset and b/MGA_Project/Content/StarterContent/Materials/M_Metal_Burnished_Steel.uasset differ diff --git a/MGA_Project/Content/StarterContent/Materials/M_Tech_Hex_Tile_Pulse.uasset b/MGA_Project/Content/StarterContent/Materials/M_Tech_Hex_Tile_Pulse.uasset index 570262a019272f41b667531c6162148f50b0e0cc..4e248ae23e552e591bff7ddc3f4c7af5f5e83b9c 100644 Binary files a/MGA_Project/Content/StarterContent/Materials/M_Tech_Hex_Tile_Pulse.uasset and b/MGA_Project/Content/StarterContent/Materials/M_Tech_Hex_Tile_Pulse.uasset differ diff --git a/MGA_Project/Content/Students/JEC0014/BP_ThirdPerson_JEC0014.uasset b/MGA_Project/Content/Students/JEC0014/BP_ThirdPerson_JEC0014.uasset index ca71d967394ba952b2c0d14efe51a96569b7eec1..c1929973d6ca9c6110de32956030b151ee0c1bb0 100644 Binary files a/MGA_Project/Content/Students/JEC0014/BP_ThirdPerson_JEC0014.uasset and b/MGA_Project/Content/Students/JEC0014/BP_ThirdPerson_JEC0014.uasset differ diff --git a/MGA_Project/Content/Students/JEC0014/Chair/bake.uasset b/MGA_Project/Content/Students/JEC0014/Chair/bake.uasset new file mode 100644 index 0000000000000000000000000000000000000000..f31c6306fd9eb41d228defe52b3b3c9595d6277e Binary files /dev/null and b/MGA_Project/Content/Students/JEC0014/Chair/bake.uasset differ diff --git a/MGA_Project/Content/Students/JEC0014/Chair/bakechair.uasset b/MGA_Project/Content/Students/JEC0014/Chair/bakechair.uasset new file mode 100644 index 0000000000000000000000000000000000000000..98ba2bdde1c56229d9d4c585220c9a7e9d048ebf Binary files /dev/null and b/MGA_Project/Content/Students/JEC0014/Chair/bakechair.uasset differ diff --git a/MGA_Project/Content/Students/JEC0014/Chair/chairblend4.uasset b/MGA_Project/Content/Students/JEC0014/Chair/chairblend4.uasset new file mode 100644 index 0000000000000000000000000000000000000000..a35e01baa715d8d3ff620d9ed5dc057d5a408911 Binary files /dev/null and b/MGA_Project/Content/Students/JEC0014/Chair/chairblend4.uasset differ diff --git a/MGA_Project/Content/Students/JEC0014/L_JEC0014.umap b/MGA_Project/Content/Students/JEC0014/L_JEC0014.umap index 572bbdf90dcc4c25b4c64deb9bbfd3a9ab7fb4ea..b4a3afd4d79d9df807105b76461cb571cabcc579 100644 Binary files a/MGA_Project/Content/Students/JEC0014/L_JEC0014.umap and b/MGA_Project/Content/Students/JEC0014/L_JEC0014.umap differ diff --git a/MGA_Project/Content/Students/JEC0014/NPC.uasset b/MGA_Project/Content/Students/JEC0014/NPC.uasset new file mode 100644 index 0000000000000000000000000000000000000000..c3aac04beefd0ae3a48b7a05b65224f14ae7591c Binary files /dev/null and b/MGA_Project/Content/Students/JEC0014/NPC.uasset differ