Merge remote-tracking branch 'origin/main' into main

Config/DefaultGameplayTags.ini

@@ -0,0 +1,12 @@
+[/Script/GameplayTags.GameplayTagsSettings]
+ImportTagsFromConfig=True
+WarnOnInvalidTags=True
+ClearInvalidTags=False
+AllowEditorTagUnloading=True
+AllowGameTagUnloading=False
+FastReplication=False
+InvalidTagCharacters="\"\',"
+NumBitsForContainerSize=6
+NetIndexFirstBitSegment=16
++GameplayTagList=(Tag="Passenger",DevComment="")
+

Source/jumpingship/jumpingshipGameMode.cpp

@@ -7,7 +7,7 @@
 AjumpingshipGameMode::AjumpingshipGameMode()
 {
 	// set default pawn class to our Blueprinted character
-	static ConstructorHelpers::FClassFinder<APawn> PlayerPawnBPClass(TEXT("/Game/ThirdPerson/Blueprints/BP_ThirdPersonCharacter"));
+	static ConstructorHelpers::FClassFinder<APawn> PlayerPawnBPClass(TEXT("/Game/ThirdPerson/Blueprints/BP_ThirdPersonCharacterJoel"));
 	if (PlayerPawnBPClass.Class != NULL)
 	{
 		DefaultPawnClass = PlayerPawnBPClass.Class;

Source/jumpingship/jumpingshipObstacle.cpp

@@ -1,27 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "jumpingshipObstacle.h"
-
-// Sets default values
-AjumpingshipObstacle::AjumpingshipObstacle()
-{
- 	// Set this actor to call Tick() every frame.  You can turn this off to improve performance if you don't need it.
-	PrimaryActorTick.bCanEverTick = true;
-
-}
-
-// Called when the game starts or when spawned
-void AjumpingshipObstacle::BeginPlay()
-{
-	Super::BeginPlay();
-	
-}
-
-// Called every frame
-void AjumpingshipObstacle::Tick(float DeltaTime)
-{
-	Super::Tick(DeltaTime);
-
-}
-

Source/jumpingship/jumpingshipObstacle.h

@@ -1,26 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "GameFramework/Actor.h"
-#include "jumpingshipObstacle.generated.h"
-
-UCLASS()
-class JUMPINGSHIP_API AjumpingshipObstacle : public AActor
-{
-	GENERATED_BODY()
-	
-public:	
-	// Sets default values for this actor's properties
-	AjumpingshipObstacle();
-
-protected:
-	// Called when the game starts or when spawned
-	virtual void BeginPlay() override;
-
-public:	
-	// Called every frame
-	virtual void Tick(float DeltaTime) override;
-
-};