Commit Graph

320 Commits

Author SHA1 Message Date
PC-G13 a94de0d836 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-30 16:33:30 +05:00
PC-G13 404c84bf16 parking, outside garage door 2022-09-30 16:33:28 +05:00
GRAFF ad2298956a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/Parking/Parking.umap
2022-09-28 17:49:18 +05:00
GRAFF 137ed09681 чет менялось 2022-09-28 17:04:04 +05:00
PC-G13 07d07d3e1c parking 2022-09-27 18:49:35 +05:00
GRAFF 12e1fc4869 паркингхуяркинг 2022-09-20 15:45:00 +05:00
GRAFF dfbb6bfc5a паркинг всякий 2022-09-20 13:31:42 +05:00
GRAFF 1c06aa5181 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Materials/Instances/Asphalt/MI_Asphalt.uasset
#	Content/Materials/Instances/Bricks/MI_Bricks_Gray11.uasset
#	Content/Materials/Instances/Concrete/MI_Concrete_BrightGray.uasset
#	Content/Materials/Instances/Concrete/MI_Concrete_DarkGray.uasset
#	Content/Materials/Instances/Metal/MI_Metal_Black.uasset
#	Content/Materials/Masharov_Interior/Palette/MI_Emissive_0_Power_Warm.uasset
2022-09-19 20:28:47 +05:00
GRAFF d6cb448d25 parking 2022-09-19 19:41:24 +05:00
GRAFF fd6c048677 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-19 14:29:49 +05:00
GRAFF 4a59caea76 s 2022-09-19 14:29:46 +05:00
GRAFF b0e2fbbf49 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Maps/Masharov_Yard.umap
#	Content/Maps/mainScene.umap
2022-09-16 20:49:59 +05:00
GRAFF e743e43179 pointFade, переклепал текстуры в который раз, гора косяков 2022-09-16 20:49:06 +05:00
PC-G12 b08d12254c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-16 19:06:47 +05:00
PC-G12 0b89e97f1a Parking_WIP1 2022-09-16 19:06:09 +05:00
GRAFF d580c52ea8 smt 2022-09-16 17:42:10 +05:00
GRAFF f9374aa4dc Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Maps/Interior/GP2/S02F03-12.umap
#	Content/Maps/mainScene.umap
2022-09-15 17:57:58 +05:00
GRAFF b92f221b5e ?? 2022-09-15 17:55:33 +05:00
PC-G06 ad61431ebf Main_Building_Furniture 2022-09-14 16:19:14 +05:00
PC-G06 f366783822 S03_Fbake_interior 2022-09-13 16:45:46 +05:00
GRAFF 738da108c1 gp3 2022-09-12 19:38:47 +05:00
GRAFF 1512444078 gp3_check_gp2baketocheck 2022-09-12 13:25:19 +05:00
GRAFF 94519a8e1c оптимизация тачек, лендскейпа, починки всякие, интерфейс, инкрементный фильтр 2022-09-09 22:40:47 +05:00
GRAFF ffeb51dd98 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-07 18:12:40 +05:00
GRAFF 3ab5e34064 a00,a06, lamps 2022-09-07 18:12:38 +05:00
PC-G06 09b699c35c GP_2_Interior_Repair 2022-09-07 18:03:45 +05:00
GRAFF c418221cf9 миллиард говна 2022-09-01 05:09:34 +05:00
JohnnyHatchet dd959eb034 Генплан, бордюры 2022-09-01 02:46:04 +05:00
GRAFF c071da7d2a highlights 2022-09-01 00:29:42 +05:00
GRAFF a4972c318c caps 2022-08-31 23:15:22 +05:00
JohnnyHatchet 0471c50b01 Зелень + фикс коммерции 2022-08-31 17:45:30 +05:00
JohnnyHatchet 9a2a4fe70a подрезка коммерции ГП3 2022-08-31 17:15:55 +05:00
JohnnyHatchet 831bc27b25 Окна ГП3 + подрезка генплана под дома 2022-08-31 16:43:29 +05:00
GRAFF e96b4a0d2b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Meshes/Interior/GP3/Highlights/SM_Cap_S03A07.uasset
#	Content/Meshes/Interior/GP3/Highlights/SM_Cap_S03F19A07.uasset
2022-08-31 13:24:53 +05:00
GRAFF 5c18534b05 bake_firstwave 2022-08-31 13:24:03 +05:00
PC-G12 7c27e2ee20 Caps_Fix 2022-08-30 18:35:10 +05:00
PC-G12 2e184c65f4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Meshes/Interior/GP3/Highlights/SM_Cap_S03A07.uasset
#	Content/Meshes/Interior/GP3/Highlights/SM_Cap_S03F19A07.uasset
2022-08-30 18:28:38 +05:00
PC-G12 12080eea12 CPs 2022-08-30 18:27:42 +05:00
GRAFF c5a4f70e01 transforms 2022-08-30 18:06:36 +05:00
GRAFF 8c43349e1c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-30 14:52:55 +05:00
GRAFF acf5a69861 smth 2022-08-30 14:52:49 +05:00
PC-G12 5551a6eb4f Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-30 14:23:48 +05:00
PC-G12 f520859f81 04-05-09-10-22 2022-08-30 14:23:42 +05:00
JohnnyHatchet 4fa3db1d1a Правка уровня стелобата 2022-08-30 13:55:40 +05:00
PC-G12 8f9f7ff9b2 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-29 19:50:29 +05:00
PC-G12 d308b67b87 19_00_01_Caps 2022-08-29 19:50:18 +05:00
PC-G04 a0434da4d3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-29 18:15:57 +05:00
PC-G04 d2715ae5de S03F19A09 2022-08-29 18:15:11 +05:00
GRAFF 5216e5f771 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-29 17:05:30 +05:00
GRAFF 48a4625dba 060705 2022-08-29 17:05:23 +05:00