Merge branch 'feature/Better_Movement' into develop

# 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

View File

@ -0,0 +1 @@

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)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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