148 Commits

Author SHA1 Message Date
GRAFF 58c86e3969 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-09-01 02:53:52 +05:00
GRAFF ad677e529a svet 2022-09-01 02:20:52 +05:00
GRAFF 26f8dbdfbc asd 2022-08-31 16:56:53 +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 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
GRAFF 29b26e20d0 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP3/F19/S03F19A07.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F05-06_A04.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F05-06_A08.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F07-08_A08.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F09-10_A08.umap
#	Content/Meshes/Interior/GP3/Plinth/SM_S03A08_Plintuth.uasset
2022-08-29 14:18:46 +05:00
GRAFF 2b3dc3a2ac gp3_06-08 2022-08-29 14:18:02 +05:00
GRAFF 3046c5e91d всякое 2022-08-29 12:55:17 +05:00
PC-G04 5a1c44b9d9 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-27 16:30:15 +05:00
PC-G04 f91c11767f ИРИНА 2022-08-27 16:29:54 +05:00
GRAFF ce11242e69 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-27 15:49:26 +05:00
GRAFF 637a9e8332 gp3 2022-08-27 15:48:58 +05:00
Igor 617b4a821c F_S03A10 F_S03A05 2022-08-26 18:42:40 +05:00
GRAFF 756e6af75d Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP3/Walls/W_S03F05-06_A06.umap
2022-08-26 14:48:47 +05:00
GRAFF 84f5ef6d28 GP3_mats,a06 2022-08-26 14:48:23 +05:00
PC-G12 77b659f1ff Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-25 19:59:09 +05:00
PC-G12 42835e69d7 MOPs 5 11 16 2022-08-25 19:59:00 +05:00
PC-G06 2b68221bf4 S03A02_Interior 2022-08-25 17:59:43 +05:00
GRAFF 7430813cb7 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP3/Furniture/F_S03A00.umap
2022-08-24 18:25:08 +05:00
GRAFF 6922c73378 gp3 2022-08-24 18:24:33 +05:00
GRAFF 3e1188aa29 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP2/S02F13-16.umap
2022-08-24 15:07:57 +05:00
GRAFF a141f94272 всякое 2022-08-24 15:07:07 +05:00
GRAFF c804ae6996 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-24 12:41:06 +05:00
GRAFF e1f75b852a interiormats, GP2 Mops + volumetric rebaked 2022-08-24 12:41:02 +05:00
JohnnyHatchet deb3d64a5c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-23 12:41:43 +05:00
JohnnyHatchet 5d94bd0607 какие то штуки 2022-08-23 12:36:50 +05:00
GRAFF 6195c4f638 tone 2022-08-22 18:13:36 +05:00
GRAFF 69e06fe92d gp3_tr 2022-08-22 15:49:43 +05:00
GRAFF 593042a336 GP3_Interior 2022-08-22 14:59:53 +05:00
GRAFF bff9ac53f4 smsht 2022-08-15 12:29:17 +05:00
GRAFF 46acf3dcbb еще гора исправлений 2022-08-01 03:27:16 +05:00
GRAFF 84a39b357e правка косячин и еще дополнения 2022-08-01 01:08:07 +05:00
GRAFF 8cf2b4eb37 много всякого КАЛАА 2022-07-19 04:08:57 +05:00
JohnnyHatchet ec92964906 Допил внешки 2022-07-18 08:18:43 +05:00
GRAFF b91b531ea7 вход с 2 этажа, 2этажные переключения, всякое говно еще, тачки катают по светофорам, коллизии 2022-07-18 02:58:05 +05:00
GRAFF aeb09be06a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Maps/Interior/GP2/S02F01.umap
#	Content/Maps/Masharov_cars.umap
2022-07-15 15:14:19 +05:00
JohnnyHatchet d2c761db63 Landscape_v2 2022-07-14 19:13:17 +05:00
GRAFF 26f9b1992c f2full+mops 2022-07-14 17:00:18 +05:00
GRAFF 1db9b2e327 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-07-13 21:17:34 +05:00
GRAFF aa0f17f4ea dasd 2022-07-13 21:16:55 +05:00
GRAFF 9ffab13cff Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-13 19:14:38 +05:00
GRAFF c472fb974e svet_potolokMopaFromF2toF3 2022-07-13 19:14:34 +05:00
GRAFF 777d3030a3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Maps/Masharov_Buildings.umap
#	Content/Maps/Masharov_Landscape.umap
#	Content/Maps/Masharov_Yard.umap
#	Content/Maps/mainScene.umap
2022-07-13 17:53:53 +05:00
GRAFF 56c014b2e2 коллизии всякие, интерфейс, косячки 2022-07-13 17:52:29 +05:00
JohnnyHatchet 18f21f70a2 Фейки поярчее 2022-07-13 17:29:20 +05:00
GRAFF 487e198aa3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-13 17:11:41 +05:00