Commit Graph

311 Commits

Author SHA1 Message Date
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
PC-G06 8eb4afe5fe Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-13 20:29:54 +05:00
PC-G06 7c07922e99 S02_Collision 2022-07-13 20:29:20 +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 a0d98a39d7 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-07-13 18:16:12 +05:00
JohnnyHatchet 3b1652b579 Окна + ограждение остальных ГП коммерция 2022-07-13 18:10:25 +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
GRAFF f49c40ecd8 bp_tochannel2_someprobes_someshitaswell 2022-07-13 17:11:33 +05:00
JohnnyHatchet 231aab80ad равки по цветам матов на крыше + детская площадка 2022-07-13 16:53:30 +05:00
PC-G12 bf89e86b81 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-13 16:06:12 +05:00
PC-G12 c381a67a9d mps 2022-07-13 16:05:40 +05:00
GRAFF a9f5d37d0c Низкорослые мужички 2022-07-13 15:08:42 +05:00
GRAFF 79ba064d8a Sveta 2022-07-13 14:55:57 +05:00
GRAFF a4c315d634 bake 2022-07-13 14:46:41 +05:00
GRAFF a678643b9d ммммм, кусные рамы входных дверей 2022-07-13 02:19:57 +05:00
GRAFF 876a3883c8 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-12 20:49:23 +05:00
GRAFF d3b2961b68 волюметрики 2022-07-12 20:49:10 +05:00
PC-G06 7154facfbb S02_Door_Lameli_Plintuth 2022-07-12 19:46:33 +05:00
PC-G06 6fdb1727a4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-12 18:51:29 +05:00
PC-G06 68bb998a92 S02_A00-A21_Door 2022-07-12 18:47:39 +05:00
PC-G12 ac47b0eec9 Doorz 2022-07-12 18:34:50 +05:00
PC-G12 8713a0848b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-12 17:35:55 +05:00
PC-G12 65aa0f5599 1 2022-07-12 17:35:43 +05:00
GRAFF ea6a083a45 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP2/S02A24.umap
2022-07-12 17:34:44 +05:00
GRAFF 8130cf2685 probes_tvvidos 2022-07-12 17:34:31 +05:00
PC-G06 2d91b20b5b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-12 17:05:48 +05:00
PC-G06 dd670a8749 S02_Wall_Mat 2022-07-12 17:05:41 +05:00
JohnnyHatchet c7266d640c Новые мафы 2022-07-12 16:43:32 +05:00
PC-G12 475992d573 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-12 16:02:05 +05:00
PC-G12 2c3dc8d20f 34-22 2022-07-12 16:01:51 +05:00
JohnnyHatchet d655d381ca Бордюры, фикс тройных деревьев, изменение в ярде 2022-07-12 15:55:20 +05:00
GRAFF 64e622aab1 угу 2022-07-12 05:35:56 +05:00
GRAFF 7a13be35ca уфффф 2022-07-12 05:34:44 +05:00
GRAFF 55f7eab422 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-07-12 04:43:53 +05:00
GRAFF 483eaeb472 уф 2022-07-12 04:43:38 +05:00
JohnnyHatchet 1e8a7ed6f0 Реимпорт фасада ГП2 с открытой входной, подсветка в бп (над вырубать ее или скрывать днем) 2022-07-12 03:48:34 +05:00
JohnnyHatchet 65b0b79a5a Nightlight main buildings 2022-07-12 03:13:06 +05:00
JohnnyHatchet 1d8ef47a20 Nightlight 2022-07-11 23:47:28 +05:00
GRAFF 1130ed211e koliza 2022-07-11 21:52:09 +05:00
GRAFF a46610e786 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-11 21:37:53 +05:00
GRAFF 092d8278df F1bake 2022-07-11 21:37:51 +05:00
JohnnyHatchet d70afda8ae Nightlight 2022-07-11 21:07:32 +05:00
GRAFF 8bd9541411 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-11 21:01:54 +05:00
GRAFF 9c1e45253d f1_koliz 2022-07-11 21:01:51 +05:00
PC-G01 33e88c6f2f Пак анимаций 2 2022-07-11 20:38:03 +05:00