EgorSuv/SibIntel1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
892 Commits 4 Branches 2 Tags
c55fbacd3f1c3e4e7e16c07a8a3dd643b1f77efe
Commit Graph

135 Commits

Author SHA1 Message Date
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
PC-G04 da99f1ef5b пипл, лендскейп(у театра подняла скамейки с людьми), коллизии в двух хатах 2023-08-31 01:11:40 +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
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-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
Dron ea65261f93 mops and prlx 2023-08-29 18:08:26 +05:00
PC-G13 943aa63d90 eshe kaminov, bake, parking gp7 bake, krushki vozmojno 2023-08-29 15:57:43 +05:00
Dron 60c3f27033 navi, parallax se1, bugs, new search 2023-08-29 01:21:40 +05:00
PC-G13 48b33afbca cuminas 2023-08-28 20:10:50 +05:00
Dmitry 2b9a52c44e Fix_PointMapsPosition 2023-08-28 14:25:41 +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
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
Dmitry 81760752bd FlatAndNaviPoints 2023-08-25 20:01:02 +05:00
PC-G13 82aff8c323 inter 2023-08-25 19:57:21 +05:00
PC-G13 44ea14ab1d int 2023-08-23 16:41:51 +05:00
PC-G13 e2467e08dc pravkiinterior 2023-08-21 19:50:31 +05:00
PC-G13 489876b0b4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 
# Conflicts:
#	Content/Maps/Interior/GP7/Se02/F11-12/Furniture/S7_Se02_F11-12_A06_fur.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Furniture/S7_Se02_F11_A00_fur.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Furniture/S7_Se02_F11_A05_fur.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Furniture/S7_Se02_F11_A08_fur.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Furniture/S7_Se02_F11_A09_fur.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Furniture/S7_Se02_F11_A11_fur.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Furniture/S7_Se02_F12_A03_fur.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Furniture/S7_Se02_F12_A04_fur.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Furniture/S7_Se02_F12_A13_fur.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Walls/S7_Se02_F11-12_A06_walls.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Walls/S7_Se02_F11_A00_walls.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Walls/S7_Se02_F11_A05_walls.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Walls/S7_Se02_F11_A08_walls.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Walls/S7_Se02_F11_A09_walls.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Walls/S7_Se02_F12_A04_walls.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Walls/S7_Se02_F12_A13_walls.umap
 2023-08-17 14:01:08 +05:00
PC-G13 503162a6ad int fixes 2023-08-17 13:59:58 +05:00
PC-G06 e92399698c S7_Se02_F11-12 Хаты 2023-08-15 18:31:55 +05:00
PC-G04 e8dfb34174 и 2023-08-15 12:19:34 +05:00
PRAyMU cbefec3873 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-14 21:31:37 +05:00
PRAyMU 910e8bda5b S7_Se02_F12_A13 2023-08-14 21:19:27 +05:00
PC-G12 03fddaabe7 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-14 19:39:21 +05:00
PC-G12 882c4cc7f4 mps 2023-08-14 19:39:15 +05:00
PC-G06 b6cb55ce7e Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-14 17:25:37 +05:00
PC-G06 a5f289a5e2 S7_Se02 Хаты 2023-08-14 17:25:30 +05:00
PC-G13 1d0c2e851b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-14 15:22:46 +05:00
PC-G13 d84da5b7d6 a09se03 2023-08-14 15:22:41 +05:00
PC-G12 d622542fc6 mps 2023-08-14 13:53:29 +05:00
Dron 17024224d2 some shit 2023-08-13 23:34:59 +05:00
PC-G04 5f67aece39 айдишник гп3, говно в мопах и шкафы в квартире удалила 2023-08-13 22:07:48 +05:00
PC-G04 7c6212d7b6 Назначила материалы 
Проверила МОП1 секции
 2023-08-12 19:55:28 +05:00
PC-G06 53067b1a60 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-11 19:52:43 +05:00
PC-G06 132ecdee01 S7_Se02 Хаты A10-A11 2023-08-11 19:52:29 +05:00
PC-G12 7f1f45fac4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 
# Conflicts:
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-03_A03_walls.umap
 2023-08-11 19:44:50 +05:00
PC-G12 473ea6fcce MPs 2023-08-11 19:44:10 +05:00
PC-G13 db1d946faa Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-11 19:31:26 +05:00
PC-G13 9acd0ee966 a09, baked mops se01 2023-08-11 19:31:07 +05:00
PC-G04 ec84251111 Дверные проёмы для МОПов 2023-08-11 19:27:48 +05:00
PC-G04 987451aaa2 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 
# Conflicts:
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-08_A01_walls.umap
 2023-08-11 18:10:39 +05:00
PC-G04 db0e645956 Se03 Interiors 2023-08-11 18:01:34 +05:00
PC-G06 f8d628753a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-11 15:34:26 +05:00
PC-G06 a063206afa S7_Se02 Хаты 2023-08-11 15:33:04 +05:00
PC-G13 4dd33bc0b2 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-11 15:27:43 +05:00