Commit Graph

510 Commits

Author SHA1 Message Date
PC-G13 c849d198fc groupe 2023-08-03 13:52:58 +05:00
PC-G13 d1c3aeed57 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-03 13:03:46 +05:00
PC-G13 5ff6e4a94e int 2023-08-03 13:03:28 +05:00
PC-G12 4c8a914426 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-03 12:07:09 +05:00
PC-G12 b618e5b966 mps 2023-08-03 12:07:04 +05:00
Dron d9570faa39 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-02 20:58:14 +05:00
Dron c70d0d963c triggers 2023-08-02 20:58:03 +05:00
PC-G04 f8cbb6e344 МОПы 2023-08-02 20:40:53 +05:00
PC-G04 6488918ff9 правкии 2023-08-02 19:56:02 +05:00
PC-G12 74d95748e4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-02 19:33:08 +05:00
PC-G12 ad30910f2d Mps 2023-08-02 19:33:02 +05:00
PC-G04 5a8e668e74 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP7/Se01/F02-10/MOPs/S7_Se01_F01_mops.umap
2023-08-02 19:31:53 +05:00
PC-G04 fd6202ca74 Правки по левелам 2023-08-02 19:29:10 +05:00
PC-G12 a15df65f11 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-02 17:38:29 +05:00
PC-G12 5085b12913 MPS 2023-08-02 17:38:20 +05:00
PC-G09 eef5ff969b Landscape New 2023-08-02 16:01:29 +05:00
Dron 6139ef2557 asd 2023-08-02 15:59:11 +05:00
PC-G13 18ffd8376c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-02 12:24:22 +05:00
PC-G13 ea574ab63e int tweaks 2023-08-02 12:24:17 +05:00
PC-G12 6a9ca54634 mps 2023-08-02 12:00:28 +05:00
PC-G12 bc3e492d8b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-01 19:47:01 +05:00
PC-G12 9d06c8fd7d MPS2 2023-08-01 19:46:57 +05:00
PRAyMU 071796360c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Materials/Masharov_Interior/Palette/MI_Wall_Bedroom_Matte_Bordo_Plintus.uasset
2023-08-01 19:01:09 +05:00
PC-G12 8420055699 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-01 18:56:25 +05:00
PC-G12 450e12ded3 mps 2023-08-01 18:54:56 +05:00
PRAyMU 5f31e90b82 Test_Room_GP3_Part_1 2023-08-01 18:53:07 +05:00
PC-G04 11d8190864 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-01 18:04:46 +05:00
PC-G04 9419683203 dodelki 1 sekciya 7GP 2023-08-01 18:02:33 +05:00
PC-G09 d73304a055 Landscape remake 2023-08-01 16:43:58 +05:00
PC-G13 86ae3bca6a 1 2023-08-01 15:14:28 +05:00
PC-G13 50758401b5 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-01 14:51:34 +05:00
PC-G13 b714583c2b fasades 2023-08-01 14:50:57 +05:00
PC-G04 620ec34045 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP7/Se01/MOPs/S7_Se01_F01_mops.umap
2023-08-01 14:09:28 +05:00
PC-G04 4f95d27d81 S07 и все секции с внутрянкой с настроенными коллизиями 2023-08-01 13:58:28 +05:00
PC-G12 11c67ae985 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-01 13:20:45 +05:00
PC-G12 29b5221ca0 MPS 2023-08-01 13:20:38 +05:00
PC-G13 4e8b0e7a9d pr.kucha 2023-08-01 13:15:39 +05:00
PC-G04 3fb7ce32ad TestRoomGP7 2023-07-25 14:24:38 +05:00
PC-G04 1b8c073349 Change levels GP7 2023-07-25 14:13:38 +05:00
PC-G04 e1a52998f4 LevelsGP7 2023-07-20 12:57:18 +05:00
GRAFF 7d61309af9 поинт переименовал 2023-03-22 12:44:41 +05:00
GRAFF 6bb34197d0 интерьеры новые встроены 2023-03-22 12:39:43 +05:00
PC-G13 90a1531b25 F02 rename 2023-03-15 20:12:39 +05:00
PC-G13 48b2c0e741 terASSes 2023-03-14 14:38:06 +05:00
PC-G13 58e206ddb8 masharov F2-4 2023-03-10 19:42:43 +05:00
GRAFF fb8b961998 правочки еще 2023-01-24 18:06:07 +05:00
GRAFF 3cbe4f7080 добавил фреймрейт 2022-11-28 14:51:46 +05:00
PC-G01 38b475eb27 Читатльный клуб понерфили :( 2022-11-21 17:35:22 +05:00
PC-G01 56f8964caf ходят вокруг домов 2022-11-17 17:39:54 +05:00
GRAFF 39a77e3c15 всё кроме пары 2022-11-17 15:14:09 +05:00