Commit Graph

346 Commits

Author SHA1 Message Date
PC-G12 2e1d140d22 upd 2022-07-28 16:58:49 +05:00
PC-G12 6fd687a78f TerraceUpdate_and_Ladder 2022-07-28 16:53:43 +05:00
PC-G01 8643acd05a merge 2022-07-19 13:13:28 +05:00
PC-G01 58eeaab4f4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Sibintel1
# Conflicts:
2022-07-19 13:12:12 +05:00
PC-G01 4a837808d4 Перезалитые анимации с 30 фпс 2022-07-19 13:09:43 +05:00
GRAFF 03d6fe58d3 Натянул низких мужиков на скелет male 180 со скейлом 0,95 2022-07-19 12:13:55 +05:00
GRAFF 8cf2b4eb37 много всякого КАЛАА 2022-07-19 04:08:57 +05:00
JohnnyHatchet 2d1b29ef71 RT Glass huyas 2022-07-18 19:30:46 +05:00
JohnnyHatchet 8ffd07acdc RT Glass 2022-07-18 19:27:03 +05:00
JohnnyHatchet b71a2e11a6 Трава на крышу и стелобат 2022-07-18 19:01:22 +05:00
JohnnyHatchet cf2f030b76 Окна, в соседнем дворе 2022-07-18 17:42:48 +05:00
JohnnyHatchet cc5e5b387d Подрезка домов 2022-07-18 16:42:34 +05:00
PC-G12 c4d2f824d7 Stupenka and level with yard car spline 2022-07-18 15:51:40 +05:00
JohnnyHatchet 745023cf6e Зеленушка 2022-07-18 08:40:17 +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 6b12c5943c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-07-16 22:00:14 +05:00
GRAFF 567e7c29ec caps 2022-07-16 21:49:55 +05:00
GRAFF 11f61c23a9 комерс 2022-07-16 17:27:33 +05:00
GRAFF 51b844e209 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Maps/Masharov_Buildings.umap
#	Content/Meshes/Exterior/Main/SM_Masharov_GP1_pos.uasset
#	Content/Meshes/Exterior/Main/SM_Masharov_GP2_pos.uasset
2022-07-15 20:42:11 +05:00
GRAFF c122da9464 всякое 2022-07-15 20:41:39 +05:00
PC-G12 51d0bd9857 GP1_GP2_CommerceWindows_Material_Add 2022-07-15 20:07:00 +05:00
GRAFF e60568e598 cummerce 2022-07-15 18:43:26 +05:00
GRAFF 6940f381ca cummerce 2022-07-15 16:05:51 +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
GRAFF b26775b64c УФФФ 2022-07-15 15:12:09 +05:00
PC-G12 7a21e4d562 crz 2022-07-15 12:22:13 +05:00
PC-G12 4be5032a48 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-14 19:48:01 +05:00
PC-G12 91a79bf9d3 numbers 2022-07-14 19:47:55 +05:00
JohnnyHatchet d2c761db63 Landscape_v2 2022-07-14 19:13:17 +05:00
GRAFF 161c10d699 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-14 17:01:33 +05:00
GRAFF 26f9b1992c f2full+mops 2022-07-14 17:00:18 +05:00
PC-G12 a49c070071 Fd 2022-07-14 15:46:24 +05:00
GRAFF 345bee16cc lsofa_01 2022-07-13 22:24:17 +05:00
GRAFF e925269d96 Revert "S02_Collision"
This reverts commit 7c07922e99.
2022-07-13 22:21:26 +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
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