Commit Graph

66 Commits

Author SHA1 Message Date
GRAFF aefc87b39a ухх блять ну вроде пашет 2022-03-28 15:12:26 +05:00
GRAFF 79834db85d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/Interiors/GP4S2/Unique/S02F03-13.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03F03-15.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03F03.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A00.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A01.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A02.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A03.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A04.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A05.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A06.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A07.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A08.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A09.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05F01.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05F02.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05F09.umap
#	Content/Meshes/Interiors/GP4S5/Unique/SM_dom_5_Hall.uasset
#	Content/Meshes/Lightning/BP_short_picket_light.uasset
#	Content/Meshes/Tree_Crone_2_FoliageType.uasset
2022-03-26 11:29:17 +05:00
GRAFF b6cba38361 я щас сдохну уже 2022-03-26 11:25:10 +05:00
JohnnyHatchet 4354fa14a4 S02 S04 2022-03-26 07:19:20 +05:00
JohnnyHatchet c3b16f3350 S05 2022-03-26 06:56:34 +05:00
GRAFF a3e3a2a0bd Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Maps/Main_Building.umap
2022-03-26 06:11:54 +05:00
GRAFF eda7455bb0 всё почти рабочее 2022-03-26 06:06:50 +05:00
JohnnyHatchet 14b8dedcb2 S03 Caps ТОЧНО ГОТОВО 2022-03-26 05:54:21 +05:00
JohnnyHatchet 7094ded109 GP1-2 Genplsan + GP04S03 Caps + Windows interior 2022-03-26 05:16:42 +05:00
PC-G04 bf1d4ccbdf MOPs 3S 2022-03-26 03:51:22 +05:00
PC-G04 224c2523e7 Dom3F02, Dom3F01 2022-03-25 20:00:35 +05:00
PC-G06 2ac6068a32 Plintus 2022-03-25 18:55:37 +05:00
PC-G03 7ae741fca0 S04A00-A03 2022-03-25 17:48:44 +05:00
PC-G12 db0c97e7f4 S04_45678_PlintuthFix 2022-03-25 17:44:07 +05:00
PC-G03 2b1d4d1ae3 S04_0-8 Created levels+ 2022-03-25 15:30:39 +05:00
PC-G04 ad39f710e1 S03F01 2022-03-25 15:05:50 +05:00
PC-G12 21add90cc8 s0301_04_08 2022-03-24 20:06:25 +05:00
PC-G08 3fc11a4f29 03A00A06A09 2022-03-24 19:42:05 +05:00
Igor d0d9fd6f8b S3_lvl7 2022-03-24 18:35:02 +05:00
JohnnyHatchet a6e59992b0 S02 interiors + Caps 2022-03-24 17:52:10 +05:00
PC-G06 75fe50878d Plintis_S03 2022-03-24 16:29:39 +05:00
GRAFF c8933ec319 merge DEV to master 2022-03-24 13:30:34 +05:00
PC-G11 7adf219fa3 Cats 2022-03-24 10:57:10 +05:00
Igor a7239223db dom3_lvl7 2022-03-23 19:49:23 +05:00
PC-G04 3f6b845026 S03A02, S05A09 2022-03-22 21:53:18 +05:00
PC-G03 82d9cdeb52 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-22 17:37:35 +05:00
PC-G03 2053e2f063 S05A05-08 2022-03-22 17:37:23 +05:00
PC-G04 58640b1b97 S05A009 2022-03-22 17:09:46 +05:00
PC-G04 1d7b16c7e5 S05A09, S05F01 2022-03-22 17:05:53 +05:00
PC-G08 526a09ee8e S00 2022-03-22 16:45:58 +05:00
PC-G08 5cece3b98f S03 interiors 2022-03-22 16:16:20 +05:00
PC-G12 0af030fc55 Plintuth 2022-03-22 15:25:18 +05:00
PC-G03 36ead82def S01A03-S01A06-S01A08-S01A11-S05A06-S05A07-S05A08 2022-03-21 20:17:01 +05:00
PC-G03 80ca7987dd S05A06-11 2022-03-19 13:41:27 +05:00
JohnnyHatchet 70482b8c0a Именование уровней S##A## для квартир + S##F## для этажей с мопами и пустыми квартирами + Простые крышки для простенка 2022-03-19 08:13:12 +05:00
JohnnyHatchet fbd823d457 Правки фасадов второстепенных зданий + добавил изгородь и входы во двор с лодами + высота канта двора 2022-03-19 06:30:30 +05:00
PC-G04 bee7c9e425 dom_1_FL1,dom_1_Hall,dom_1_Hall_F11,dom_1_Hall_F12 2022-03-18 20:09:28 +05:00
PC-G06 1b1b8ef6f8 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-18 20:08:43 +05:00
PC-G12 bf451f7c90 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-18 20:03:28 +05:00
PC-G12 6e34c79035 dom_5_0-4 2022-03-18 20:03:21 +05:00
PC-G06 ab8023a828 dom_1_flat_0_11 2022-03-18 19:59:22 +05:00
PC-G08 07b68cb6f5 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-18 19:00:07 +05:00
PC-G08 6649bd53f1 dom_1_flat_10 2022-03-18 18:57:39 +05:00
PC-G12 b1ffb84a18 Dom_5_Full 2022-03-18 17:51:12 +05:00
Igor a5219f0841 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-18 17:24:03 +05:00
Igor 0aca596870 dom_1_flat_1_2_5_9 2022-03-18 17:23:37 +05:00
PC-G03 f834c9f930 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-18 13:07:38 +05:00
PC-G03 eeec475d95 dom_1_3_6_8 2022-03-18 13:07:32 +05:00
PC-G04 0143c94881 dom_1_f4_f7 2022-03-17 19:28:26 +05:00
PC-G04 6a76960a59 Dom_1_f7 2022-03-17 17:33:41 +05:00