baz/Nakatomi
baz/Nakatomi
1
0
Fork 0
Code Issues Pull Requests Activity

Compare commits

base: baz:63b3ec08191b5df08c7fc35a3f3d424513938308
Branches Tags
baz:master
..
compare: baz:b7f7c52e581680550124a34afbdefac4fa9df32b
Branches Tags
baz:master

No commits in common. "63b3ec08191b5df08c7fc35a3f3d424513938308" and "b7f7c52e581680550124a34afbdefac4fa9df32b" have entirely different histories.
63b3ec0819 ... b7f7c52e58

15 changed files with 15 additions and 41 deletions
Show Stats Expand all files Collapse all files

6
Config/DefaultEngine.ini
View File

@ -87,7 +87,7 @@ r.RayTracing.UseTextureLod=False
r.PathTracing=True r.PathTracing=True
r.GenerateMeshDistanceFields=True r.GenerateMeshDistanceFields=True
r.DistanceFields.DefaultVoxelDensity=0.200000 r.DistanceFields.DefaultVoxelDensity=0.200000
r.Nanite.ProjectEnabled=true r.Nanite.ProjectEnabled=False
r.AllowStaticLighting=True r.AllowStaticLighting=True
r.NormalMapsForStaticLighting=True r.NormalMapsForStaticLighting=True
r.ForwardShading=False r.ForwardShading=False
@ -180,9 +180,7 @@ bStreamSkeletalMeshLODs=(Default=False,PerPlatform=())
bDiscardSkeletalMeshOptionalLODs=(Default=False,PerPlatform=()) bDiscardSkeletalMeshOptionalLODs=(Default=False,PerPlatform=())
VisualizeCalibrationColorMaterialPath=/Engine/EngineMaterials/PPM_DefaultCalibrationColor.PPM_DefaultCalibrationColor VisualizeCalibrationColorMaterialPath=/Engine/EngineMaterials/PPM_DefaultCalibrationColor.PPM_DefaultCalibrationColor
VisualizeCalibrationCustomMaterialPath=None VisualizeCalibrationCustomMaterialPath=None
VisualizeCalibrationGrayscaleMaterialPath=/Engine/EngineMaterials/PPM_DefaultCalibrationGrayscale.PPM_DefaultCalibrationGrayscaler VisualizeCalibrationGrayscaleMaterialPath=/Engine/EngineMaterials/PPM_DefaultCalibrationGrayscale.PPM_DefaultCalibrationGrayscale
r.Nanite.AllowTessellation=1
r.Nanite.Tessellation=1
[/Script/WorldPartitionEditor.WorldPartitionEditorSettings] [/Script/WorldPartitionEditor.WorldPartitionEditorSettings]
CommandletClass=Class'/Script/UnrealEd.WorldPartitionConvertCommandlet' CommandletClass=Class'/Script/UnrealEd.WorldPartitionConvertCommandlet'

BIN
Content/Assets/Base_Materials/Chipboard/Chipboard004_1K-JPG_Color.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Base_Materials/Chipboard/Chipboard004_1K-JPG_Displacement.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Base_Materials/Chipboard/Chipboard004_1K-JPG_NormalDX.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Base_Materials/Chipboard/Chipboard004_1K-JPG_Roughness.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Base_Materials/Chipboard/M_Chipboard.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/StorageRack/BP_StorageRack.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/StorageRack/BP_StorageRack2.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/StorageRack/BP_StorageRackBig.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/StorageRack/BP_StorageRackEnd.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/StorageRack/BP_StorageRackSingular.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/StorageRack/BP_StorageRackSquare.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/StorageRack/DestructableBox.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/StorageRack/SM_StorageCube.uasset (Stored with Git LFS)
View File

Binary file not shown.

5
Source/Nakatomi/LevelEndTriggerVolume.cpp
View File

@ -35,10 +35,7 @@ void ALevelEndTriggerVolume::OnOverlapBegin(UPrimitiveComponent* OverlappedCompo
{ {
GetCollisionComponent()->OnComponentBeginOverlap.Clear(); GetCollisionComponent()->OnComponentBeginOverlap.Clear();
if (!NextLevel.IsNull()) gameInstance->GetCurrentLevelManager()->LoadNextLevel(NextLevel);
{
UGameplayStatics::OpenLevelBySoftObjectPtr(GetWorld(), NextLevel);
}
this->Destroy(); this->Destroy();
} }