PC-G04 406529d54a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 ...

# Conflicts:
#	Content/Maps/Interior/GP7/Se01/F11-12/Walls/S7_Se01_F11-12_A00_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F02-05_A02_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F02-05_A10_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F02-10_A05_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F02-10_A06_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F02-10_A09_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F06-08_A07_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F06-08_A12_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F09-10_A08_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F09-10_A11_walls.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-03_06-07_A05_walls.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-03_A02_walls.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-03_A03_walls.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-03_A06_walls.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-05_A00_walls.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-08_A01_walls.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F09_A07_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A02_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A03_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A04_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A05_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A06_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A07_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F13_A08_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F13_A09_walls.umap

2024-04-19 19:10:10 +05:00

..

Cars

…

Environment/Landscape/Re

коты/кошки и материал лендскейпа

2024-04-19 19:02:44 +05:00

Exterior

p2

2024-04-17 19:49:28 +05:00

Foliage

gp9, yard+mops,

2024-03-14 13:51:34 +05:00

Interior

walls, mops, lamps

2024-04-19 15:05:13 +05:00

MAF

baked

2024-03-29 14:01:44 +05:00

Roads_re/Textures/Sputnik/Decales_hires

Night Light + Cars

2023-08-29 17:15:51 +05:00

Temp

…

Yard

gp9, yard+mops,

2024-03-14 13:51:34 +05:00

meshes.uasset

…

Plane.uasset

…