baz/Nakatomi
baz
/
Nakatomi
1
0
Fork 0
Code Issues Pull Requests Activity

Merge movement-component #1

Merged
baz merged 20 commits from movement-component into master 2024-01-18 18:30:17 +01:00
Conversation 0 Commits 20 Files Changed 14 +11 -18
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c8d1c9c6e9 - Show all commits

9
Source/Nakatomi/PlayerCharacter.cpp
View File

@ -7,14 +7,15 @@
#include <Components/CapsuleComponent.h> #include <Components/CapsuleComponent.h>
#include <Kismet/GameplayStatics.h> #include <Kismet/GameplayStatics.h>
#include "InputTriggers.h" #include "EnemyCharacter.h"
#include "EnhancedInputComponent.h" #include "EnhancedInputComponent.h"
#include "EnhancedInputSubsystems.h" #include "EnhancedInputSubsystems.h"
#include "GameFramework/CharacterMovementComponent.h"
#include "InputMappingContext.h" #include "InputMappingContext.h"
#include "EnemyCharacter.h" #include "InputTriggers.h"
#include "InteractableComponent.h"
#include "NakatomiCMC.h"
#include "WeaponThrowable.h" #include "WeaponThrowable.h"
#include "GameFramework/CharacterMovementComponent.h"
#define COLLISION_WEAPON ECC_GameTraceChannel1 #define COLLISION_WEAPON ECC_GameTraceChannel1

18
Source/Nakatomi/PlayerCharacter.h
View File

@ -2,20 +2,15 @@
#pragma once #pragma once
#include "Camera/CameraComponent.h"
#include "CoreMinimal.h" #include "CoreMinimal.h"
#include "GameFramework/SpringArmComponent.h"
#include "InputActionValue.h"
#include "EnhancedInputComponent.h" #include "EnhancedInputComponent.h"
#include "NakatomiCharacter.h" #include "NakatomiCharacter.h"
#include "Weapon.h"
#include "Engine/EngineTypes.h"
#include "Engine/DamageEvents.h"
#include "Blueprint/UserWidget.h"
#include "Perception/AIPerceptionStimuliSourceComponent.h"
#include "InteractableComponent.h"
#include "NakatomiCMC.h"
#include "Throwable.h" #include "Throwable.h"
#include "Blueprint/UserWidget.h"
#include "Camera/CameraComponent.h"
#include "Engine/EngineTypes.h"
#include "GameFramework/SpringArmComponent.h"
#include "Perception/AIPerceptionStimuliSourceComponent.h"
#include "PlayerCharacter.generated.h" #include "PlayerCharacter.generated.h"
class UInputAction; class UInputAction;
@ -102,9 +97,6 @@ protected:
float DefaultAimSensitivity = 45.0f; float DefaultAimSensitivity = 45.0f;
private: private:
// UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Meta = (AllowPrivateAccess = "true"))
// UNakatomiCMC* NakatomiCMC;
UPROPERTY(EditAnywhere, BlueprintReadWrite, Meta = (AllowPrivateAccess = "true")) UPROPERTY(EditAnywhere, BlueprintReadWrite, Meta = (AllowPrivateAccess = "true"))
USpringArmComponent* CameraSpringArmComponent = nullptr; USpringArmComponent* CameraSpringArmComponent = nullptr;