Compare commits

base: Tuwi:fdfbd878ad6beb1b5a48a45f1507af833ac6375c

Branches Tags

Tuwi:master

...

compare: Tuwi:b7706a57cf0fdcdc4268256172c3ce65ca2c3a57

Branches Tags

Tuwi:master

2 Commits

fdfbd878ad ... b7706a57cf

Author	SHA1	Message	Date
JyrgensonRasmus	b7706a57cf	Merge branch 'master' of https://cgvrgit.ulno.net/Tuwi/BlockCraft ... # Conflicts: # Content/StarterContent/Maps/Minimal_Default_BuiltData.uasset # Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset # Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/7E/BEYC27T14FHBU6LF2F60RR.uasset # Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/8/3J/6B9RJI3FDPCETRKXUXCQ4C.uasset # Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/E/8O/GK06JAEJ82TQ0GA2QB0DJG.uasset	2023-04-29 15:51:15 +03:00
JyrgensonRasmus	da87922117	558	2023-04-29 15:50:20 +03:00

276 changed files with 548 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Expand all files Collapse all files

BIN

Content/Furniture/Door_Frame.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Furniture/door.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Furniture/door_Door.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Furniture/door_Door_Frame.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Furniture/doorbb.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Levels/EliseLevel.umap (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/MSPresets/MSTextures/Black.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/MSTextures/BlackPlaceholder.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/MSTextures/FlatNormal.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/MSTextures/Placeholder.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/MSTextures/Placeholder_Normal.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/MSTextures/White.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/MSTextures/WhitePlaceholder.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/MSVTTextures/BlackPlaceholder.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/MSVTTextures/DefaultDiffuse.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/MSVTTextures/Placeholder_Normal.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/MSVTTextures/WhitePlaceholder.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Billboard_Material/M_MS_Billboard_Material.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Decal_Material/MF_QuixelDecalPOM.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Decal_Material/M_MS_Decal_Material.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Decal_Material_VT/MF_QuixelDecalPOM.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Decal_Material_VT/M_MS_Decal_Material_VT.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Fuzz_Material/Functions/MF_Fuzz.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Fuzz_Material/Functions/MF_Tiling.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Fuzz_Material/M_MS_Default_Fuzz_Material.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Fuzz_Material_VT/Functions/MF_Fuzz.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Fuzz_Material_VT/Functions/MF_Tiling.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Fuzz_Material_VT/M_MS_Default_Fuzz_Material_VT.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Material/Functions/MF_DetailNormalTiling.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Material/Functions/MF_Displacement.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Material/Functions/MF_Fuzz.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Material/Functions/MF_MapAdjustments.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Material/Functions/MF_ObjAdjustments.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Material/Functions/MF_Tiling.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Material/Functions/MF_Transmission.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Material_VT/Functions/MF_DetailNormalTiling.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Material_VT/Functions/MF_Displacement.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Material_VT/Functions/MF_Fuzz.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Material_VT/Functions/MF_MapAdjustments.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Material_VT/Functions/MF_ObjAdjustments.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Material_VT/Functions/MF_Tiling.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Material_VT/Functions/MF_Transmission.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Material_VT/M_MS_Default_Material_VT.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Transmission_Material/Functions/MF_SSSObjAdjustments.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Transmission_Material/M_MS_Default_Transmission_Material.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Transmission_Material_VT/Functions/MF_SSSObjAdjustments.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Default_Transmission_Material_VT/M_MS_Default_Transmission_Material_VT.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Foliage_Material/Functions/MF_Translucency.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Foliage_Material/MF_Translucency.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Foliage_Material/M_MS_Foliage_Material.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Glass_Material/Functions/MF_FrameBlend.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Glass_Material/Functions/MF_FrameTextures.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Glass_Material/Functions/MF_Imperfection.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Glass_Material/Functions/MF_Refraction.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Glass_Material/Functions/MF_TranslucencyEmission.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Glass_Material/Functions/MF_TranslucencyMetallic.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Glass_Material/Functions/MF_WindowImperfection.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Glass_Material/Functions/MF_WindowNormalStrength.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Glass_Material/MI_MS_Glass_Material_Inst.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Glass_Material/M_MS_Glass_Material.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Glass_Material/Textures/Black.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Glass_Material/Textures/FlatNormal.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Glass_Material/Textures/White.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_ImperfectionDecal_Material/M_MS_ImperfectionDecal_Material.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_ImperfectionDecal_Material_VT/M_MS_ImperfectionDecal_Material_VT.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Imperfection_Material/M_MS_Imperfection_Material.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Imperfection_Material/M_MS_Imperfection_Material_Var.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Imperfection_Material_VT/M_MS_Imperfection_Material_VT.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Imperfection_Material_VT/M_MS_Imperfection_Material_Var_VT.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Imperfection_Material_Var/M_MS_Imperfection_Material_Var.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_SurfaceBlend_Material/LayerFunctions/Base/MF_BaseLayerAdjustments.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_SurfaceBlend_Material/LayerFunctions/Base/MF_BaseLayerTessellation.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_SurfaceBlend_Material/LayerFunctions/Base/MF_BaseLayerTextures.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_SurfaceBlend_Material/LayerFunctions/MF_BlendScatter.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_SurfaceBlend_Material/LayerFunctions/MF_Displacement.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_SurfaceBlend_Material/LayerFunctions/MF_DisplacementBlend.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_SurfaceBlend_Material/LayerFunctions/MF_MaterialBlend.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_SurfaceBlend_Material/LayerFunctions/MF_NormalCorrection.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_SurfaceBlend_Material/LayerFunctions/MF_ScatterLayer.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_SurfaceBlend_Material/LayerFunctions/Middle/MF_MiddleLayerAdjustments.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_SurfaceBlend_Material/LayerFunctions/Middle/MF_MiddleLayerTessellation.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_SurfaceBlend_Material/LayerFunctions/Middle/MF_MiddleLayerTextures.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_SurfaceBlend_Material/LayerFunctions/Puddle/MF_PuddleLayer.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_SurfaceBlend_Material/LayerFunctions/Top/MF_TopLayerAdjustments.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_SurfaceBlend_Material/LayerFunctions/Top/MF_TopLayerTessellation.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_SurfaceBlend_Material/LayerFunctions/Top/MF_TopLayerTextures.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_SurfaceBlend_Material/M_MS_SurfaceBlend_Material.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Surface_Material/Functions/MF_Displacement.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Surface_Material/Functions/MF_MapAdjustments.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Surface_Material/Functions/MF_ObjAdjustments.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Surface_Material/Functions/MF_Tiling.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Surface_Material/Functions/MF_Transmission.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Surface_Material/M_MS_Surface_Material.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Surface_Material_VT/Functions/MF_Displacement.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Surface_Material_VT/Functions/MF_MapAdjustments.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Surface_Material_VT/Functions/MF_ObjAdjustments.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Surface_Material_VT/Functions/MF_Tiling.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Surface_Material_VT/Functions/MF_Transmission.uasset

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Surface_Material_VT/M_MS_Surface_Material_VT.uasset

View File

Binary file not shown.

BIN

Content/Megascans/3D_Assets/Carrot_vd4kda1jw/MI_Carrot_vd4kda1jw_1K.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

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