From c4c12d0251887ef61090b597a6f0521d8c07deb6 Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Sat, 20 Mar 2021 23:27:09 -0500 Subject: [PATCH] Try to fix Perforce line-ending bullshit [git-p4: depot-paths = "//depot/main/": change = 33] --- SwordNGun/Config/DefaultEngine.ini | 32 +-- SwordNGun/Config/DefaultGame.ini | 22 +- SwordNGun/Config/DefaultInput.ini | 222 +++++++++--------- SwordNGun/Source/SwordNGun.Target.cs | 28 +-- .../SNGEventBlueprintLibrary.cpp | Bin 744 -> 744 bytes .../Private/Characters/SNGCharacterBase.cpp | Bin 1532 -> 1532 bytes .../Private/Characters/SNGProtagonist.cpp | Bin 10744 -> 10744 bytes .../SwordNGun/Private/Components/SNGState.cpp | Bin 6550 -> 6550 bytes .../Private/Components/SNGStateMachine.cpp | Bin 206 -> 0 bytes .../Components/SNGStateMachineComponent.cpp | Bin 8524 -> 8524 bytes .../Controllers/SNGPlayerController.cpp | Bin 4296 -> 4296 bytes .../Interfaces/SNGEventProcessorInterface.cpp | Bin 444 -> 444 bytes .../SNGEventBlueprintLibrary.h | Bin 1152 -> 1152 bytes .../Public/Characters/SNGCharacterBase.h | Bin 1272 -> 1272 bytes .../Public/Characters/SNGProtagonist.h | Bin 4072 -> 4072 bytes .../SwordNGun/Public/Components/SNGState.h | Bin 5472 -> 5472 bytes .../Public/Components/SNGStateMachine.h | Bin 2840 -> 0 bytes .../Components/SNGStateMachineComponent.h | Bin 2502 -> 2502 bytes .../Public/Controllers/SNGPlayerController.h | Bin 1774 -> 1774 bytes .../Interfaces/SNGEventProcessorInterface.h | Bin 1268 -> 1268 bytes .../Source/SwordNGun/SNGGameModeBase.cpp | 10 +- SwordNGun/Source/SwordNGun/SNGGameModeBase.h | 34 +-- SwordNGun/Source/SwordNGun/SNGTypes.h | Bin 2572 -> 2572 bytes SwordNGun/Source/SwordNGun/SwordNGun.Build.cs | 46 ++-- SwordNGun/Source/SwordNGun/SwordNGun.cpp | 12 +- SwordNGun/Source/SwordNGun/SwordNGun.h | 12 +- SwordNGun/Source/SwordNGunEditor.Target.cs | 28 +-- 27 files changed, 223 insertions(+), 223 deletions(-) delete mode 100644 SwordNGun/Source/SwordNGun/Private/Components/SNGStateMachine.cpp delete mode 100644 SwordNGun/Source/SwordNGun/Public/Components/SNGStateMachine.h diff --git a/SwordNGun/Config/DefaultEngine.ini b/SwordNGun/Config/DefaultEngine.ini index ae6a565..7cbff76 100644 --- a/SwordNGun/Config/DefaultEngine.ini +++ b/SwordNGun/Config/DefaultEngine.ini @@ -1,16 +1,16 @@ - - -[/Script/HardwareTargeting.HardwareTargetingSettings] -TargetedHardwareClass=Desktop -AppliedTargetedHardwareClass=Desktop -DefaultGraphicsPerformance=Maximum -AppliedDefaultGraphicsPerformance=Maximum - -[/Script/Engine.Engine] -+ActiveGameNameRedirects=(OldGameName="TP_Blank",NewGameName="/Script/SwordNGun") -+ActiveGameNameRedirects=(OldGameName="/Script/TP_Blank",NewGameName="/Script/SwordNGun") -+ActiveClassRedirects=(OldClassName="TP_BlankGameModeBase",NewClassName="SwordNGunGameModeBase") - -[/Script/EngineSettings.GameMapsSettings] -EditorStartupMap=/Game/Maps/Test.Test - + + +[/Script/HardwareTargeting.HardwareTargetingSettings] +TargetedHardwareClass=Desktop +AppliedTargetedHardwareClass=Desktop +DefaultGraphicsPerformance=Maximum +AppliedDefaultGraphicsPerformance=Maximum + +[/Script/Engine.Engine] ++ActiveGameNameRedirects=(OldGameName="TP_Blank",NewGameName="/Script/SwordNGun") ++ActiveGameNameRedirects=(OldGameName="/Script/TP_Blank",NewGameName="/Script/SwordNGun") ++ActiveClassRedirects=(OldClassName="TP_BlankGameModeBase",NewClassName="SwordNGunGameModeBase") + +[/Script/EngineSettings.GameMapsSettings] +EditorStartupMap=/Game/Maps/Test.Test + diff --git a/SwordNGun/Config/DefaultGame.ini b/SwordNGun/Config/DefaultGame.ini index c3d8543..a7a17ce 100644 --- a/SwordNGun/Config/DefaultGame.ini +++ b/SwordNGun/Config/DefaultGame.ini @@ -1,11 +1,11 @@ - -[/Script/EngineSettings.GeneralProjectSettings] -ProjectID=503A39B34BA99D3F63A2A6BF147276F0 -ProjectVersion=0.0.1.0 -ProjectName=Project Sword & Gun -CompanyName=BoneSoft -Homepage=kevinporetti.com -SupportContact=kevinporetti@gmail.com -CopyrightNotice=Project Sword & Gun Copyright © 2021 Kevin Poretti -CompanyDistinguishedName=BoneSoft - + +[/Script/EngineSettings.GeneralProjectSettings] +ProjectID=503A39B34BA99D3F63A2A6BF147276F0 +ProjectVersion=0.0.1.0 +ProjectName=Project Sword & Gun +CompanyName=BoneSoft +Homepage=kevinporetti.com +SupportContact=kevinporetti@gmail.com +CopyrightNotice=Project Sword & Gun Copyright © 2021 Kevin Poretti +CompanyDistinguishedName=BoneSoft + diff --git a/SwordNGun/Config/DefaultInput.ini b/SwordNGun/Config/DefaultInput.ini index 5b32607..9b3718c 100644 --- a/SwordNGun/Config/DefaultInput.ini +++ b/SwordNGun/Config/DefaultInput.ini @@ -1,111 +1,111 @@ -[/Script/Engine.InputSettings] --AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f)) --AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f)) --AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f)) --AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f)) --AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f)) --AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f)) --AxisConfig=(AxisKeyName="Mouse2D",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f)) -+AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Mouse2D",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MouseWheelAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Gamepad_LeftTriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Gamepad_RightTriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Gamepad_Special_Left_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Gamepad_Special_Left_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Daydream_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Daydream_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Daydream_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Daydream_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Vive_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Vive_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Vive_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Vive_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Vive_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Vive_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MixedReality_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MixedReality_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MixedReality_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MixedReality_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MixedReality_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MixedReality_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MixedReality_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MixedReality_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MixedReality_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MixedReality_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="OculusTouch_Left_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="OculusTouch_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="OculusTouch_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="OculusTouch_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="OculusTouch_Right_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="OculusTouch_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="OculusTouch_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="OculusTouch_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Left_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Left_Grip_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Touch",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Right_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Right_Grip_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -bAltEnterTogglesFullscreen=True -bF11TogglesFullscreen=True -bUseMouseForTouch=False -bEnableMouseSmoothing=True -bEnableFOVScaling=True -bCaptureMouseOnLaunch=True -bAlwaysShowTouchInterface=False -bShowConsoleOnFourFingerTap=True -bEnableGestureRecognizer=False -bUseAutocorrect=False -DefaultViewportMouseCaptureMode=CapturePermanently_IncludingInitialMouseDown -DefaultViewportMouseLockMode=LockOnCapture -FOVScale=0.011110 -DoubleClickTime=0.200000 -+ActionMappings=(ActionName="MeleeAttack",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=E) -+ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=SpaceBar) -+ActionMappings=(ActionName="Dash",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftShift) -+ActionMappings=(ActionName="GunAttack",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton) -+ActionMappings=(ActionName="Reload",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=R) -+ActionMappings=(ActionName="UseGadget",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Q) -+ActionMappings=(ActionName="CycleMeleeWeapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=One) -+ActionMappings=(ActionName="CycleRangedWeapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Two) -+ActionMappings=(ActionName="MeleeAttack",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Top) -+ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Bottom) -+ActionMappings=(ActionName="Dash",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Right) -+ActionMappings=(ActionName="GunAttack",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_RightTrigger) -+ActionMappings=(ActionName="Reload",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Left) -+ActionMappings=(ActionName="UseGadget",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_LeftTrigger) -+ActionMappings=(ActionName="CycleMeleeWeapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_LeftShoulder) -+ActionMappings=(ActionName="CycleRangedWeapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_RightShoulder) -+AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=W) -+AxisMappings=(AxisName="MoveForward",Scale=-1.000000,Key=S) -+AxisMappings=(AxisName="MoveRight",Scale=1.000000,Key=D) -+AxisMappings=(AxisName="MoveRight",Scale=-1.000000,Key=A) -+AxisMappings=(AxisName="Turn",Scale=1.000000,Key=MouseX) -+AxisMappings=(AxisName="TurnRate",Scale=1.000000,Key=Gamepad_RightX) -+AxisMappings=(AxisName="LookUp",Scale=-1.000000,Key=MouseY) -+AxisMappings=(AxisName="LookUpRate",Scale=1.000000,Key=Gamepad_RightY) -+AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=Gamepad_LeftY) -+AxisMappings=(AxisName="MoveRight",Scale=1.000000,Key=Gamepad_LeftX) -DefaultPlayerInputClass=/Script/Engine.PlayerInput -DefaultInputComponentClass=/Script/Engine.InputComponent -DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.DefaultVirtualJoysticks --ConsoleKeys=Tilde -+ConsoleKeys=Tilde - +[/Script/Engine.InputSettings] +-AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f)) +-AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f)) +-AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f)) +-AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f)) +-AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f)) +-AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f)) +-AxisConfig=(AxisKeyName="Mouse2D",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f)) ++AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Mouse2D",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MouseWheelAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Gamepad_LeftTriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Gamepad_RightTriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Gamepad_Special_Left_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Gamepad_Special_Left_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Daydream_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Daydream_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Daydream_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Daydream_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Vive_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Vive_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Vive_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Vive_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Vive_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="Vive_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="MixedReality_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Left_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Right_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="OculusTouch_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Grip_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Touch",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Grip_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) +bAltEnterTogglesFullscreen=True +bF11TogglesFullscreen=True +bUseMouseForTouch=False +bEnableMouseSmoothing=True +bEnableFOVScaling=True +bCaptureMouseOnLaunch=True +bAlwaysShowTouchInterface=False +bShowConsoleOnFourFingerTap=True +bEnableGestureRecognizer=False +bUseAutocorrect=False +DefaultViewportMouseCaptureMode=CapturePermanently_IncludingInitialMouseDown +DefaultViewportMouseLockMode=LockOnCapture +FOVScale=0.011110 +DoubleClickTime=0.200000 ++ActionMappings=(ActionName="MeleeAttack",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=E) ++ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=SpaceBar) ++ActionMappings=(ActionName="Dash",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftShift) ++ActionMappings=(ActionName="GunAttack",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton) ++ActionMappings=(ActionName="Reload",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=R) ++ActionMappings=(ActionName="UseGadget",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Q) ++ActionMappings=(ActionName="CycleMeleeWeapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=One) ++ActionMappings=(ActionName="CycleRangedWeapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Two) ++ActionMappings=(ActionName="MeleeAttack",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Top) ++ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Bottom) ++ActionMappings=(ActionName="Dash",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Right) ++ActionMappings=(ActionName="GunAttack",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_RightTrigger) ++ActionMappings=(ActionName="Reload",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Left) ++ActionMappings=(ActionName="UseGadget",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_LeftTrigger) ++ActionMappings=(ActionName="CycleMeleeWeapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_LeftShoulder) ++ActionMappings=(ActionName="CycleRangedWeapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_RightShoulder) ++AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=W) ++AxisMappings=(AxisName="MoveForward",Scale=-1.000000,Key=S) ++AxisMappings=(AxisName="MoveRight",Scale=1.000000,Key=D) ++AxisMappings=(AxisName="MoveRight",Scale=-1.000000,Key=A) ++AxisMappings=(AxisName="Turn",Scale=1.000000,Key=MouseX) ++AxisMappings=(AxisName="TurnRate",Scale=1.000000,Key=Gamepad_RightX) ++AxisMappings=(AxisName="LookUp",Scale=-1.000000,Key=MouseY) ++AxisMappings=(AxisName="LookUpRate",Scale=1.000000,Key=Gamepad_RightY) ++AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=Gamepad_LeftY) ++AxisMappings=(AxisName="MoveRight",Scale=1.000000,Key=Gamepad_LeftX) +DefaultPlayerInputClass=/Script/Engine.PlayerInput +DefaultInputComponentClass=/Script/Engine.InputComponent +DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.DefaultVirtualJoysticks +-ConsoleKeys=Tilde ++ConsoleKeys=Tilde + diff --git a/SwordNGun/Source/SwordNGun.Target.cs b/SwordNGun/Source/SwordNGun.Target.cs index 7cf961a..718b139 100644 --- a/SwordNGun/Source/SwordNGun.Target.cs +++ b/SwordNGun/Source/SwordNGun.Target.cs @@ -1,14 +1,14 @@ -// Copyright Epic Games, Inc. All Rights Reserved. - -using UnrealBuildTool; -using System.Collections.Generic; - -public class SwordNGunTarget : TargetRules -{ - public SwordNGunTarget( TargetInfo Target) : base(Target) - { - Type = TargetType.Game; - DefaultBuildSettings = BuildSettingsVersion.V2; - ExtraModuleNames.AddRange( new string[] { "SwordNGun" } ); - } -} +// Copyright Epic Games, Inc. All Rights Reserved. + +using UnrealBuildTool; +using System.Collections.Generic; + +public class SwordNGunTarget : TargetRules +{ + public SwordNGunTarget( TargetInfo Target) : base(Target) + { + Type = TargetType.Game; + DefaultBuildSettings = BuildSettingsVersion.V2; + ExtraModuleNames.AddRange( new string[] { "SwordNGun" } ); + } +} diff --git a/SwordNGun/Source/SwordNGun/Private/BlueprintLibraries/SNGEventBlueprintLibrary.cpp b/SwordNGun/Source/SwordNGun/Private/BlueprintLibraries/SNGEventBlueprintLibrary.cpp index f7a033e172b23918979a037a81a9dbb80b1408e7..21e129fb6155aec41ba242708b19cdc80f7197db 100644 GIT binary patch delta 87 zcmaFC`hs;r4ks@I7XuhiEG=e*Fy8KG2QjJ{cqcDqlAnBuQGy%9uZ5_a{FQMflDsJ& Ik{nPK06E7HQ2+n{ delta 87 zcmaFC`hs;r4ks4_6izHHW(6}RzTM9bVpKD5OFW#pZ_lhGe6 z!U+`NXVQeT4>HFBW#w5^!6tHob@;OQPnKfl69$>U$xsWn2SV~rwq~w}n~Ys=Dh_>? klmD?8!S(Vp$xjYr72yWi0W-Ul)e|m%lvR@tNe-wA0Cnglr2qf` delta 249 zcmeyv{fB!(4ks4_6izG+W(6}Rp4DdtGA3VSQJ<{FsKyQwtOoLf8B-a#ChuhQ2a9k5 zMfjOC;p~IVu|QdQ7FDo`oM0WkEdG)|G2*PDt%pXKC# iEJkp>{7mwb!&pVQL3Y5*E@kzE%O7Rco-7KCoy|kRFN% zUaE$_9;_A&qL)(YS&$lfs!GL^=YkhOG{>IQ+1brBi4+7umYvOf^F4mw|C?-%Y>qsb z5F{cJ_7?J4v-V>xWsqPsOwu)P7_#af81;ql%@Ab!TSS7pA={{)2`pYf!KC1=aWCFA zTwsYb%akdMn?^s2qMleVF44RT#t^1VC$xfCF@0v4W;7BM&Evd^)6%PZ4O!M`WVF$qM#MpFu}ZT+6gnU-H5m9K<=eU`=t>^=A?TTl+B=}r)z z*U=>LUEIxyl*Yt=CpwLFc^~G*)*7->bB1X_l^`M>TNjP$cfb~?QfQ;)_D-#T-Zj%_ zkmSiExk_RrPWqVc74-{_6z}zG+aW%=Y1xf(^pu(TW3Kf*)#{9MpsLoQb55Vb480ZV zqgIx1+!bop7#OK~f)!5)&s_a-E!!BGAlJwki_<3j%e5+1`$+ic&TytBPqIdlf+K;u zZD*_b^;sp_FX^N?av6z^%r-<3?CD4|PgWJ5+^N4{9LGV=IXxrS8TE8OJhPnahBsNI z+-Rp8AG{}Z3(WwP!bi z_t4aB!@57n&pfcp7uk79x4j7;t>d|Za`%?f|HQ=SsqwthYfj5gFdz1BLr^sLAgyfu zFZ0TNp2rc9(HU>S7i9jConq PDqZiybE0}5wAua!+CcKm delta 1339 zcmchWOK1~87{@2gbGJ2ZnxyR}ZMJ!A9-!8MHEKyx6d$dYSgHp_!75ckA6PUfNDoB> zFIAVn9;_A&qL)(IvmmwfRF#S+&jl}nXpTLpv$LCN5-A9REX?lA_xjEM`*w3^bLioi zAQIzI3pp$MRM*lb5q8r!T??iGyJ5$$Ka6jt5Zm7-BD{6Edd()V3<6Y(g16>KugyjgqqIf4}mZ8Y84rQe_5n(5O| z3S^vIBXN=-Jxuqq`l>6<@A|dnFz?)?>_sVd+RFSf)BK)lb=KWiQET2kWAtH)PKEYp zl|`KJgd24RMygq`EQRsh(<@iAjgT>Nos6(Jy~Dpet2-)vM11sSIn#oas!~LCC2_Ci zTqVEJt7PkCgEUXBAla7PhA4`?Z5igts^XJ3{TGa*I3%4nGIE_!OZP*X=43a0sS4$W z+r9YUJ7t{E3{d=X)y;DLJdYg=UZC19279V9r2nWNbavxL=xFtX8+sHww8__c+8@4; zhE50810imc;FK>h`-*Y)CUUHX=PF8_TT1^E6Yrv$;LF()v$1%K4jln>AQF7?eOwXDEL97k0U^T6j3*XYGO3^;z#OMlYpc`ye)o)G? zR5ho!DB0eE_k%BWj>pt95Rg649vb0hhR%t#1p6~Lg*YA7@H9NhX7vd)(QN~r%$a{l zVKo%)Wlu9kR^3 z{)@f;bc>QnxP}gKz%a+*8ZN+Q&X8fp_jTAX9XM|m63-WDwQ}P!2d=O=++^;)4nOQs zeN}(U&H|&#)&(O}ilffIhzqZbJdIVyJ^!w>@?Q#<&7&&G4YQO`&xg;jrW8JFP42>9 zSR)GmVC@sir7lFE<5RHgimIsDW#&+hznqolcF4{?*|00^Ro{YV`8k;rV-*?y$&(!_ zrWJqP2_)-n=QCrSFI;9Td&!=xO^?Elg5P(xxZ}fa*YRDKYg>0i$-0xN)|X|;3zZ@^ z7496mgqrMwJ0iY?_|-mowcaW?K>dWTd0J24?`S1~Z_$+mzUq%AaPH-ce@xW`#Y4cx`>FBKI011cJN_0V@_XD8V5@GX6+9L*z6O}U~pl^Zz9>Nh6` zYO38^lsw*q_k%C<43DX2z$bg4Jv74144va+8TMyxa&ZLKv}t&f&E_YRiS9Ab$(;F@ z6s)0eFMAppvAVCOCHEj))MjKPYg&URuQ7FyAt4VC?eqBxxxkgPd9?DKEL0+|Y$Xn* z`xkrv>68Q$cMTn4gKmt&HLVDnIbDPu?f#!;E%hEYzaXU(UZQxcywCwJj5 z%n^xyF!yogLKk}Ncoa;lDl6(%1s#g^7rpY_3UKX{1-sH-^-OqHm=if6E6?~(f$UH* zE%_U^FIaEepOJOGco|2$$)2nYm%@*t*SEKr)A}fu6xL9KiPv*V6qu|2vD?}y__Fp63iVSw+eDh z2g(R?2v6R_;RI%hPJX~GH(7vPZE^(XE)?}ZcLH6c%8lfj$$?yraCh9~3P({7F&|_y z*W?&(J40lNbcp|(TRLKD+8WnhfuF{ChLGNgfH4jv~$;*$-;#DHdlVy8>& z2$ByZC+CT0fzvZAo_Qxf71zdMyYOTqiDNL|NVY*)%Ovl?#nLAKlTw3*2q*>HNP8ji z=1Dt1ReqAzfU@*tKt2YlWrn5A1u{^R*^d4uc_2EPGS}o7 zZaYI{yCHstxg?b#hoP7u6&wyQF^F!EYhFoW>V$<^AeZxGHC`XM8!CDIvA6-|C$Y&2 zd<8&XPUOo4`&DzY2EP^5|7HAUP}TuBi$_FmvW9>G*)9i#BL~#f3kqD5#rXIpe-Ky$ z71^=0li6Xeca#l=s@@>TF?oaR3N#%T6uhAF59C081epfZ b3!;HMMR`!lBH9c&h^?@&fbgI$0fs36#=*=u diff --git a/SwordNGun/Source/SwordNGun/Private/Controllers/SNGPlayerController.cpp b/SwordNGun/Source/SwordNGun/Private/Controllers/SNGPlayerController.cpp index 33128bdd2957df9bf997c57bcd2172c31122f591..2adc53a592f68cbad06ed1818ead80fe3af1c9a9 100644 GIT binary patch delta 486 zcmX@1ctUYP4ks@I7XuhiERALbGbS@KTTbR<)ME$nsu_4EJ2RSs*_=RjJ)dAou;*%dRiJ_?rhT9m;>YB5)Bk{WL*m;9VZ*GrGQ-lafv>I7SI)e?6#91uoVDR1hRwF zf%rBYO;FcrG3Y})J^3t0JWy7b6GZlM7NWVxa7FP2g1d8VhcnTrM1tk0dS5#FQ delta 486 zcmX@1ctUYP4ks4_6izISW(6}RGcsFF=3~@j2l1*IxF$O@nu6J!Kz2Q&C0Gk5Smq#O zK0inmCqpgR7?28kCPi+L7(|2%Y}yhgDXW#*zgUd&&|G6mw)<3nm>W8?dE-T>){4K7$s}6@l!wlOM1Z096FCgVcfe zHXKb**J?57gI&Tk`7B2~P*#@{MD}tPqPfU&vJ+Pm+*PN!+~MKi$Rj(Mimf!o3VhMI}@w5GZqt#{p==LT1&;4!jN+w!Gjrnf!xS4sMeypDIwbGha54 oT+bH@^*1NKJdj_{s5se+KLRNhR`VYOisuS=3PC~u67mod0E}EzN&o-= diff --git a/SwordNGun/Source/SwordNGun/Private/Interfaces/SNGEventProcessorInterface.cpp b/SwordNGun/Source/SwordNGun/Private/Interfaces/SNGEventProcessorInterface.cpp index 2ca2008784e595703b62c3fe758a4691c6b75b57..6fb07f4d6ba076873eddd5b893ebc5190914ac1d 100644 GIT binary patch delta 33 ecmdnPyoY&04ks@I7XuhiEKO&HFdklK0Wko2;Rd+? delta 33 ecmdnPyoY&04ks4_6izHnX9Y7SKD^EXVgLYn%?76c diff --git a/SwordNGun/Source/SwordNGun/Public/BlueprintLibraries/SNGEventBlueprintLibrary.h b/SwordNGun/Source/SwordNGun/Public/BlueprintLibraries/SNGEventBlueprintLibrary.h index 5825e9225fb1987e3e6625958c85a319f49d1b3e..bc4784548e6b7074de4487211410805e2e2c7a32 100644 GIT binary patch delta 173 zcmZqRY~Y-b!^+FR#lSnUP#VgZXw1kvaiaLdJ1&g8lNA{qA;LhGoTU$Dg)%rZ_%Jv!1OuT4gC+y-B(FySv(;1wG7r^69JH^8p!|v diff --git a/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h b/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h index 62d9b4a248708cbb6e054bd9fc5d240ad4c1228c..74563dc3965637399ff0f6ab7887b2b1ed99b19d 100644 GIT binary patch delta 209 zcmeyt`Ga#p4l6GM7X$CaLTM;tqA?@y#EIe)@0c+1P8MVglmyEI)r2xQGx#t#G6Vym z27@L8@8oL6Qg)DRHIV(CQB@qKvVftKA&DV}A(J7Q!3rp6%v1<8Ybld1#EQw+nQVc4 zQRY|_{#IsBuxXq?9oLz(CmXQv0ae+vsKZ5bS;V0_I$1y_9A{DG0ohs0V9fxc0Zld~ A5dZ)H delta 209 zcmeyt`Ga#p4l5S}5Kb(VhB77^GjdIwC_eFy2_x5JLB>Eyusl#rD1$SD4}&8^Fc4}m zXfkk3u4XJ{2gz0g+20ve#bGK77)lwE7;+dg8Il>SfO5u6g+Q~GGU-CBn0%ed7RVQ6 zjz!^bW%dM{#tGDMok@GL0Sg~cl|73(Tr`(O9IB&}1!Tf;7F8aQowW?sAU`kw04NqD Av;Y7A diff --git a/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h b/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h index 2c2b1912a0e9a456137f760175f1fc1d5687c291..845b52a68daeafd3021277f6f081ce4916caa81d 100644 GIT binary patch delta 555 zcmaDM|3ZF34l6GM7X$CaLTM;tqA`piIq{JJBk#nCl9P29tw0Rv$tQROCQo9t0CB`8 zKVo!)DHWgW!ej>FOs;3rXXKr{p2?6MWO6kF@8p*(s!%yW=3b!Od}dpFkX$W;H3Qgo zAX}e73kX3x1t6^eXX%4kp$yIpJ`9cw!9b|Npb0cnn&mjM`Qk8h3K&Wmk{EIrG8vK? ztbpoNSv8?{2eUdtSu2T7zj5jTWmUOc!7kS%=XI#E_nRf=6KTBt{DmM||=l zMmLyJ@yRYsW)RNgdM15FuF30}4B0^@S2J);e#xQ=l@ny{1;^-9 z1}z{2u@!){0-U7}W`#01Gx#t#G6Vym27@NhOlg+m$mWZ~%qd_fWk_PkVaQ}iX0QUP zQ)ShJ+8xa52xZM=wS}@4ve^RNBgv+S!mnkMN8#UR%N2x~&&dFF>Eu}UZlK@$I6 zGskiusmk$R!RG5oDH}T*qAk6%Czi z&n-XMhFb+{H@d7MkLqMO9xb>TP&WFC-DU@-&$I$2-6 diff --git a/SwordNGun/Source/SwordNGun/Public/Components/SNGState.h b/SwordNGun/Source/SwordNGun/Public/Components/SNGState.h index 33854f3ab2d64e7bd7d79fc221298e10615a2980..451130afabb4c62b2002ec622ed410aa00490c84 100644 GIT binary patch delta 902 zcmaJ6>@EQ;+)wvO8KIvPYWRZ&l0VxuM<32p37hkMBXE z6@5zF@m0?XPcaITcd{-F@nBFhN&#n5{14aR0&M!-7d!W_i5lO2K>dmyhpWJ{to9YS zLo{g)!h^0O6Q*n`&ZJovPr;0gZ3Y)atu#$bbc>cKQ%;DF!Xq8~gM85R%mUpy+6 AfB*mh delta 902 zcmaJlAiw~7!sxS9RFZ|2*b-Hz31>0rw#SPrYOFUL7<%W1^#lqD8VS_I8}@>DKm?xJ%nJ;dOS{ z+le~Rvsuh9jxjDW+yk_{8QkfUck8zw%Qa-Tl_;`R#XWCJDdPG=X$pmlB;d3EMxYIK zn(y&Z&GSssN`iN)PBngE(AFwGXHx7B7r_#2=5}w%_uXMB(E<7Vz6UQ zB6e!d3alX07t=M10%@S)C9o*gyG(Hu+!OBI;Ll`=p`^gS{9|w&GI`}y=m0xu;a$G2 zh7X0ZrDR|v36e^^stgGsl}S)yD5&Cr`jTzGe>b+* zNg!%bE6etJcjxraKePVzvu<^Z?a)Rxw6E5+Q_J{1wr_loti$*j_qJWxfOmu0OS@&I zZ#_GAdw($h#$Iv1X7mvq*Q{#yq0`Z2SH{ef$+e7zktN7q@Qm3rz-l*Gm-MNn*z7PL z+mf?8V!Y=x_nl;FFY#c>$t}D2s!ZDs?4*dPZu?kj+6~qfS!ONbxJ2i8fu3U|w?QPs z+syfp;N7{i*hRL-+<;p#X}uHZQ_P!KZP>1@+YzHL?t7QfHZv_ZbA(i8pO8TcAYcy^4P8gkkv6chB0 z+1+OTq3B~X?`|N zzkkT8x{1f*0&G;XG4C^;-bxj}G5S+_S$D4Y2&n6p2Bd&JxDx(%}%f}-8GgdD6Qnyqk`dHM%y7VXI zTr(c!yeE|GXu4I^RhY-H>#AG*doON?C9GKW50B3OLZS_Z9ax~M3b8l?$)TI~oh4;Q zLOyhISI;M9Wa#Ae=b_Vc%~hk1AY^sU<~;v-j1Qkss-FA0e-*36dhS07{#;W++|#E~ zsHMffP6E2`f-bFkSac$;IwU{upMfTIXH@hYqOFl<4w48S*h_;SPIB&U)md`x&k4l6GM7X$CaLTM;tqA?@y#EIe)?}&kD>B)SICSZZdQH%jFB|uq$$v2o3 zCVyj;f{0BPWol*QojjYVpB-dgH3RQtLuOS;u-QO<0YfQ65*`m&rrgU3e*WAQ-JzG`ot$+W08aEILj(IS%@_S z%;TI~&!#_l6)Qqc8fec;R%fugKsJN)da>0&^`2%+hRc|;`$I)L*<<0NZ`mDzCg^i` jN+Y`p-9K;HB`2@p0EQV*rTpYa95;ACs%sgn!M*?h_(Mj4 delta 363 zcmX>md`x&k4l5S}5Kb(VhB77^GjdIwC_eFy7>Jgh%*SW~7ML8x7ywfOlognKgGpiX zH%2Ll*knd|M=0zwc^ z0Z1#rS^8jBD1$SD4}&8^Fc4}mXfkk3W@PGQ2dSr4l6GM7X$CaLTM;tqA`piKJkGTBk#nC;**saH6V;6Mn8z`6AJyR|_$dqaZ-pSd_s@foSErT@!*kmAEpFs-Gnm(2J fu{cP50YfQ65r4l5S}5Kb(VhB77^!x-WdA80XhO`Iq`S&2~t!boEDgUC+a${5MWHJP7D zA4u9W<+6iJsb=7soXxDN4Pw_aScA+3LwyD6S92tCp*qy^4K?~9lRi+lAhR}HH!p`O)Z|=dWm$+hKvTiy)q-hE-I9}kuxLz{W6{H6 z%6v9kpbfiOG{JJ5Kv%qGu>^{!vYHcZx(27%uFk(LRLI+ReG{FcRd z@;?qKpvjV)*3g)Ng&{CJKp{I>ky#k(%0^B_PKbU^2A#=&IV2}5u(AO4p5# Liy%JCBoG?_w60sf delta 603 zcmeAX=@FTb!^*_~gcA!L6+sMTh608nhD3&RhFl=2z>v?7$B@jB3R1$rHF+YV_QZcS zj39>Te!sOqK+CaWKlQTO=aWznRA(N&kh|S61!r;i@3&idWt_(Urne|Mn zydarc25XSPK#_+``as=+%-V3>yd0`flXIDsWg+GOO$9hZE6UfqMCuCzYJ18_@VWN!PKCn%klkJ&gCr{%L0Y@JsbV`AdmI;nJ2p<}1li#u! zPyWXt1vFWb(;6BxurLIM2PkAGD>4g1UD?Q~$O+NU$)Gd&FNfr01y&ZI-jkfl3Ml5H I#|F?G0F$^{%m4rY diff --git a/SwordNGun/Source/SwordNGun/SwordNGun.Build.cs b/SwordNGun/Source/SwordNGun/SwordNGun.Build.cs index e3a3c9d..9456a44 100644 --- a/SwordNGun/Source/SwordNGun/SwordNGun.Build.cs +++ b/SwordNGun/Source/SwordNGun/SwordNGun.Build.cs @@ -1,23 +1,23 @@ -// Copyright Epic Games, Inc. All Rights Reserved. - -using UnrealBuildTool; - -public class SwordNGun : ModuleRules -{ - public SwordNGun(ReadOnlyTargetRules Target) : base(Target) - { - PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; - - PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore" }); - - PrivateDependencyModuleNames.AddRange(new string[] { }); - - // Uncomment if you are using Slate UI - // PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" }); - - // Uncomment if you are using online features - // PrivateDependencyModuleNames.Add("OnlineSubsystem"); - - // To include OnlineSubsystemSteam, add it to the plugins section in your uproject file with the Enabled attribute set to true - } -} +// Copyright Epic Games, Inc. All Rights Reserved. + +using UnrealBuildTool; + +public class SwordNGun : ModuleRules +{ + public SwordNGun(ReadOnlyTargetRules Target) : base(Target) + { + PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; + + PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore" }); + + PrivateDependencyModuleNames.AddRange(new string[] { }); + + // Uncomment if you are using Slate UI + // PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" }); + + // Uncomment if you are using online features + // PrivateDependencyModuleNames.Add("OnlineSubsystem"); + + // To include OnlineSubsystemSteam, add it to the plugins section in your uproject file with the Enabled attribute set to true + } +} diff --git a/SwordNGun/Source/SwordNGun/SwordNGun.cpp b/SwordNGun/Source/SwordNGun/SwordNGun.cpp index 6ed4500..591b027 100644 --- a/SwordNGun/Source/SwordNGun/SwordNGun.cpp +++ b/SwordNGun/Source/SwordNGun/SwordNGun.cpp @@ -1,6 +1,6 @@ -// Project Sword & Gun Copyright © 2021 Kevin Poretti - -#include "SwordNGun.h" -#include "Modules/ModuleManager.h" - -IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, SwordNGun, "SwordNGun" ); +// Project Sword & Gun Copyright © 2021 Kevin Poretti + +#include "SwordNGun.h" +#include "Modules/ModuleManager.h" + +IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, SwordNGun, "SwordNGun" ); diff --git a/SwordNGun/Source/SwordNGun/SwordNGun.h b/SwordNGun/Source/SwordNGun/SwordNGun.h index 87e8a6e..c4e9827 100644 --- a/SwordNGun/Source/SwordNGun/SwordNGun.h +++ b/SwordNGun/Source/SwordNGun/SwordNGun.h @@ -1,6 +1,6 @@ -// Project Sword & Gun Copyright © 2021 Kevin Poretti - -#pragma once - -#include "CoreMinimal.h" - +// Project Sword & Gun Copyright © 2021 Kevin Poretti + +#pragma once + +#include "CoreMinimal.h" + diff --git a/SwordNGun/Source/SwordNGunEditor.Target.cs b/SwordNGun/Source/SwordNGunEditor.Target.cs index c0bda71..64040be 100644 --- a/SwordNGun/Source/SwordNGunEditor.Target.cs +++ b/SwordNGun/Source/SwordNGunEditor.Target.cs @@ -1,14 +1,14 @@ -// Copyright Epic Games, Inc. All Rights Reserved. - -using UnrealBuildTool; -using System.Collections.Generic; - -public class SwordNGunEditorTarget : TargetRules -{ - public SwordNGunEditorTarget( TargetInfo Target) : base(Target) - { - Type = TargetType.Editor; - DefaultBuildSettings = BuildSettingsVersion.V2; - ExtraModuleNames.AddRange( new string[] { "SwordNGun" } ); - } -} +// Copyright Epic Games, Inc. All Rights Reserved. + +using UnrealBuildTool; +using System.Collections.Generic; + +public class SwordNGunEditorTarget : TargetRules +{ + public SwordNGunEditorTarget( TargetInfo Target) : base(Target) + { + Type = TargetType.Editor; + DefaultBuildSettings = BuildSettingsVersion.V2; + ExtraModuleNames.AddRange( new string[] { "SwordNGun" } ); + } +}