Commit Graph

16 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
GRAFF eda7455bb0 всё почти рабочее 2022-03-26 06:06:50 +05:00
GRAFF 084c869638 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 2022-03-25 19:44:03 +05:00
PC-G06 2ac6068a32 Plintus 2022-03-25 18:55:37 +05:00
PC-G06 ef84401b8a Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_flat_0.uasset
2022-03-25 15:45:01 +05:00
PC-G06 a6cd5d2ae3 S02A00_Test 2022-03-25 15:44:15 +05:00
GRAFF 267eeaaa1e Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/Yard_GP4.umap
2022-03-25 14:37:25 +05:00
JohnnyHatchet a6e59992b0 S02 interiors + Caps 2022-03-24 17:52:10 +05:00
GRAFF c8933ec319 merge DEV to master 2022-03-24 13:30:34 +05:00
GRAFF 15f0b60364 куча хлама 2022-03-14 17:18:24 +05:00
GRAFF 8315f32314 куча изменений в интерфейсе, ИИ для люда, обновление лицензии 2022-02-17 13:51:23 +05:00
GRAFF e876ddece9 куча всякого, встроил управление по хттп, новый интерфейс, новая защита 2022-01-20 13:39:25 +05:00
PC-G09 2d0976c8bd Add floors 2022-01-10 15:58:44 +05:00