Commit Graph

732 Commits

Author SHA1 Message Date
GRAFF 22f9ce374b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-13 17:20:23 +05:00
GRAFF 0255e3ae45 gp2-3 2022-09-13 17:19:55 +05:00
DESKTOP-8J0BKKD\Admin 8135733259 Правки по GP3 2022-09-13 17:08:48 +05:00
PC-G06 f366783822 S03_Fbake_interior 2022-09-13 16:45:46 +05:00
GRAFF 90cbe837b5 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-12 19:38:51 +05:00
GRAFF 738da108c1 gp3 2022-09-12 19:38:47 +05:00
DESKTOP-8J0BKKD\Admin 8e9f938d54 Правки по хатам GP2 2022-09-12 18:04:55 +05:00
GRAFF 8d6b4ce916 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-12 13:25:21 +05:00
GRAFF 1512444078 gp3_check_gp2baketocheck 2022-09-12 13:25:19 +05:00
GRAFF 94519a8e1c оптимизация тачек, лендскейпа, починки всякие, интерфейс, инкрементный фильтр v1.13 2022-09-09 22:40:47 +05:00
GRAFF 4f4c3fab32 Merge branch 'developer' 2022-09-07 20:04:46 +05:00
GRAFF a8fd49cb56 всякое 2022-09-07 20:01:33 +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 07e4348772 Fix 1С-2 2022-09-02 12:51:52 +05:00
GRAFF 4bdfaf5abf Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-01 13:22:54 +05:00
GRAFF b7d3d38bfa уффффффф 2022-09-01 13:21:32 +05:00
PC-G01 6eb55d136e С небес на землю, на этот раз в ноль 2022-09-01 12:37:56 +05:00
GRAFF c418221cf9 миллиард говна 2022-09-01 05:09:34 +05:00
GRAFF 58c86e3969 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-09-01 02:53:52 +05:00
JohnnyHatchet dd959eb034 Генплан, бордюры 2022-09-01 02:46:04 +05:00
GRAFF ad677e529a svet 2022-09-01 02:20:52 +05:00
GRAFF 8051b3cd71 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Meshes/Interior/GP3/Highlights/SM_Cap_S03A00.uasset
2022-09-01 00:48:49 +05:00
GRAFF c071da7d2a highlights 2022-09-01 00:29:42 +05:00
GRAFF 4032b466f7 всякое 2022-09-01 00:27:33 +05:00
GRAFF 73ac223d65 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-08-31 23:30:55 +05:00
GRAFF a4972c318c caps 2022-08-31 23:15:22 +05:00
GRAFF 6ad75b92ac Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Maps/Masharov_Buildings.umap
2022-08-31 20:48:52 +05:00
GRAFF dc9e26f337 capsTomops 2022-08-31 20:45:51 +05:00
GRAFF 5deb40ae9c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-31 20:33:33 +05:00
GRAFF 3edcb0890a volumetric_inMops 2022-08-31 20:33:31 +05:00
JohnnyHatchet 0471c50b01 Зелень + фикс коммерции 2022-08-31 17:45:30 +05:00
JohnnyHatchet f178e900d8 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-31 17:16:48 +05:00
JohnnyHatchet 9a2a4fe70a подрезка коммерции ГП3 2022-08-31 17:15:55 +05:00
PC-G01 a5e2717f9d Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Sibintel1 2022-08-31 17:06:36 +05:00
PC-G01 0046ad9da6 с небес на землю 2022-08-31 17:06:24 +05:00
GRAFF 1c37dd9fc3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Meshes/Exterior/Main/SM_Masharov_GP3_v2.uasset
2022-08-31 16:57:44 +05:00
GRAFF 26f8dbdfbc asd 2022-08-31 16:56:53 +05:00
JohnnyHatchet 831bc27b25 Окна ГП3 + подрезка генплана под дома 2022-08-31 16:43:29 +05:00
GRAFF 3471fbc080 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-08-31 13:53:00 +05:00
GRAFF e932338ee9 новые звуки, лифты, анимБПхи новые 2022-08-31 13:49:12 +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-G01 9cbc5ff136 менее топроные анимации 2022-08-30 19:57:10 +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