Auto stash before merge of "main" and "origin/main"

Merge branch 'main' of https://git.nugamestudioclub.com/aszema/jumping-ship
Fixing merge errors
2023-11-10 23:25:11 -05:00 · 2023-11-10 23:24:23 -05:00 · 2023-11-10 23:23:09 -05:00 · 2023-11-10 23:21:06 -05:00 · 2023-11-10 23:19:47 -05:00 · 2023-11-10 22:54:48 -05:00
17 changed files with 51 additions and 12 deletions
--- a/Config/DefaultGameplayTags.ini
+++ b/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="")
+
--- a/Content/Baby.uasset
+++ b/Content/Baby.uasset
--- a/Content/BabyDiaperMaterial.uasset
+++ b/Content/BabyDiaperMaterial.uasset
--- a/Content/BabyEyeMaterial.uasset
+++ b/Content/BabyEyeMaterial.uasset
--- a/Content/BabyPupilMaterial.uasset
+++ b/Content/BabyPupilMaterial.uasset
--- a/Content/BabySkinMaterial.uasset
+++ b/Content/BabySkinMaterial.uasset
--- a/Content/Blueprints/BP_Rescue_Boat.uasset
+++ b/Content/Blueprints/BP_Rescue_Boat.uasset
--- a/Content/Mesh/SM_Cruise_Ship.uasset
+++ b/Content/Mesh/SM_Cruise_Ship.uasset
--- a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacterJoel.uasset
+++ b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacterJoel.uasset
--- a/Content/ThirdPerson/Blueprints/WBP_Timer.uasset
+++ b/Content/ThirdPerson/Blueprints/WBP_Timer.uasset
--- a/Content/Unreal_Baby.uasset
+++ b/Content/Unreal_Baby.uasset
--- a/Content/ExternalActors/Maps/AustinTestMap/3/TV/L9NJA4W03DRWPH9BGBL67N.uasset
+++ b/Content/ExternalActors/Maps/AustinTestMap/3/TV/L9NJA4W03DRWPH9BGBL67N.uasset
--- a/Content/ExternalActors/Maps/AustinTestMap/5/3D/Z75B8FUO02492CJNK5HUTC.uasset
+++ b/Content/ExternalActors/Maps/AustinTestMap/5/3D/Z75B8FUO02492CJNK5HUTC.uasset
--- a/Content/ExternalActors/Maps/AustinTestMap/8/B3/Q9KYBVZNCQOZKGXKB0MPXD.uasset
+++ b/Content/ExternalActors/Maps/AustinTestMap/8/B3/Q9KYBVZNCQOZKGXKB0MPXD.uasset
--- a/Content/ExternalActors/Maps/AustinTestMap/9/4E/PNL9YXQ3TBVFK0ESW3SFQY.uasset
+++ b/Content/ExternalActors/Maps/AustinTestMap/9/4E/PNL9YXQ3TBVFK0ESW3SFQY.uasset
--- a/Content/ExternalActors/Maps/AustinTestMap/B/NW/WHFVPNVWATX9I8IKP7BMS4.uasset
+++ b/Content/ExternalActors/Maps/AustinTestMap/B/NW/WHFVPNVWATX9I8IKP7BMS4.uasset
--- a/Source/jumpingship/jumpingshipGameMode.cpp
+++ b/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;
Author	SHA1	Message	Date
Austin Szema	143f01ab92	Auto stash before merge of "main" and "origin/main"	2023-11-10 23:25:11 -05:00
Austin Szema	dddff015be	Merge branch 'main' of https://git.nugamestudioclub.com/aszema/jumping-ship	2023-11-10 23:24:23 -05:00
Austin Szema	5799cecd53	Fixing merge errors	2023-11-10 23:23:09 -05:00
Austin Szema	82a5093509	Merge remote-tracking branch 'origin/main' into main	2023-11-10 23:21:06 -05:00
Austin Szema	cea63354f1	Added the grabbing and throwing functionality	2023-11-10 23:19:47 -05:00
Austin Szema	5ebccf8700	Added baby model and Passenger tag to track when a passenger is saved	2023-11-10 22:54:48 -05:00