Commit Graph

91 Commits

Author SHA1 Message Date
PC-G06 cdcef95694 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP2/S02A04.umap
#	Content/Maps/Interior/GP2/S02A14.umap
#	Content/Maps/Interior/GP2/S02A24.umap
#	Content/Maps/Interior/GP2/S02A34.umap
#	Content/Maps/Interior/GP2/S02A39.umap
#	Content/Maps/Interior/GP2/S02A41.umap
#	Content/Maps/Interior/GP2/S02A53.umap
#	Content/Meshes/Interior/GP2/Plintuth/Plinth_Up/SM_S02A41_Plinth.uasset
#	Content/Meshes/Interior/GP2/Plintuth/Plinth_Up/SM_S02A53_Plinth.uasset
2022-07-05 14:57:45 +05:00
PC-G06 58dda10d5d S02_Irina 2022-07-05 14:57:05 +05:00
PC-G04 c533b262e8 Irina-Plintuth 2022-07-05 11:36:57 +05:00
PC-G10 98f812fe3f S02A01 S02A09 S02A19 S02A30 S02A44 SM_S02A19 2022-07-04 19:37:56 +05:00
Igor a64581eef1 LVL_02_10_12_20_22_31_33_45_47_Plinth_20_31_45_47_Plintuth_31 2022-07-04 19:16:23 +05:00
PC-G06 42cd458583 02A03/11/21/32_2 2022-07-04 19:05:28 +05:00
PC-G08 2b9f770f50 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-04 18:10:55 +05:00
PC-G08 e4cb5b968c 02A03/11/21/32 2022-07-04 18:10:36 +05:00
PC-G04 1128bcb715 S02A04/14/24/34/39/41/48/53 2022-07-04 17:58:26 +05:00
DESKTOP-8J0BKKD\Admin 9701348b16 S02A06/13/16/23/27/37/40/42/49/51 2022-07-04 17:24:41 +05:00
PC-G06 4f36660ec7 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-04 14:24:21 +05:00
PC-G06 9de580f1e9 S02_03 2022-07-04 14:24:15 +05:00
Igor 1d726b4721 LVL_02_10_12_Plintuth_ID 2022-07-04 14:19:12 +05:00
PC-G08 c0ea0612fb Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-04 14:07:45 +05:00
PC-G08 9fd7ff3c28 GP2A03_A11_A21_A32_A46 2022-07-04 14:07:06 +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
Igor cd4d0e6939 LVL_02_10_12_20_22_31_33_45_47_Plinth_ID 2022-07-04 13:00:45 +05:00
PC-G04 57bc3094ab S02A04\14\24\34\41 2022-07-03 17:01:20 +05:00
Lenta_Mebiusa cfc6026ae2 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-01 20:59:51 +05:00
Lenta_Mebiusa 4f74a08599 Правки 2022-07-01 20:59:44 +05:00
Igor 4f96a95d0e lvl_02_10_12_20_22_31_33_kv02_22_02_kv02_33 2022-07-01 17:26:35 +05:00
Lenta_Mebiusa bc5f8af1aa Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Meshes/Interior/GP2/Plintuth/Plinth_Up/SM_S02A00_Plinth.uasset
#	Content/Meshes/Interior/GP2/Plintuth/Plinth_Up/SM_S02A08_Plinth.uasset
#	Content/Meshes/Interior/GP2/Plintuth/Plinth_Up/SM_S02A18_Plinth.uasset
#	Content/Meshes/Interior/GP2/Plintuth/Plinth_Up/SM_S02A29_Plinth.uasset
#	Content/Meshes/Interior/GP2/Plintuth/SM_S02A00_Plintuth.uasset
#	Content/Meshes/Interior/GP2/Plintuth/SM_S02A08_Plintuth.uasset
#	Content/Meshes/Interior/GP2/Plintuth/SM_S02A18_Plintuth.uasset
#	Content/Meshes/Interior/GP2/Plintuth/SM_S02A29_Plintuth.uasset
2022-07-01 16:53:59 +05:00
Lenta_Mebiusa c4972421f1 Плинтуса UV 2022-07-01 16:50:58 +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 f0c6e8f2c0 Interior_Plinth_Up 2022-06-29 16:12:10 +05:00
PC-G06 67aa1fa168 Interior_Tex_Small 2022-06-28 20:23:01 +05:00
PC-G06 28f19584af Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-06-28 18:34:07 +05:00
PC-G06 d9dcc134c5 LVL_Interior_Move 2022-06-28 18:34:02 +05:00
DESKTOP-8J0BKKD\Admin b9272783cb Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-06-28 16:19:20 +05:00
DESKTOP-8J0BKKD\Admin 1bdc7b441d Windows 2022-06-28 16:19:17 +05:00
PC-G06 4f096d9ac6 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-06-28 15:45:39 +05:00
PC-G06 43aac680f0 Interior_SM_S02A17_Part_5_BP_Lamp_Mesh_337 2022-06-28 15:45:34 +05:00
DESKTOP-8J0BKKD\Admin 886ff37a05 gp2 + windows 2022-06-27 18:11:01 +05:00
PC-G06 ab09efc55f Interior_SM_S02A17_Part_4 2022-06-27 18:04:40 +05:00
PC-G12 2ddd7fd8a9 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-06-27 16:31:20 +05:00
PC-G12 2a0387d5e1 Flat_Levels 2022-06-27 16:31:15 +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
JohnnyHatchet d634179fcb Немного освещения + ГП1-2 стилобат 2022-06-23 13:38:44 +05:00
JohnnyHatchet e0d89d5ec7 Всякое по двору, фасадам 2022-06-23 00:24:53 +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 19b1740315 S02A46 2022-06-22 19:35:27 +05:00
PC-G12 d178690c3a Fast_Materials 2022-06-22 15:01:28 +05:00