diff --git a/Content/PolygonMilitary/Animation/ABP_Unarmed.uasset b/Content/PolygonMilitary/Animation/ABP_Unarmed.uasset deleted file mode 100644 index f671c40..0000000 Binary files a/Content/PolygonMilitary/Animation/ABP_Unarmed.uasset and /dev/null differ diff --git a/Content/PolygonMilitary/Animation/MM_Idle.uasset b/Content/PolygonMilitary/Animation/MM_Idle.uasset deleted file mode 100644 index 0f10045..0000000 Binary files a/Content/PolygonMilitary/Animation/MM_Idle.uasset and /dev/null differ diff --git a/Content/PolygonMilitary/M_PolygonMilitary_01_A.uasset b/Content/PolygonMilitary/M_PolygonMilitary_01_A.uasset deleted file mode 100644 index e0dbf33..0000000 Binary files a/Content/PolygonMilitary/M_PolygonMilitary_01_A.uasset and /dev/null differ diff --git a/Content/PolygonMilitary/SKEL_Chr_Soldier_Male_01.uasset b/Content/PolygonMilitary/SKEL_Chr_Soldier_Male_01.uasset deleted file mode 100644 index 93eae1c..0000000 Binary files a/Content/PolygonMilitary/SKEL_Chr_Soldier_Male_01.uasset and /dev/null differ diff --git a/Content/PolygonMilitary/SK_Chr_Soldier_Male_01.uasset b/Content/PolygonMilitary/SK_Chr_Soldier_Male_01.uasset deleted file mode 100644 index dc6bb50..0000000 Binary files a/Content/PolygonMilitary/SK_Chr_Soldier_Male_01.uasset and /dev/null differ diff --git a/Content/TEST/MyCharacter_BP.uasset b/Content/TEST/MyCharacter_BP.uasset deleted file mode 100644 index 090967b..0000000 Binary files a/Content/TEST/MyCharacter_BP.uasset and /dev/null differ diff --git a/Content/TEST/MyGameModeBase_BP.uasset b/Content/TEST/MyGameModeBase_BP.uasset deleted file mode 100644 index 6c1a541..0000000 Binary files a/Content/TEST/MyGameModeBase_BP.uasset and /dev/null differ diff --git a/Content/TEST/MyPlayerController_BP.uasset b/Content/TEST/MyPlayerController_BP.uasset deleted file mode 100644 index be50265..0000000 Binary files a/Content/TEST/MyPlayerController_BP.uasset and /dev/null differ diff --git a/Content/UI_Menus/SettingsMenu/BP_SettingsMenu.uasset b/Content/UI_Menus/SettingsMenu/BP_SettingsMenu.uasset index 8c48bea..7d2b76a 100644 Binary files a/Content/UI_Menus/SettingsMenu/BP_SettingsMenu.uasset and b/Content/UI_Menus/SettingsMenu/BP_SettingsMenu.uasset differ diff --git a/Content/UI_Menus/TEMP/IA_Crouch.uasset b/Content/UI_Menus/TEMP/IA_Crouch.uasset deleted file mode 100644 index 3312fc8..0000000 Binary files a/Content/UI_Menus/TEMP/IA_Crouch.uasset and /dev/null differ diff --git a/Content/UI_Menus/TEMP/IA_Jump.uasset b/Content/UI_Menus/TEMP/IA_Jump.uasset deleted file mode 100644 index 37d1778..0000000 Binary files a/Content/UI_Menus/TEMP/IA_Jump.uasset and /dev/null differ diff --git a/Content/UI_Menus/TEMP/IA_Look.uasset b/Content/UI_Menus/TEMP/IA_Look.uasset deleted file mode 100644 index d87d291..0000000 Binary files a/Content/UI_Menus/TEMP/IA_Look.uasset and /dev/null differ diff --git a/Content/UI_Menus/TEMP/IA_MouseLook.uasset b/Content/UI_Menus/TEMP/IA_MouseLook.uasset deleted file mode 100644 index cc9d3ee..0000000 Binary files a/Content/UI_Menus/TEMP/IA_MouseLook.uasset and /dev/null differ diff --git a/Content/UI_Menus/TEMP/IA_Move.uasset b/Content/UI_Menus/TEMP/IA_Move.uasset deleted file mode 100644 index 892d571..0000000 Binary files a/Content/UI_Menus/TEMP/IA_Move.uasset and /dev/null differ diff --git a/Content/UI_Menus/TEMP/IA_PauseGame.uasset b/Content/UI_Menus/TEMP/IA_PauseGame.uasset deleted file mode 100644 index 59a63be..0000000 Binary files a/Content/UI_Menus/TEMP/IA_PauseGame.uasset and /dev/null differ diff --git a/Content/UI_Menus/TEMP/IMC_Default.uasset b/Content/UI_Menus/TEMP/IMC_Default.uasset deleted file mode 100644 index acd8b6d..0000000 Binary files a/Content/UI_Menus/TEMP/IMC_Default.uasset and /dev/null differ diff --git a/Source/OpenConflict/Private/MyGameModeBase.cpp b/Source/OpenConflict/Private/MyGameModeBase.cpp deleted file mode 100644 index c474641..0000000 --- a/Source/OpenConflict/Private/MyGameModeBase.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - - -#include "MyGameModeBase.h" - diff --git a/Source/OpenConflict/Private/MyPlayerCharacter/MyCharacter.cpp b/Source/OpenConflict/Private/MyPlayerCharacter/MyCharacter.cpp deleted file mode 100644 index f467a78..0000000 --- a/Source/OpenConflict/Private/MyPlayerCharacter/MyCharacter.cpp +++ /dev/null @@ -1,23 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - - -#include "MyPlayerCharacter/MyCharacter.h" - -// Sets default values -AMyCharacter::AMyCharacter() -{ - // Set this character to call Tick() every frame. You can turn this off to improve performance if you don't need it. - PrimaryActorTick.bCanEverTick = true; - - CameraComponent = CreateDefaultSubobject(TEXT("CameraComponent")); - CameraComponent->SetupAttachment(RootComponent); - CameraComponent->SetRelativeLocation(FVector(0.0f, 0.0f, 50.0f)); - CameraComponent->bUsePawnControlRotation = true; -} - -// Called when the game starts or when spawned -void AMyCharacter::BeginPlay() -{ - Super::BeginPlay(); - -} diff --git a/Source/OpenConflict/Private/MyPlayerCharacter/MyPlayerController.cpp b/Source/OpenConflict/Private/MyPlayerCharacter/MyPlayerController.cpp deleted file mode 100644 index 606d078..0000000 --- a/Source/OpenConflict/Private/MyPlayerCharacter/MyPlayerController.cpp +++ /dev/null @@ -1,90 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - - -#include "MyPlayerCharacter/MyPlayerController.h" -#include "EnhancedInputComponent.h" -#include "EnhancedInputSubsystems.h" -#include "Components/SplineMeshComponent.h" - -AMyPlayerController::AMyPlayerController() -{ -} - -void AMyPlayerController::BeginPlay() -{ - Super::BeginPlay(); - PlayerCharacter = Cast(GetCharacter()); - - if (AMyPlayerController* PC = Cast(this)) - { - if (UEnhancedInputLocalPlayerSubsystem* Subsystem = ULocalPlayer::GetSubsystem(PC->GetLocalPlayer())) - { - if(PlayerInputContext) - { - Subsystem->AddMappingContext(PlayerInputContext, 0); - } - } - } -} - -void AMyPlayerController::SetupInputComponent() -{ - Super::SetupInputComponent(); - if (AMyPlayerController* PC = Cast(this)) - { - if (UEnhancedInputComponent* Subsystem = Cast(InputComponent)) - { - if (MoveAction) - { - Subsystem->BindAction(MoveAction, ETriggerEvent::Triggered, this, &AMyPlayerController::Move); - } - if (JumpAction) - { - Subsystem->BindAction(JumpAction, ETriggerEvent::Started, this, &AMyPlayerController::Jump); - } - if (LookAction) - { - Subsystem->BindAction(LookAction, ETriggerEvent::Triggered, this, &AMyPlayerController::Look); - } - } - } -} - -void AMyPlayerController::Move(const FInputActionValue& Value) -{ - FVector2D MovementVector = Value.Get(); - - if (APawn* ControlledPawn = GetPawn()) - { - FRotator CameraRotation = GetControlRotation(); - FRotator YawRotation(0.f, CameraRotation.Yaw, 0.f); - - FVector ForwardDiection = FRotationMatrix(YawRotation).GetUnitAxis(EAxis::X); - FVector RightDirection = FRotationMatrix(YawRotation).GetUnitAxis(EAxis::Y); - - ControlledPawn->AddMovementInput(ForwardDiection, MovementVector.Y); - ControlledPawn->AddMovementInput(RightDirection,MovementVector.X); - - } -} - -void AMyPlayerController::Look(const FInputActionValue& Value) -{ - FVector2D LookAxisVector = Value.Get(); - - if (APawn* ControlledPawn = GetPawn()) - { - AddYawInput(LookAxisVector.X); - AddPitchInput(LookAxisVector.Y); - } -} - -void AMyPlayerController::Jump(const FInputActionValue& Value) -{ - if(PlayerCharacter) - { - PlayerCharacter->Jump(); - } - -} - diff --git a/Source/OpenConflict/Public/MyGameModeBase.h b/Source/OpenConflict/Public/MyGameModeBase.h deleted file mode 100644 index e522ec5..0000000 --- a/Source/OpenConflict/Public/MyGameModeBase.h +++ /dev/null @@ -1,17 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#pragma once - -#include "CoreMinimal.h" -#include "GameFramework/GameModeBase.h" -#include "MyGameModeBase.generated.h" - -/** - * - */ -UCLASS() -class OPENCONFLICT_API AMyGameModeBase : public AGameModeBase -{ - GENERATED_BODY() - -}; diff --git a/Source/OpenConflict/Public/MyPlayerCharacter/MyCharacter.h b/Source/OpenConflict/Public/MyPlayerCharacter/MyCharacter.h deleted file mode 100644 index fef5a88..0000000 --- a/Source/OpenConflict/Public/MyPlayerCharacter/MyCharacter.h +++ /dev/null @@ -1,28 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#pragma once - -#include "Camera/CameraComponent.h" -#include "CoreMinimal.h" -#include "GameFramework/Character.h" -#include "MyCharacter.generated.h" - - -UCLASS() -class OPENCONFLICT_API AMyCharacter : public ACharacter -{ - GENERATED_BODY() - -public: - // Sets default values for this character's properties - AMyCharacter(); - -protected: - // Called when the game starts or when spawned - virtual void BeginPlay() override; - -public: - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Camera") - UCameraComponent* CameraComponent; - -}; diff --git a/Source/OpenConflict/Public/MyPlayerCharacter/MyPlayerController.h b/Source/OpenConflict/Public/MyPlayerCharacter/MyPlayerController.h deleted file mode 100644 index b75b6b6..0000000 --- a/Source/OpenConflict/Public/MyPlayerCharacter/MyPlayerController.h +++ /dev/null @@ -1,51 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#pragma once - -#include "EnhancedInputComponent.h" -#include "EnhancedInputSubsystems.h" -#include "MyCharacter.h" -#include "CoreMinimal.h" -#include "GameFramework/PlayerController.h" -#include "MyPlayerController.generated.h" - - -/** - * - */ -UCLASS() -class OPENCONFLICT_API AMyPlayerController : public APlayerController -{ - GENERATED_BODY() -public: - AMyPlayerController(); - -protected: - virtual void BeginPlay() override; - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Input") - UInputMappingContext* PlayerInputContext; - - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Input") - UInputAction* MoveAction; - - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Input") - UInputAction* LookAction; - - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Input") - UInputAction* JumpAction; - -public: - virtual void SetupInputComponent() override; - - UPROPERTY() - AMyCharacter* PlayerCharacter; - -private: - void Move(const FInputActionValue& Value); - void Look(const FInputActionValue& Value); - void Jump(const FInputActionValue& Value); - - - - -};