Commit Graph

47 Commits

Author SHA1 Message Date
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 462836e36c S03_Interior 2022-03-25 16:37:39 +05:00
PC-G04 ad39f710e1 S03F01 2022-03-25 15:05:50 +05:00
PC-G12 ccc1e880f5 Precheck 2022-03-25 15:02:03 +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
GRAFF 0f36e651e5 всякое разное, и даже работает 2022-03-25 14:32:47 +05:00
PC-G11 efe6d7f5ab box reflection capture S03A05 2022-03-25 14:15:48 +05:00
PC-G03 da312784cd S03A03 2022-03-25 13:47:14 +05:00
PC-G11 61275cebf4 S03A05 2022-03-25 12:53:54 +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
PC-G11 7d37d49702 S03A05 2022-03-24 18:53:57 +05:00
Igor d0d9fd6f8b S3_lvl7 2022-03-24 18:35:02 +05:00
PC-G12 c7fb0c0160 04_08-03. 2022-03-24 16:41:03 +05:00
PC-G06 75fe50878d Plintis_S03 2022-03-24 16:29:39 +05:00
PC-G06 eb523108a8 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-24 15:20:27 +05:00
PC-G06 a166a5041e S03A01 2022-03-24 15:20:22 +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
PC-G11 54e7158050 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-24 12:20:43 +05:00
PC-G11 68767da81e Fix Wardrobe 2022-03-24 12:20:35 +05:00
PC-G03 955c5112c9 S03A03 2022-03-24 11:23:53 +05:00
PC-G03 5293fb5757 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-24 11:23:12 +05:00
PC-G11 7adf219fa3 Cats 2022-03-24 10:57:10 +05:00
PC-G04 47a3cd55b4 S03A02, Posters_kid_and_plants 2022-03-23 22:25:43 +05:00
PC-G06 69b0cadf07 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-23 21:10:17 +05:00
PC-G06 ee7f953982 S03_Mesh 2022-03-23 20:52:42 +05:00
PC-G12 2000152715 03_0408 2022-03-23 19:58:32 +05:00
Igor a7239223db dom3_lvl7 2022-03-23 19:49:23 +05:00
PC-G03 3a3caf579b Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-23 11:59:38 +05:00
PC-G03 4fb1e3ff72 S03A03 2022-03-23 11:59:30 +05:00
PC-G08 fae8b815b5 S03A00 2022-03-23 11:51:22 +05:00
PC-G04 3f6b845026 S03A02, S05A09 2022-03-22 21:53:18 +05:00
PC-G12 080428a307 s03a04 2022-03-22 20:20:23 +05:00
PC-G06 cef555c90e S03_A01_Mat 2022-03-22 20:19:05 +05:00
PC-G08 526a09ee8e S00 2022-03-22 16:45:58 +05:00
PC-G06 103ed61522 S03A01 2022-03-22 16:43:36 +05:00
PC-G06 ab6eb61ff8 S03_Test 2022-03-22 16:22:08 +05:00
PC-G08 5cece3b98f S03 interiors 2022-03-22 16:16:20 +05:00
GRAFF 4bc67d6a74 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/S01A00.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A01.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A02.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A03.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A04.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A05.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A06.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A07.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A08.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A09.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A10.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A11.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A01.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A02.umap
2022-03-21 23:18:22 +05:00
PC-G06 8f7d0e7a8f Gp4S3 2022-03-21 20:33:00 +05:00
PC-G03 36ead82def S01A03-S01A06-S01A08-S01A11-S05A06-S05A07-S05A08 2022-03-21 20:17:01 +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