49 Commits

Author SHA1 Message Date
Dron 2a9983fc68 fixes 2024-06-16 01:11:51 +05:00
PC-G13 58bab16e45 gp7 tumendinamics 2024-04-26 13:58:02 +05:00
Dron d2014b7589 pizdec 2023-12-25 09:30:55 +05:00
PC-G13 3634c22b39 mops 2023-12-12 14:19:40 +05:00
JohnnyHatchet a9b7591117 Foliage overhoul 2023-12-11 06:49:41 +05:00
Dron 4204d2d84c zahodit znachit stalker v bar.. 2023-12-03 01:43:29 +05:00
Dron 2c9bd4004f many fixes, core override, UNREAL 5.3 2023-12-02 02:33:31 +05:00
Dron 035067c2a5 fasadhide/points/core override/ 2023-12-01 23:52:23 +05:00
JohnnyHatchet 1a7b5f7219 Dopil 4 2022-07-02 19:11:28 +05:00
JohnnyHatchet 2859c439ee Dopil 3 2022-07-01 22:36:58 +05:00
JohnnyHatchet f449f948b5 dopil 2022-06-28 20:53:25 +05:00
GRAFF 0cc18a55c9 всякое хуякое 2022-04-20 20:21:04 +05:00
GRAFF 79caaf2b19 ооой мляяяя 2022-04-08 11:21:22 +05:00
GRAFF e354f1787d баба с коляской, паркинг, лифт, и всякое 2022-04-07 10:48:34 +05:00
GRAFF 0f4ebf3a47 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/S01A01_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/S01A04_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/S01A05.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A07.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F01.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F02.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F03-10.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F11.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F12.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02F01.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A03.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A08.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A09.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03F01.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04F03-etc.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A06.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05F02.umap
#	Content/Maps/Underground_parking_GP4.umap
#	Content/Meshes/Interiors/GP4S4/Unique/SM_dom_4_F01.uasset
#	Content/Meshes/Interiors/SM_Parking_Underground_fix.uasset
2022-04-06 20:01:28 +05:00
JohnnyHatchet 1bbe6c3ddb Parking 2022-04-01 21:03:45 +05:00
JohnnyHatchet fe6072d105 Parking 2022-03-31 19:27:11 +05:00
GRAFF 77d3d3e649 подкрутил карту, панорама 2022-03-29 16:29:55 +05:00
GRAFF d9c1a28027 дохера всего, апдейты из моей ветки 2022-03-28 16:52:04 +05:00
GRAFF aefc87b39a ухх блять ну вроде пашет 2022-03-28 15:12:26 +05:00
GRAFF b6cba38361 я щас сдохну уже 2022-03-26 11:25:10 +05:00
GRAFF eda7455bb0 всё почти рабочее 2022-03-26 06:06:50 +05:00
GRAFF c8933ec319 merge DEV to master 2022-03-24 13:30:34 +05:00
GRAFF 905abc65ff ААААААААААААААААААААААААААА БЛЕЯТЬААААААА 2022-03-23 01:34:38 +05:00
GRAFF 8ad3f1e65a sdfnslfg 2022-03-22 08:48:05 +05:00
PC-G03 36ead82def S01A03-S01A06-S01A08-S01A11-S05A06-S05A07-S05A08 2022-03-21 20:17:01 +05:00
GRAFF f4550ff35d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/S01A01_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/S01A04_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_0.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_1.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_10.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_2.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_3.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_4.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_4_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_5.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_6.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_7.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_8.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_9.umap
#	Content/Maps/L_Lighting.umap
#	Content/Maps/MainSceneMigrate.umap
#	Content/Maps/Main_Building.umap
#	Content/Materials/Instances/M_Greeds_Inst.uasset
#	Content/Materials/Instances/M_Plastic_RAL_6005.uasset
#	Content/Materials/Instances/M_Plastic_RAL_7026.uasset
#	Content/Materials/Instances/M_Plastic_RAL_716.uasset
#	Content/Materials/Instances/t_conditioner_grid_Opacity.uasset
#	Content/Meshes/Furniture/Custom/SM_Celling_Lamp_1.uasset
#	Content/Meshes/Furniture/Custom/SM_Celling_Lamp_2.uasset
#	Content/Meshes/Furniture/Custom/SM_Celling_Lamp_3.uasset
#	Content/Meshes/test_import_SM_HouseTerritory.uasset
#	Content/Peoples/Male_01/SM_Male_01_fbm/9_meshes_Merge_Normal.uasset
2022-03-21 11:48:57 +05:00
JohnnyHatchet f17b965d3d Work in progress blocks на входах в недоделанные секции 2022-03-21 01:40:46 +05:00
GRAFF 58a7df15ae еще пачка всякого, добавил таги, запекатель параллаксов 2022-03-18 16:58:38 +05:00
GRAFF 407047409d куча барахла еще 2022-03-17 17:00:50 +05:00
GRAFF 82abd78661 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 2022-03-14 17:18:41 +05:00
GRAFF 15f0b60364 куча хлама 2022-03-14 17:18:24 +05:00
PC-G06 787fdd0689 Eclectic_Material_Part_1 2022-03-10 17:18:07 +05:00
GRAFF 5715cc3f0d заменил свет в lighting, удалил лишний динамик скай, поправил постпроцесс в main_migrate 2022-03-01 13:44:26 +05:00
GRAFF fc8511454f всякие допилы говна, сдача 2 этапа 2022-03-01 13:09:50 +05:00
JohnnyHatchet 997852e75b yard GP_4/ yard GP_5/ Yard/ Playground Ship/ Foliage/ Cars 2022-02-28 04:08:36 +05:00
JohnnyHatchet e3ce980026 Yards 2022-02-25 21:21:16 +05:00
PC-G09 306202a058 Gasstation 2022-02-24 06:27:19 +05:00
PC-G09 c74606e474 Pravii bereg 2022-02-23 23:19:20 +05:00
PC-G09 9958347a0c GP4 GP5 Yard 2022-02-21 18:20:29 +05:00
PC-G09 4845d02c09 Naberejnaya 2022-02-17 19:33:26 +05:00
PC-G09 4e538441bf Exterior 2022-02-16 19:17:06 +05:00
PC-G09 7d989ab362 Exterior 2022-02-16 18:07:26 +05:00
PC-G09 255c975a67 Внешка (заправка, автосалон), нарезка квартир по номерам 2022-01-17 15:21:27 +05:00
PC-G09 df6c351602 Генпланы, парк, увеличение радиуса 2021-12-17 16:01:17 +05:00
GRAFF 89d92dad95 водичка, деревце, окошки, синева, центр карты 2021-12-10 14:49:59 +05:00
PC-G09 d81a60cca7 Генплан школа 2021-12-10 12:29:19 +05:00
PC-G09 e569f81157 Перенос мастеров в мастеры, вода поинтересней вроде, Декаль спортивной прощадки за ГП 4 2021-12-10 02:41:03 +05:00
PC-G09 40f70385c0 Сборка 2021-12-07 12:55:31 +05:00