Commit Graph

862 Commits

Author SHA1 Message Date
PRAyMU e00a115330 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-30 03:15:31 +05:00
PRAyMU f1791dc581 NS_Flame_BigCamin 2023-08-30 03:15:14 +05:00
PC-G04 5f846b257e Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-29 18:19:32 +05:00
PC-G04 3eee3f1c20 ярд, фасады материал эмиссива 2023-08-29 18:19:23 +05:00
Dron 2f0457d450 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-29 18:08:28 +05:00
Dron ea65261f93 mops and prlx 2023-08-29 18:08:26 +05:00
PC-G09 90ddb37b05 Night Light + Cars 2023-08-29 17:15:51 +05:00
PC-G04 7d9cc5fec1 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-29 17:01:48 +05:00
PC-G04 b237fe4b95 yard 2023-08-29 17:01:40 +05:00
PC-G13 ae41a5ab18 с 2023-08-29 16:22:33 +05:00
PC-G13 943aa63d90 eshe kaminov, bake, parking gp7 bake, krushki vozmojno 2023-08-29 15:57:43 +05:00
Dron 62a35a72ab Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-29 12:37:01 +05:00
Dron 720aa6955c videoKek 2023-08-29 12:36:57 +05:00
PC-G09 8f38aed32a generator 2023-08-29 12:31:00 +05:00
PC-G09 389a3efa73 Nanite 2023-08-29 11:49:46 +05:00
PC-G09 cd02ffe4d8 Фикс дорог 2023-08-29 08:57:09 +05:00
Dron 60c3f27033 navi, parallax se1, bugs, new search 2023-08-29 01:21:40 +05:00
PRAyMU 14ababcfc2 L_Flame_Test 2023-08-28 23:32:29 +05:00
PRAyMU 9b2ad3975e Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP7/Se02/F11-12/Furniture/S7_Se02_F12_A14_fur.umap
2023-08-28 23:19:21 +05:00
PRAyMU 710e2f5a9b BP_Flame_Biocamine 2023-08-28 23:18:32 +05:00
PC-G13 222d476ae4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-28 20:10:59 +05:00
PC-G13 48b33afbca cuminas 2023-08-28 20:10:50 +05:00
PC-G04 e005640724 ФасадГп3С3, ярд, билдингс 2023-08-28 20:04:34 +05:00
PC-G04 5684087168 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-28 18:54:32 +05:00
PC-G04 a05ca5231e ярд карс 2023-08-28 18:54:26 +05:00
Dmitry 0bd1749833 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-28 14:25:54 +05:00
Dmitry 2b9a52c44e Fix_PointMapsPosition 2023-08-28 14:25:41 +05:00
PC-G04 9eabb91ba0 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-28 14:15:11 +05:00
PC-G04 37f9cafd90 Ярд, карс 2023-08-28 14:15:06 +05:00
Dmitry 745b67aed0 FixUpRedirectors 2023-08-28 14:08:45 +05:00
Dmitry 8744badcb6 Rename_PointsMap 2023-08-28 14:03:06 +05:00
PC-G04 dd854722ea Ярд 2023-08-28 12:00:46 +05:00
Dmitry 1ae04b3067 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Blueprints/UI/Actors/FlatPoint.uasset
2023-08-25 20:03:07 +05:00
PC-G04 8f16c34641 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-25 20:02:08 +05:00
PC-G04 22ff65b730 landscape,yard.buildings 2023-08-25 20:01:56 +05:00
Dmitry 81760752bd FlatAndNaviPoints 2023-08-25 20:01:02 +05:00
PC-G13 af6eb89f1a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/Parking/Parking_GP7.umap
2023-08-25 19:58:44 +05:00
PC-G13 82aff8c323 inter 2023-08-25 19:57:21 +05:00
PC-G12 4c14b335ad Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-25 19:51:15 +05:00
PC-G12 acb5d980a9 rds 2023-08-25 19:51:09 +05:00
Dron 5d68813fe9 parking points 2023-08-25 14:14:13 +05:00
PC-G04 e82ad66f06 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Masharov_Yard.umap
2023-08-25 12:11:52 +05:00
PC-G04 9c7ef5f6ec Yard 2023-08-25 12:06:23 +05:00
Dron 7f8f4702ab fasadhide fix 2023-08-24 19:53:37 +05:00
Dron 6fb9c64c7d ghoster fix, normals fix 2023-08-24 19:34:39 +05:00
Dron 7124170ce2 some ass 2023-08-24 13:12:30 +05:00
PC-G04 b54be07191 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-24 12:38:39 +05:00
PC-G04 f8d3250b27 лендскейп, ярд. буилдинг 2023-08-24 12:38:20 +05:00
PC-G13 ad63324961 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-23 16:41:56 +05:00
PC-G13 44ea14ab1d int 2023-08-23 16:41:51 +05:00