Compare commits

..

No commits in common. "main" and "testingPush" have entirely different histories.

453 changed files with 297 additions and 1196 deletions

View File

@ -1,6 +1,6 @@
[/Script/EngineSettings.GameMapsSettings] [/Script/EngineSettings.GameMapsSettings]
GameDefaultMap=/Game/Maps/MainMenu.MainMenu GameDefaultMap=/Game/ThirdPerson/Maps/ThirdPersonMap.ThirdPersonMap
EditorStartupMap=/Game/Maps/MainMenu.MainMenu EditorStartupMap=/Game/ThirdPerson/Maps/ThirdPersonMap.ThirdPersonMap
GlobalDefaultGameMode="/Script/jumpingship.jumpingshipGameMode" GlobalDefaultGameMode="/Script/jumpingship.jumpingshipGameMode"
[/Script/Engine.RendererSettings] [/Script/Engine.RendererSettings]
@ -72,9 +72,3 @@ ConnectionType=USBOnly
bUseManualIPAddress=False bUseManualIPAddress=False
ManualIPAddress= ManualIPAddress=
[/Script/NavigationSystem.RecastNavMesh]
RuntimeGeneration=Dynamic
[/Script/NavigationSystem.NavigationSystemV1]
bGenerateNavigationOnlyAroundNavigationInvokers=False

View File

@ -1,95 +1,3 @@
[/Script/EngineSettings.GeneralProjectSettings] [/Script/EngineSettings.GeneralProjectSettings]
ProjectID=1B0A2EEA4384D9CFD2144284C94AD3D9 ProjectID=1B0A2EEA4384D9CFD2144284C94AD3D9
ProjectName=Third Person Game Template ProjectName=Third Person Game Template
[/Script/UnrealEd.ProjectPackagingSettings]
Build=IfProjectHasCode
BuildConfiguration=PPBC_Development
BuildTarget=
FullRebuild=False
ForDistribution=False
IncludeDebugFiles=False
BlueprintNativizationMethod=Disabled
bIncludeNativizedAssetsInProjectGeneration=False
bExcludeMonolithicEngineHeadersInNativizedCode=False
UsePakFile=True
bUseIoStore=True
bUseZenStore=False
bMakeBinaryConfig=False
bGenerateChunks=False
bGenerateNoChunks=False
bChunkHardReferencesOnly=False
bForceOneChunkPerFile=False
MaxChunkSize=0
bBuildHttpChunkInstallData=False
HttpChunkInstallDataDirectory=(Path="")
WriteBackMetadataToAssetRegistry=Disabled
bCompressed=True
PackageCompressionFormat=Oodle
bForceUseProjectCompressionFormatIgnoreHardwareOverride=False
PackageAdditionalCompressionOptions=
PackageCompressionMethod=Kraken
PackageCompressionLevel_DebugDevelopment=4
PackageCompressionLevel_TestShipping=5
PackageCompressionLevel_Distribution=7
PackageCompressionMinBytesSaved=1024
PackageCompressionMinPercentSaved=5
bPackageCompressionEnableDDC=False
PackageCompressionMinSizeToConsiderDDC=0
HttpChunkInstallDataVersion=
IncludePrerequisites=True
IncludeAppLocalPrerequisites=False
bShareMaterialShaderCode=True
bDeterministicShaderCodeOrder=False
bSharedMaterialNativeLibraries=True
ApplocalPrerequisitesDirectory=(Path="")
IncludeCrashReporter=False
InternationalizationPreset=English
-CulturesToStage=en
+CulturesToStage=en
LocalizationTargetCatchAllChunkId=0
bCookAll=True
bCookMapsOnly=False
bSkipEditorContent=False
bSkipMovies=False
-IniKeyDenylist=KeyStorePassword
-IniKeyDenylist=KeyPassword
-IniKeyDenylist=rsa.privateexp
-IniKeyDenylist=rsa.modulus
-IniKeyDenylist=rsa.publicexp
-IniKeyDenylist=aes.key
-IniKeyDenylist=SigningPublicExponent
-IniKeyDenylist=SigningModulus
-IniKeyDenylist=SigningPrivateExponent
-IniKeyDenylist=EncryptionKey
-IniKeyDenylist=DevCenterUsername
-IniKeyDenylist=DevCenterPassword
-IniKeyDenylist=IOSTeamID
-IniKeyDenylist=SigningCertificate
-IniKeyDenylist=MobileProvision
-IniKeyDenylist=IniKeyDenylist
-IniKeyDenylist=IniSectionDenylist
+IniKeyDenylist=KeyStorePassword
+IniKeyDenylist=KeyPassword
+IniKeyDenylist=rsa.privateexp
+IniKeyDenylist=rsa.modulus
+IniKeyDenylist=rsa.publicexp
+IniKeyDenylist=aes.key
+IniKeyDenylist=SigningPublicExponent
+IniKeyDenylist=SigningModulus
+IniKeyDenylist=SigningPrivateExponent
+IniKeyDenylist=EncryptionKey
+IniKeyDenylist=DevCenterUsername
+IniKeyDenylist=DevCenterPassword
+IniKeyDenylist=IOSTeamID
+IniKeyDenylist=SigningCertificate
+IniKeyDenylist=MobileProvision
+IniKeyDenylist=IniKeyDenylist
+IniKeyDenylist=IniSectionDenylist
-IniSectionDenylist=HordeStorageServers
-IniSectionDenylist=StorageServers
+IniSectionDenylist=HordeStorageServers
+IniSectionDenylist=StorageServers
+MapsToCook=(FilePath="/Game/Maps/AustinTestMap")
+MapsToCook=(FilePath="/Game/Maps/MainMenu")

BIN
Content/BP_Test.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/BabyDiaperMaterial.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/BabyEyeMaterial.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/BabyPantsMaterial.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/BabyPupilMaterial.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/BabyShirtMaterial.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/BabyShoesMaterial.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/BabySkinMaterial.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprints/BP_Iceberg.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprints/BP_Ragdoll.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprints/BP_RagdollBaby.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprints/BP_Rescue_Boat.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprints/BP_Water_Plane.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprints/Baby.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprints/Enemy2.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
Content/Blueprints/Passenger.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/EnemyBabyDiaperMaterial.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/EnemyBabyEyeMaterial.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/EnemyBabyHair_Baby_003.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/EnemyBabyHair_Baby_004.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/EnemyBabyPantsMaterial.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/EnemyBabyPupilMaterial.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/EnemyBabyShirtMaterial.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/EnemyBabyShoesMaterial.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/EnemyBabySkinMaterial.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Ferry_Boat_Base.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Ferry_Boat_Blueprint.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Ferry_Boat_Material.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Ferry_Deck_Material.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Ferry_Metal_Bar_material.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Ferry_Rim_Material.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Ferry_Trim_Material.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/IceMaterial.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Jumping_Ship_Blank_Button.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Jumping_Ship_Button_Button.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Jumping_Ship_Credits_Button.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Jumping_Ship_Main_Menu.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Jumping_Ship_Music.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Jumping_Ship_Quit_Button.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Jumping_Ship_Start_Button.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/M_Dust_SubUV.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/M_Outline.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/M_Outline_Inst.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/M_Wood_Oak1.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/MainMenu.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Maps/MainMenu.umap (Stored with Git LFS)

Binary file not shown.

BIN
Content/Material.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Material_008.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Materials/M_Rescue_Boat.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/BabyDiaperMaterial.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/BabyDiaperMaterial_001.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/BabyEyeMaterial.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/BabyEyeMaterial_001.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/BabyPupilMaterial.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/BabyPupilMaterial_001.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/BabySkinMaterial.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/BabySkinMaterial_001.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/Business Baby.fbx (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/Business_Baby.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/Ferry_Boat.fbx (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/Ferry_Boat.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/Ferry_Boat_Baby_001.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/Ferry_Boat_Material.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/Ferry_Deck_Material.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
Content/Mesh/Ferry_Rim_Material.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/Ferry_Trim_Material.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/Material_002.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/Material_003.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/Material_004.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/Material_005.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/Material_006.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/Material_008.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/Material_009.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/Puddle_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/Puddle_2.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/Puddle_3.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/Rescue_Boat.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
Content/Mesh/Rescue_Boat_Material.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Mesh/Rigged_Baby.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/Rigged_Baby_CtrlRig.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Mesh/Rigged_Baby_Physics.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
Content/Mesh/Rigged_Baby_Skeleton.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
Content/Mesh/T_Rescue_Boat.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/NewActorComponent.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More