Commit Graph

143 Commits

Author SHA1 Message Date
GRAFF 65e463a03e вмонтировал паркинг, лифты, интерйес, телепорты в паркинге 2022-09-20 23:12:24 +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 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
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 8740547a84 gp3 2022-09-15 14:33:26 +05:00
GRAFF a6d8966bcb Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-14 22:15:55 +05:00
GRAFF 5d9c6c62d7 gp3ska 2022-09-14 22:15:52 +05:00
DESKTOP-8J0BKKD\Admin 6543b56ba3 Правки GP3 2022-09-14 18:07:20 +05:00
GRAFF 74f1c3a8a8 gp3_bakecheck 2022-09-14 13:28:02 +05:00
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 738da108c1 gp3 2022-09-12 19:38:47 +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 оптимизация тачек, лендскейпа, починки всякие, интерфейс, инкрементный фильтр 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
GRAFF 07e4348772 Fix 1С-2 2022-09-02 12:51:52 +05:00
GRAFF b7d3d38bfa уффффффф 2022-09-01 13:21:32 +05:00
GRAFF c418221cf9 миллиард говна 2022-09-01 05:09:34 +05:00
GRAFF 4032b466f7 всякое 2022-09-01 00:27:33 +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 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 5c18534b05 bake_firstwave 2022-08-31 13:24:03 +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 f520859f81 04-05-09-10-22 2022-08-30 14:23:42 +05:00
GRAFF d60fc65f6b Merge branch 'developer'
# Conflicts:
#	Content/Maps/Interior/GP2/S02F01.umap
2022-08-29 23:19:51 +05:00
GRAFF 2489392f03 ишо всякое 2022-08-29 23:17:36 +05:00
PC-G12 0ef3256d30 00 2022-08-29 20:05:42 +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
PC-G06 cf2e9bb6fe FbBake_S03A15_18_19_Part_1 2022-08-29 17:41:11 +05:00
PC-G12 c612be8cd3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-29 17:27:32 +05:00
PC-G12 473baea758 13_16_17 2022-08-29 17:27:20 +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