Commit Graph

853 Commits

Author SHA1 Message Date
PC-G09 cb61751ede Landscape 2023-08-31 03:27:14 +05:00
PC-G09 17b657b9f2 Outside fix 2023-08-31 03:06:40 +05:00
Dron 8643ca91e2 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-31 01:43:46 +05:00
Dron bf6d377abf ввв 2023-08-31 01:43:40 +05:00
Dmitry b291d3e7d2 PeopleBABa 2023-08-31 01:43:20 +05:00
PC-G09 241a79abe2 Nightlight 2023-08-31 01:27:55 +05:00
PC-G04 da99f1ef5b пипл, лендскейп(у театра подняла скамейки с людьми), коллизии в двух хатах 2023-08-31 01:11:40 +05:00
Dron 2feea6d21a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Masharov_Nightlight.umap
2023-08-30 23:11:16 +05:00
Dron 3c45d84feb asdasdasd 2023-08-30 23:10:04 +05:00
PC-G09 439afcc8f1 NightLight 2023-08-30 22:50:14 +05:00
Dron cd3c53a7bf Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-30 22:40:41 +05:00
Dron ba55db4590 asd 2023-08-30 22:40:39 +05:00
PC-G04 afc9d2dd1e Пипл 2023-08-30 22:37:52 +05:00
PC-G04 39f07b70c3 фасады окна 2023-08-30 19:30:23 +05:00
PC-G04 852ce65d40 Карс,ярд 2023-08-30 19:03:23 +05:00
Dron 1201b80310 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-30 17:24:46 +05:00
Dron 4904a5e578 full parallax, search, points 2023-08-30 17:24:44 +05:00
PC-G04 be7df1d8e2 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-30 16:54:57 +05:00
PC-G04 481b55dd32 YARD 2023-08-30 16:54:51 +05:00
Dmitry da59b01412 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP7/Se03/Points/S07_Se03_F2-12P.umap
#	Content/Maps/Interior/GP7/Se03/Points/S07_Se03_F2-8P.umap
#	Content/Maps/Interior/GP7/Se03/Points/S07_Se03_F9-12P.umap
2023-08-30 15:24:21 +05:00
Dmitry 039ea20627 Fix_Point_Se03 2023-08-30 15:23:09 +05:00
Dron cf7a5f6fb7 aaa 2023-08-30 15:18:55 +05:00
PC-G04 7b53069cb2 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-30 13:54:04 +05:00
PC-G04 cd9cf7458a Ярд,карс 2023-08-30 13:53:57 +05:00
PC-G13 2b43fd61e6 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP7/Se02/F01-10/MOPs/S7_Se02_F02-05_mops.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/MOPs/S7_Se02_F06-10_mops.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/MOPs/S7_Se02_F11_mops.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/MOPs/S7_Se02_F12_mops.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/MOPs/S7_Se03_F02-10_mop.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/MOPs/S7_Se03_F11-12_mops.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/MOPs/S7_Se03_F13_mops.umap
2023-08-30 13:46:07 +05:00
PC-G13 2c1715ee2a mops 2023-08-30 13:44:08 +05:00
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