Dron/Ivazovsky
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
463 Commits 9 Branches 0 Tags
pixelStreaming
Commit Graph

433 Commits

Author SHA1 Message Date
PC-G06 7e7af7f1d9 S02_Material_Part_1 2022-03-28 18:07:00 +05:00
GRAFF d9c1a28027 дохера всего, апдейты из моей ветки 2022-03-28 16:52:04 +05:00
GRAFF a7e3c93bc6 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Interiors/GP4S4/Unique/S04A01.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A02.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A05.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A06.umap
 2022-03-28 15:14:33 +05:00
GRAFF aefc87b39a ухх блять ну вроде пашет 2022-03-28 15:12:26 +05:00
PC-G08 ed6c8b2099 S04A01A02A05A06 2022-03-26 15:08:00 +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
JohnnyHatchet 7f82b0f84b Landscape Fontain foliage 2022-03-26 07:32:59 +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 ac90d0c616 S03 S05 2022-03-26 06:00:47 +05:00
JohnnyHatchet 14b8dedcb2 S03 Caps ТОЧНО ГОТОВО 2022-03-26 05:54:21 +05:00
JohnnyHatchet 6b5196703b Fasad entrence S03 Fix 2022-03-26 05:34:19 +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
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-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-G06 462836e36c S03_Interior 2022-03-25 16:37:39 +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
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 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