Commit Graph

463 Commits

Author SHA1 Message Date
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
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 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
JohnnyHatchet a6e59992b0 S02 interiors + Caps 2022-03-24 17:52:10 +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 00091923d8 ну без длсс обойдетесь гг 2022-03-24 13:56:14 +05:00
GRAFF 0724f4a81d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Ivazowsky.uproject
2022-03-24 13:45:56 +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
JohnnyHatchet d769377519 Nightlight 2022-03-24 13:02:12 +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
GRAFF 905abc65ff ААААААААААААААААААААААААААА БЛЕЯТЬААААААА 2022-03-23 01:34:38 +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 c8ac07e587 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-22 20:19:12 +05:00
PC-G06 cef555c90e S03_A01_Mat 2022-03-22 20:19:05 +05:00
JohnnyHatchet eaff79f8bc Nightlight test lvl 2022-03-22 20:03:44 +05:00
PC-G12 21de9fedf0 Curtain 2022-03-22 17:45:03 +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-G12 0fa068f858 Level_0-4 2022-03-22 17:32:50 +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