Compare commits

base: Dron/Ivazovsky:ed828434b15586e06fc95f06771db3936e480462

Branches Tags

Dron/Ivazovsky:master Dron/Ivazovsky:Panorams Dron/Ivazovsky:PlansRender Dron/Ivazovsky:Plans Dron/Ivazovsky:Points-(test-after-constant-crushes) Dron/Ivazovsky:ue5.1 Dron/Ivazovsky:developer Dron/Ivazovsky:pixelStreaming Dron/Ivazovsky:englishMotherfucker

...

compare: Dron/Ivazovsky:b8335383cff9b8467e48bce96ccc5fe40eccecc8

Branches Tags

Dron/Ivazovsky:master Dron/Ivazovsky:Panorams Dron/Ivazovsky:PlansRender Dron/Ivazovsky:Plans Dron/Ivazovsky:Points-(test-after-constant-crushes) Dron/Ivazovsky:ue5.1 Dron/Ivazovsky:developer Dron/Ivazovsky:pixelStreaming Dron/Ivazovsky:englishMotherfucker

2 Commits

ed828434b1 ... b8335383cf

Author	SHA1	Message	Date
PC-G13	b8335383cf	Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky ... # Conflicts: # Content/Materials/MFunctions/MF_BaseUV.uasset # Content/Textures/Dummy/T_Dummy_NAC.uasset	2025-09-16 12:36:06 +05:00
PC-G13	ee8b6d9d0f	masters, facades	2025-09-16 12:33:52 +05:00

57 changed files with 0 additions and 0 deletions

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

Expand all files Collapse all files

Content/Materials/Instances/Exterior/GP7/MI_Facade_CompositeTiles_RAL7048.uasset

BIN

Binary file not shown.

Content/Materials/MFunctions/MF_BaseUV.uasset

BIN

Binary file not shown.

Content/Materials/MFunctions/MF_NormalRotation.uasset

BIN

Binary file not shown.

Content/Materials/Master/M_RMA_Tile_Triplanar.uasset

BIN

Binary file not shown.

Content/Materials/Masters/MM_FacadeDistanceBlend.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S02/MI_F_GP12_S02_ClinkerBrick_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S02/MI_F_GP12_S02_DecorativePlaster_RAL_7016_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S02/MI_F_GP12_S02_DecorativePlaster_RAL_9002_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S02/MI_F_GP12_S02_Metal.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S02/MI_F_GP12_S02_MetalFrame_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S02/MI_F_GP12_S02_Metal_Bright.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S02/MI_F_GP12_S02_Metal_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S02/MI_F_GP12_S02_WindowsFrame_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S02/MI_F_GP12_S02_Сoncrete_RAL_9002_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S02/SM_GP12_S02_Collision.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S02/SM_GP12_S02_Decal.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S02/SM_GP12_S02_Facade.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S02/SM_GP12_S02_Windows.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S02/T_GP12_S02_Decoration_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S02/T_GP12_S02_Wall_Decoration_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S02/T_GP12_S02_Wall_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S02/T_GP12_S02_Windows_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S01/MI_F_GP13_S01_ClinkerBrick_Decoration_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S01/MI_F_GP13_S01_ClinkerBrick_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S01/MI_F_GP13_S01_DecorativePlaster_RAL_9002_Mask.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S01/MI_F_GP13_S01_DecorativePlaster_RAL_9002_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S01/MI_F_GP13_S01_FiberCementPanels_RAL_9002_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S01/MI_F_GP13_S01_PVC_RAL_7016_Decoration_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S01/MI_F_GP13_Steel_Decoration_NAC_CA.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S01/MI_F_GP13_Сoncrete_Decoration_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S01/SM_GP13_S01_Collision.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S01/SM_GP13_S01_Decal.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S01/SM_GP13_S01_Facade.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S01/SM_GP13_S01_Windows.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S01/T_GP13_S01_1-2_Floor_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S01/T_GP13_S01_Decorative_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S01/T_GP13_S01_Wall_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S06/MI_F_GP13_S06_07_Grid_Fence.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S06/MI_F_GP13_S06_Concrete_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S06/MI_F_GP13_S06_MetalFrame_RAL_7016_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S06/MI_F_GP13_S06_Plaster_RAL_7016_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S06/SM_GP13_S06.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S06/SM_GP13_S06_Collision.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S07/SM_GP13_S07.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S07/SM_GP13_S07_Collision.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/MI/MI_DecorativePlaster_RAL_9002.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/MI/MI_F_GlassClear.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/MI/MI_F_MetalFrame_RAL_7016.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/MI/MI_F_Metal_Bright.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/MI/MI_F_MetallGrid_Mask.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/MI/MI_F_Plaster_RAL_7016.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/MI/MI_F_Roof.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/MI/MI_F_Roof_Tile.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/MI/MI_F_Stemalit_RAL_7016.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/MI/MI_F_StonePanels_RAL_7016.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/MI/MI_F_Ventilation.uasset

BIN

Binary file not shown.

Content/Textures/Dummy/T_Dummy_NAC.uasset

BIN

Binary file not shown.