diff --git a/Content/Characters/Mannequins/Anims/Unarmed/ABP_Unarmed.uasset b/Content/Characters/Mannequins/Anims/Unarmed/ABP_Unarmed.uasset index 0ac838a..252b76f 100644 Binary files a/Content/Characters/Mannequins/Anims/Unarmed/ABP_Unarmed.uasset and b/Content/Characters/Mannequins/Anims/Unarmed/ABP_Unarmed.uasset differ diff --git a/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset b/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset index 60f16f0..c01857c 100644 Binary files a/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset and b/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset differ diff --git a/Content/Input/Default_IMC.uasset b/Content/Input/Default_IMC.uasset index 24efefe..f7fe569 100644 Binary files a/Content/Input/Default_IMC.uasset and b/Content/Input/Default_IMC.uasset differ diff --git a/Content/Input/Lean_IA.uasset b/Content/Input/Lean_IA.uasset new file mode 100644 index 0000000..f856ff2 Binary files /dev/null and b/Content/Input/Lean_IA.uasset differ diff --git a/Content/MyDDICharacter.uasset b/Content/MyDDICharacter.uasset new file mode 100644 index 0000000..9e214e8 Binary files /dev/null and b/Content/MyDDICharacter.uasset differ diff --git a/Content/MyDDICharacter2.uasset b/Content/MyDDICharacter2.uasset new file mode 100644 index 0000000..343c3d6 Binary files /dev/null and b/Content/MyDDICharacter2.uasset differ diff --git a/Content/ProofOfConcept/DDIGamemode_BP.uasset b/Content/ProofOfConcept/DDIGamemode_BP.uasset index feb88e8..84204db 100644 Binary files a/Content/ProofOfConcept/DDIGamemode_BP.uasset and b/Content/ProofOfConcept/DDIGamemode_BP.uasset differ diff --git a/Source/OpenConflict/PlayerCharacter/DDICharacter.cpp b/Source/OpenConflict/PlayerCharacter/DDICharacter.cpp index 78ecd78..83babd7 100644 --- a/Source/OpenConflict/PlayerCharacter/DDICharacter.cpp +++ b/Source/OpenConflict/PlayerCharacter/DDICharacter.cpp @@ -2,6 +2,7 @@ #include "DDICharacter.h" +#include "GameFramework/SpringArmComponent.h" // Sets default values ADDICharacter::ADDICharacter() @@ -11,15 +12,8 @@ ADDICharacter::ADDICharacter() bReplicates = true; // bReplicateMovement = true; - CameraComponent = CreateDefaultSubobject(TEXT("CameraComponent")); - CameraComponent->SetupAttachment(GetMesh()); - CameraComponent->SetRelativeLocation(FVector(0.0f, 0.0f, 50.0f)); - CameraComponent->bUsePawnControlRotation = true; - /* Was going to add, but showed up as duplicate. - //CharacterMeshCompenent = CreateDefaultSubobject(TEXT("CharacterMeshComponent")); - // CharacterMeshCompenent->SetupAttachment(CameraComponent); - */ + } // Called when the game starts or when spawned diff --git a/Source/OpenConflict/PlayerCharacter/DDICharacter.h b/Source/OpenConflict/PlayerCharacter/DDICharacter.h index f9ce32f..5c8b66e 100644 --- a/Source/OpenConflict/PlayerCharacter/DDICharacter.h +++ b/Source/OpenConflict/PlayerCharacter/DDICharacter.h @@ -7,6 +7,7 @@ #include "GameFramework/Character.h" #include "DDICharacter.generated.h" + UCLASS() class OPENCONFLICT_API ADDICharacter : public ACharacter { @@ -25,11 +26,6 @@ public: virtual void Tick(float DeltaTime) override; UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Camera") - UCameraComponent* CameraComponent; - - /* Was going to add but showed up as duplicate - //UPROPERTY(VisibleDefaultsOnly, BlueprintReadOnly, Category = "Mesh") - //class USkeletalMeshComponent* CharacterMeshCompenent; - */ + UCameraComponent* CameraComponent };