Commit Graph

143 Commits

Author SHA1 Message Date
PC-G03 00a0d25613 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-04 13:55:40 +05:00
PC-G03 8a7480b211 S02 (05, 15, 25, 35) 2022-07-04 13:53:43 +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
PC-G03 bc921916ae Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-04 13:17:00 +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-G10 caa3dc8999 S02A01 S02A09 2022-07-03 20:37:19 +05:00
PC-G04 57bc3094ab S02A04\14\24\34\41 2022-07-03 17:01:20 +05:00
PC-G03 35a0583ee0 S02 - A05 A15 A25 2022-07-03 11:54:21 +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
DESKTOP-8J0BKKD\Admin a624b960a2 S02A40 2022-07-01 17:24:20 +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
Lenta_Mebiusa 06108d1fa6 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-01 15:57:36 +05:00
Lenta_Mebiusa 2554e41e22 S02A18 2022-07-01 15:55:48 +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
DESKTOP-8J0BKKD\Admin db14f58a72 S02A51 2022-07-01 14:00:22 +05:00
DESKTOP-8J0BKKD\Admin f524ae89f8 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-01 13:59:37 +05:00
DESKTOP-8J0BKKD\Admin d987d78f48 S02A13A23 2022-07-01 13:59:33 +05:00
PC-G04 b8c5285e18 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-01 13:49:16 +05:00
PC-G04 131a643b48 S02A04\14\24\34 2022-07-01 13:36:01 +05:00
DESKTOP-8J0BKKD\Admin d54bd89ae1 S02A51 2022-07-01 12:57:06 +05:00
DESKTOP-8J0BKKD\Admin 1eaad533a7 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-01 11:49:25 +05:00
DESKTOP-8J0BKKD\Admin 284e48656a S02A27, S02A37,S02A42 2022-07-01 11:49:22 +05:00
PC-G06 af44562cb3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-06-30 20:03:32 +05:00
PC-G06 2899b36a8a S02_07_17_28_38_52 2022-06-30 20:03:25 +05:00
Lenta_Mebiusa 5901a19192 S02A08 2022-06-30 16:48:29 +05:00
Lenta_Mebiusa fa15d38f64 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-06-29 21:42:08 +05:00
Lenta_Mebiusa 031a3b1826 S02A00 2022-06-29 21:41:59 +05:00
DESKTOP-8J0BKKD\Admin 64fe524ccb S02A16 2022-06-29 19:01:50 +05:00
DESKTOP-8J0BKKD\Admin 55aae67154 S02A13 2022-06-29 18:10:29 +05:00
DESKTOP-8J0BKKD\Admin 8a0e518a44 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-06-29 16:22:08 +05:00
DESKTOP-8J0BKKD\Admin 9d2b7ef43d S02A13 2022-06-29 16:22:05 +05:00
PC-G06 f0c6e8f2c0 Interior_Plinth_Up 2022-06-29 16:12:10 +05:00
DESKTOP-8J0BKKD\Admin 2f1c524815 S02A06 2022-06-29 13:37:09 +05:00
PC-G06 34499f5478 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-06-28 20:23:06 +05:00
PC-G06 67aa1fa168 Interior_Tex_Small 2022-06-28 20:23:01 +05:00
DESKTOP-8J0BKKD\Admin 6dab3cfff9 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-06-28 19:25:49 +05:00
DESKTOP-8J0BKKD\Admin 94079db6bf S02A06 2022-06-28 19:25:44 +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