Commit Graph

19 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 ab3c0bd355 BP_Lightnings 2022-03-26 07:53:32 +05:00
GRAFF eda7455bb0 всё почти рабочее 2022-03-26 06:06:50 +05:00
GRAFF 0f36e651e5 всякое разное, и даже работает 2022-03-25 14:32:47 +05:00
GRAFF c8933ec319 merge DEV to master 2022-03-24 13:30:34 +05:00
GRAFF df24de7f10 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Config/DefaultEngine.ini
#	Content/Maps/Interiors/GP4S1/Unique/S01A08.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A05.umap
#	Content/Maps/NightlightAim.umap
#	Content/Maps/Yard_GP4.umap
#	Content/Materials/FakeInteriors/MI_CubeRoom_1.uasset
#	Content/Materials/FakeInteriors/MI_CubeRoom_2.uasset
#	Content/Materials/FakeInteriors/MI_CubeRoom_3.uasset
#	Content/Materials/FakeInteriors/MI_CubeRoom_6.uasset
#	Content/Materials/FakeInteriors/MI_FakeEmpty.uasset
#	Content/Meshes/Furniture/Custom/SM_CylLamp_AI.uasset
#	Content/Meshes/Furniture/Custom/SM_Door_AI_SM_Door_AI.uasset
#	Content/Meshes/Furniture/Custom/SM_Door_AI_SM_Door_Frame.uasset
#	Content/Meshes/Furniture/Custom/SM_Door_Front_AI_SM_Door_Front_AI.uasset
#	Content/Meshes/Furniture/Custom/SM_Door_Front_Frame_AI.uasset
2022-03-24 13:14:31 +05:00
GRAFF cf0c2ba87c ещё тут всякое 2022-03-24 13:07:17 +05:00
PC-G06 ee7f953982 S03_Mesh 2022-03-23 20:52:42 +05:00
GRAFF 905abc65ff ААААААААААААААААААААААААААА БЛЕЯТЬААААААА 2022-03-23 01:34:38 +05:00
GRAFF 8ad3f1e65a sdfnslfg 2022-03-22 08:48:05 +05:00
GRAFF d0374d966f всякая штука 2022-03-21 23:15:47 +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
GRAFF 58a7df15ae еще пачка всякого, добавил таги, запекатель параллаксов 2022-03-18 16:58:38 +05:00
GRAFF 407047409d куча барахла еще 2022-03-17 17:00:50 +05:00
JohnnyHatchet 57fd964f13 Fixup redirections 2022-03-17 04:26:55 +05:00
PC-G06 14ed31d2a2 BP_Light_intensity_and_Door 2022-03-15 17:20:08 +05:00
GRAFF 1974841428 бпехи с лампами 2022-03-14 19:06:47 +05:00