Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky

Browse Source

# Conflicts:
#	Content/Maps/MainScene.umap

...

This commit is contained in:

Dron

2025-09-23 19:38:05 +05:00

parent 2a6b4c1846 0f430f2606

commit 5d75f89cbb

87 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

Download Patch File Download Diff File Expand all files Collapse all files

Content/Maps/GP12_GP13.umap

BIN

Binary file not shown.

Content/Materials/Instances/MI_RMA_Fasad_.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_RMA_Fasad_Malachit5.uasset

BIN

Binary file not shown.

Content/Meshes/MAF/GP12_13/Bench_without_backrest_PLUSHIHA_ADANAT_ART10140/SM_Bench_without_backrest_PLUSHIHA_ADANAT_ART10140.uasset

BIN

Binary file not shown.

Content/Meshes/MAF/GP12_13/Bench_without_backrest_PLUSHIHA_ADANAT_ART10140/T_Bench_without_backrest_PLUSHIHA_ADANAT_ART10140_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/MAF/GP12_13/Benches_Megapolis/MI_Wood1.uasset

BIN

Binary file not shown.

Content/Meshes/MAF/GP12_13/Benches_Megapolis/MI_Wood_Benches_Megapolis_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/MAF/GP12_13/Benches_Megapolis/MI_Wood_Benches_Megapolis_NAC_Inst.uasset

BIN

Binary file not shown.

Content/Meshes/MAF/GP12_13/Benches_Megapolis/SM_MAF_Benches_Megapolis.uasset

BIN

Binary file not shown.

Content/Meshes/MAF/GP12_13/Benches_Megapolis/T_SM_MAF_Sculpture36_Fontain39_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/Environment/MAFs/UB10/UB10_Shadow_canopy_Custom_made/MI_MAF_WhitePlastic_UB10_ShadowCanopy.uasset → Content/Meshes/MAF/GP12_13/UB10_Shadow_canopy_Custom_made/MI_MAF_WhitePlastic_UB10_ShadowCanopy.uasset

BIN

Binary file not shown.

Content/Meshes/Environment/MAFs/UB10/UB10_Shadow_canopy_Custom_made/SM_UB10_Shadow_canopy_Custom_made_1.uasset → Content/Meshes/MAF/GP12_13/UB10_Shadow_canopy_Custom_made/SM_UB10_Shadow_canopy_Custom_made_1.uasset

BIN

Binary file not shown.

Content/Meshes/Environment/MAFs/UB10/UB10_Shadow_canopy_Custom_made/T_UB10_Shadow_canopy_Custom_made_NAC.uasset → Content/Meshes/MAF/GP12_13/UB10_Shadow_canopy_Custom_made/T_UB10_Shadow_canopy_Custom_made_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/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/S03/SM_GP12_S03_Decal.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S03/SM_GP12_S03_Facade.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S03/SM_GP12_S03_Windows.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S04/MI_F_GP12_S04_Otliv_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S04/SM_GP12_S04_Collision.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S04/SM_GP12_S04_Cubemaps.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S04/SM_GP12_S04_Decal.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S04/SM_GP12_S04_Facade.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S04/SM_GP12_S04_Shadow.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S05/MI_F_GP12_S05_BlackBrick_Plaster_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S05/MI_F_GP12_S05_Black_Plaster.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S05/MI_F_GP12_S05_Black_Plaster_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S05/MI_F_GP12_S05_Collision.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S05/MI_F_GP12_S05_Cubemap.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S05/MI_F_GP12_S05_Facade.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S05/MI_F_GP12_S05_Shadow.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S05/MI_F_GP12_S05_White_Plaster_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S05/MI_F_GP12_S05_WindowsFrame_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S05/MI_F_GP12_S05_Yellow_Plaster_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S05/MI_Facade_CompositeTiles_RAL7047.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S05/T_GP12_S04_OtlivBavel_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S05/T_GP12_S05_Facade_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S05/T_GP12_S05_WindowFrame_NAC.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S06/SM_GP12_S06_Collision.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S06/SM_GP12_S06_Decal.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S06/SM_GP12_S06_Facade.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S06/SM_GP12_S06_Windows.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S07/SM_GP12_S07_Collision.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S07/SM_GP12_S07_Facade.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S07/SM_GP12_S07_Windows.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S08/SM_GP12_S08_Collision.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S08/SM_GP12_S08_Decal.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S08/SM_GP12_S08_Facade.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S08/SM_GP12_S08_Windows.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S09/SM_GP12_S09_Collision.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S09/SM_GP12_S09_Facade.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S09/SM_GP12_S09_Windows.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S09/T_GP12_S09_Alpha.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP12/S09/T_GP12_S09_N.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/S02/SM_GP13_S02_Facade.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S02/SM_GP13_S02_Windows.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S02/SM_Section_GP13_S02_Collision.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S02/SM_ShadeGradient_GP13_S02.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S03/SM_GP13_S03_Facade.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S03/SM_GP13_S03_Windows.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S03/SM_Section_GP13_S03_Collision.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S03/SM_ShadeGradient_GP13_S03.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S04/SM_GP13_S04_Collision.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S04/SM_GP13_S04_Decal.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S04/SM_GP13_S04_Facade.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S04/SM_GP13_S04_Windows.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/GP13/S08/SM_GP13_S08_Collision.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S08/SM_GP13_S08_Decal.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S08/SM_GP13_S08_Facade.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S08/SM_GP13_S08_Windows.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S09/SM_GP13_S08_09_Mask.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S09/SM_GP13_S09_Collision.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S09/SM_GP13_S09_Decal.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S09/SM_GP13_S09_Facade.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S09/SM_GP13_S09_Windows.uasset

BIN

Binary file not shown.

Content/Meshes/houses/GP12_13/GP13/S09/T_DefaultMaterial_NAC.uasset

BIN

Binary file not shown.