poret/SwordNGunUE4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'feature/Better_Movement' into develop

Browse Source 
# Conflicts:
#	SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp
#	SwordNGun/Source/SwordNGun/Private/Components/SNGCharacterMovementComponent.cpp
#	SwordNGun/Source/SwordNGun/Private/Controllers/SNGPlayerController.cpp
#	SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp
#	SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h
#	SwordNGun/Source/SwordNGun/Public/Characters/SNGEnemyBase.h
#	SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h
#	SwordNGun/Source/SwordNGun/Public/Components/SNGCharacterMovementComponent.h
#	SwordNGun/Source/SwordNGun/Public/Controllers/SNGPlayerController.h
#	SwordNGun/Source/SwordNGun/SNGTypes.h
This commit is contained in:
Kevin Poretti 2022-03-29 20:20:44 -04:00
commit ec0735ceca
569 changed files with 2620 additions and 1135 deletions
SwordNGun
Config
DefaultEditor.iniDefaultEngine.ini
Content/Characters
AnimNotifies
ANS_DoMeleeAttack.uassetAN_CanAttack.uassetAN_CanDodge.uassetAN_CanJump.uassetAN_CanMove.uassetAN_SetCollisionEnabled.uassetAN_SetGravityEnabled.uasset
Old
ANS_DoMeleeAttack.uassetAN_CanAttack.uassetAN_CanDodge.uassetAN_CanJump.uassetAN_SetCollisionEnabled.uassetAN_SetGravityEnabled.uasset
Enemies/TestEnemy
Animations
Locomotion
Enemy_Run_BS.uassetstanding_idle.uassetstanding_idle_looking_ver__1.uassetstanding_idle_looking_ver__2.uassetstanding_run_back.uassetstanding_run_forward.uassetstanding_turn_left_90.uassetstanding_turn_right_90.uassetstanding_walk_back.uassetstanding_walk_forward.uassetstanding_walk_left.uassetstanding_walk_right.uasset
Reactions
Air_Hurt.uassetDeath.uassetDeath_Montage.uassetDying_On_Ground.uassetFighter_Hitstun_air_loop.uassetFighter_Hitstun_air_start.uassetGetting_Up.uassetGetting_Up_Montage.uassetHead_Hit.uassetHead_Hit_Root.uassetHead_Hit_Root_Montage.uassetHit_React.uassetHit_React_Montage.uassetKnockdown.uassetKnockdown_Death.uassetKnockdown_Death_Montage.uassetLaunchReaction_End.uassetLaunchReaction_Loop.uassetLaunchReaction_Start.uassetstanding_react_large_from_left.uassetstanding_react_large_from_left_Montage.uassetstanding_react_large_from_right.uassetstanding_react_large_from_right_Montage.uassetstanding_react_large_gut.uassetstanding_react_large_gut_Montage.uasset
TestEnemy_AnimBP.uasset
BP_TestEnemy.uasset
Protagonist/Animations/Locomotion
Common
Air_Dash.uassetAir_Dash_Alt.uassetAir_Dash_Alt_Montage.uassetAir_Dash_Montage.uassetBS_Common_WalkRunStart.uassetBS_Common_WalkRunStop.uassetBS_Common_WalkRun_Loop.uassetFighter_Jump_B_Montage.uassetFighter_Jump_B_start.uassetFighter_Jump_F_Montage.uassetFighter_Jump_F_land.uassetFighter_Jump_F_loop.uassetFighter_Jump_F_start.uassetFighter_Jump_Montage.uassetFighter_Jump_land.uassetFighter_Jump_loop.uassetFighter_Jump_start.uassetHandGun_Common_Idle.uassetHandGun_Common_Jump_End.uassetHandGun_Common_Jump_Loop.uassetHandGun_Common_Jump_Start.uassetHandGun_Common_Jump_Start_Montage.uassetHandGun_Common_Run_End.uassetHandGun_Common_Run_Loop.uassetHandGun_Common_Run_Start.uassetHandGun_Common_Sprint.uassetHandGun_Common_Walk_End.uassetHandGun_Common_Walk_End1.uassetHandGun_Common_Walk_Loop.uassetHandGun_Common_Walk_Loop1.uassetHandGun_Common_Walk_Start.uassetHandGun_Common_Walk_Start1.uasset
Melee
Idle.uassetJog_Bwd.uassetJog_Bwd_Pivot180.uassetJog_Bwd_Start.uassetJog_Bwd_Stop.uassetJog_Fwd.uassetJog_Fwd_Start.uassetJog_Fwd_Stop.uassetJog_Left.uassetJog_Left_Pivot180.uassetJog_Left_Start.uassetJog_Left_Stop.uassetJog_Right.uassetJog_Right_Pivot180.uasset
Show More

1
SwordNGun/Config/DefaultEditor.ini
View File

@ -0,0 +1 @@

2
SwordNGun/Config/DefaultEngine.ini
View File

@ -12,7 +12,7 @@ AppliedDefaultGraphicsPerformance=Maximum
+ActiveClassRedirects=(OldClassName="TP_BlankGameModeBase",NewClassName="SwordNGunGameModeBase")
[/Script/EngineSettings.GameMapsSettings]
EditorStartupMap=/Game/Maps/Test.Test
EditorStartupMap=/Game/Maps/MovementTest.MovementTest
[/Script/Engine.PhysicsSettings]
PhysicErrorCorrection=(PingExtrapolation=0.100000,PingLimit=100.000000,ErrorPerLinearDifference=1.000000,ErrorPerAngularDifference=1.000000,MaxRestoredStateError=1.000000,MaxLinearHardSnapDistance=400.000000,PositionLerp=0.000000,AngleLerp=0.400000,LinearVelocityCoefficient=100.000000,AngularVelocityCoefficient=10.000000,ErrorAccumulationSeconds=0.500000,ErrorAccumulationDistanceSq=15.000000,ErrorAccumulationSimilarity=100.000000)

BIN
SwordNGun/Content/Characters/AnimNotifies/ANS_DoMeleeAttack.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/AnimNotifies/AN_CanAttack.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/AnimNotifies/AN_CanDodge.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/AnimNotifies/AN_CanJump.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/AnimNotifies/AN_CanMove.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/AnimNotifies/AN_SetCollisionEnabled.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/AnimNotifies/AN_SetGravityEnabled.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/AnimNotifies/Old/ANS_DoMeleeAttack.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/AnimNotifies/Old/AN_CanAttack.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/AnimNotifies/Old/AN_CanDodge.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/AnimNotifies/Old/AN_CanJump.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/AnimNotifies/Old/AN_SetCollisionEnabled.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/AnimNotifies/Old/AN_SetGravityEnabled.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Locomotion/Enemy_Run_BS.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Locomotion/standing_idle.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Locomotion/standing_idle_looking_ver__1.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Locomotion/standing_idle_looking_ver__2.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Locomotion/standing_run_back.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Locomotion/standing_run_forward.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Locomotion/standing_turn_left_90.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Locomotion/standing_turn_right_90.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Locomotion/standing_walk_back.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Locomotion/standing_walk_forward.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Locomotion/standing_walk_left.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Locomotion/standing_walk_right.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Air_Hurt.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Death.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Death_Montage.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Dying_On_Ground.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Fighter_Hitstun_air_loop.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Fighter_Hitstun_air_start.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Getting_Up.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Getting_Up_Montage.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Head_Hit.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Head_Hit_Root.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Head_Hit_Root_Montage.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Hit_React.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Hit_React_Montage.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Knockdown.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Knockdown_Death.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Knockdown_Death_Montage.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/LaunchReaction_End.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/LaunchReaction_Loop.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/LaunchReaction_Start.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/standing_react_large_from_left.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/standing_react_large_from_left_Montage.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/standing_react_large_from_right.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/standing_react_large_from_right_Montage.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/standing_react_large_gut.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/standing_react_large_gut_Montage.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/TestEnemy_AnimBP.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Enemies/TestEnemy/BP_TestEnemy.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Air_Dash.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Air_Dash_Alt.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Air_Dash_Alt_Montage.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Air_Dash_Montage.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/BS_Common_WalkRunStart.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/BS_Common_WalkRunStop.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/BS_Common_WalkRun_Loop.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Fighter_Jump_B_Montage.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Fighter_Jump_B_start.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Fighter_Jump_F_Montage.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Fighter_Jump_F_land.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Fighter_Jump_F_loop.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Fighter_Jump_F_start.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Fighter_Jump_Montage.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Fighter_Jump_land.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Fighter_Jump_loop.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/Fighter_Jump_start.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/HandGun_Common_Idle.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/HandGun_Common_Jump_End.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/HandGun_Common_Jump_Loop.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/HandGun_Common_Jump_Start.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/HandGun_Common_Jump_Start_Montage.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/HandGun_Common_Run_End.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/HandGun_Common_Run_Loop.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/HandGun_Common_Run_Start.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/HandGun_Common_Sprint.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/HandGun_Common_Walk_End.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/HandGun_Common_Walk_End1.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/HandGun_Common_Walk_Loop.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/HandGun_Common_Walk_Loop1.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/HandGun_Common_Walk_Start.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Common/HandGun_Common_Walk_Start1.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Melee/Idle.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Melee/Jog_Bwd.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Melee/Jog_Bwd_Pivot180.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Melee/Jog_Bwd_Start.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Melee/Jog_Bwd_Stop.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Melee/Jog_Fwd.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Melee/Jog_Fwd_Start.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Melee/Jog_Fwd_Stop.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Melee/Jog_Left.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Melee/Jog_Left_Pivot180.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Melee/Jog_Left_Start.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Melee/Jog_Left_Stop.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Melee/Jog_Right.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Melee/Jog_Right_Pivot180.uasset (Stored with Git LFS)
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More