PC-G12 2398c3eeb7 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky ...

# Conflicts:
#	Content/Maps/Interiors/GP7/S01/GP7_S01_F02-22_MOP.umap
#	Content/Maps/Interiors/GP7/S01/GP7_S01_F23-24_MOP.umap
#	Content/Maps/Interiors/GP7/S02/GP7_S02_F02-18_MOP.umap
#	Content/Maps/Interiors/GP7/S03/GP7_S03-F13_MOP.umap
#	Content/Maps/Interiors/GP7/S03/GP7_S03_F02-12_MOP.umap

2023-12-08 12:06:06 +05:00

..

Decals/CarAO

всякие допилы говна, сдача 2 этапа

2022-03-01 13:09:50 +05:00

FakeInteriors

zahodit znachit stalker v bar..

2023-12-03 01:43:29 +05:00

Functions

баба с коляской, паркинг, лифт, и всякое

2022-04-07 10:48:34 +05:00

Instances

gp, mats, osm mat migrate,

2023-12-07 18:29:29 +05:00

Interior

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

2023-12-08 12:06:06 +05:00

LandscapeMaterials

gp, mats, osm mat migrate,

2023-12-07 18:29:29 +05:00

Master

zahodit znachit stalker v bar..

2023-12-03 01:43:29 +05:00

Masters

gp, mats, osm mat migrate,

2023-12-07 18:29:29 +05:00

MFunctions

fasadhide/points/core override/

2023-12-01 23:52:23 +05:00

MI_Interior/Palette

M_Test_Room_P2

2023-11-15 01:04:34 +05:00

Naberejnaya

Stone border Yard

2022-05-06 18:04:28 +05:00

ParameterCollection

Сборка

2021-12-07 12:55:31 +05:00

PostProcess

Сборка

2021-12-07 12:55:31 +05:00

Road

roads

2023-12-03 14:10:27 +05:00

LiftPanel.uasset

полный идиотизм с лифтами

2022-04-09 21:13:50 +05:00

M_Lights.uasset

ух ебать ну вроде сделал

2022-04-11 05:51:22 +05:00

M_pano.uasset

fasadhide/points/core override/

2023-12-01 23:52:23 +05:00

M_Transp.uasset

merge DEV to master

2022-03-24 13:30:34 +05:00