aszema/jumping-ship
3
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing merge errors

Browse Source
This commit is contained in:
Austin Szema 2023-11-10 23:23:09 -05:00
parent 5ebccf8700
commit 5799cecd53
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacterJoel.uasset (Stored with Git LFS)
View File

Binary file not shown.

2
Source/jumpingship/jumpingshipGameMode.cpp
View File

@ -7,7 +7,7 @@
AjumpingshipGameMode::AjumpingshipGameMode() AjumpingshipGameMode::AjumpingshipGameMode()
{ {
// set default pawn class to our Blueprinted character // 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) if (PlayerPawnBPClass.Class != NULL)
{ {
DefaultPawnClass = PlayerPawnBPClass.Class; DefaultPawnClass = PlayerPawnBPClass.Class;