Commit Graph

36 Commits

Author SHA1 Message Date
PC-G12 37d50e3fce Mops 2022-07-08 19:07:58 +05:00
GRAFF 47d640a706 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP2/S02A30.umap
#	Content/Maps/Interior/GP2/S02A31.umap
#	Content/Maps/Interior/GP2/S02A47.umap
#	Content/Meshes/Interior/GP2/Plintuth/Plinth_Up/SM_S02A30_Plinth.uasset
#	Content/Meshes/Interior/GP2/SM_S02A30.uasset
2022-07-08 10:45:49 +05:00
GRAFF 325f4302a6 mama mama, ma baker 2022-07-08 10:45:33 +05:00
PC-G06 e4587618b5 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-07 20:14:45 +05:00
PC-G06 6cd8561207 S0_New_UV_Part_1 2022-07-07 20:14:42 +05:00
PC-G12 28c9d15314 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-07 20:09:15 +05:00
PC-G12 0c55ced6ec Mopz 2022-07-07 20:08:50 +05:00
GRAFF cc25272b39 ma baker 2022-07-07 14:31:47 +05:00
GRAFF 81adb1c8cf Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP2/S02A01.umap
#	Content/Meshes/Interior/Window/SM__GP2_Windows_8.uasset
2022-07-06 19:19:23 +05:00
GRAFF b3f52b0654 baking_mops 2022-07-06 19:18:33 +05:00
PC-G06 73052f0037 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-06 14:23:56 +05:00
PC-G06 789a5e121d S02A17 2022-07-06 14:23:51 +05:00
GRAFF d7c5b1ab11 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/MI_Plastic_002.uasset
#	Content/Materials/Masharov_Interior/Palette/MI_Floor_Ceramic_Mash.uasset
#	Content/Meshes/Interior/Furniture/Radiator/Materials/MI_Radiator_ORM.uasset
2022-07-06 12:27:07 +05:00
GRAFF d2bce4cf59 mops_baking 2022-07-06 12:26:16 +05:00
PC-G06 830c85a5dc S02_Ivan_2 2022-07-05 16:35:30 +05:00
PC-G06 58dda10d5d S02_Irina 2022-07-05 14:57:05 +05:00
PC-G06 8f8cad01f5 S02_Ivan 2022-07-04 19:44:50 +05:00
PC-G06 42cd458583 02A03/11/21/32_2 2022-07-04 19:05:28 +05:00
PC-G06 d7502b9410 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-04 13:48:37 +05:00
PC-G06 38db30ea48 Mat_Tex_Part_1 2022-07-04 13:48:33 +05:00
GRAFF 2dbf73ce3b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Meshes/Interior/GP2/SM_S02A07.uasset
2022-07-04 13:09:26 +05:00
GRAFF 65fdaaa4f9 lightbps_testbake_windowsreimport 2022-07-04 13:08:46 +05:00
PC-G06 a01456669b ID_Plinth_Room 2022-07-01 16:26:42 +05:00
GRAFF 553d142dae Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Materials/Masharov_Interior/Wall/MI_Wall_Bathroom_Stone.uasset
2022-07-01 14:37:44 +05:00
GRAFF 3026e10ae1 IES_Cat_gpulightmass_someinteriorlightBpchanges_someinteriormatschanges_ 2022-07-01 14:36:31 +05:00
PC-G06 2899b36a8a S02_07_17_28_38_52 2022-06-30 20:03:25 +05:00
PC-G06 67aa1fa168 Interior_Tex_Small 2022-06-28 20:23:01 +05:00
PC-G06 d9dcc134c5 LVL_Interior_Move 2022-06-28 18:34:02 +05:00
PC-G06 43aac680f0 Interior_SM_S02A17_Part_5_BP_Lamp_Mesh_337 2022-06-28 15:45:34 +05:00
PC-G06 ab09efc55f Interior_SM_S02A17_Part_4 2022-06-27 18:04:40 +05:00
PC-G06 9aa130ef4d Interior_SM_S02A17_Part_3 2022-06-27 14:35:24 +05:00
GRAFF ab908f7ff5 версия 0.8 уехала в тюмень, дохуя всякого по ии, хаты, уи 2022-06-24 13:21:43 +05:00
PC-G06 62fc5f1bc6 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-06-22 21:24:58 +05:00
PC-G06 13a359cfe2 Test_Room_Interior_SM_S02A17 2022-06-22 21:24:53 +05:00
PC-G12 d178690c3a Fast_Materials 2022-06-22 15:01:28 +05:00
PC-G06 2c142e3342 Test_Room_Part_1 2022-06-22 13:15:58 +05:00