Commit Graph

26 Commits

Author SHA1 Message Date
PC-G13 ddf8ac22ca Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/Interior/GP1/MOP/S01/MOP_GP1_S01_F02-08.umap
#	Content/Maps/Interior/GP1/MOP/S01/MOP_GP1_S01_F02.umap
#	Content/Maps/Interior/GP1/MOP/S02/MOP_GP1_S02_F02-08.umap
#	Content/Maps/Interior/GP1/MOP/S02/MOP_GP1_S02_F02.umap
#	Content/Maps/Interior/GP1/MOP/S03/MOP_GP1_S03_F02-08.umap
#	Content/Maps/Interior/GP1/MOP/S03/MOP_GP1_S03_F02.umap
#	Content/Maps/Interior/GP1/MOP/S04/MOP_GP1_S04_F02-08.umap
#	Content/Maps/Interior/GP1/MOP/S04/MOP_GP1_S04_F02.umap
#	Content/Maps/Interior/GP2/MOP/S01/MOP_GP2_S01_F02-08.umap
#	Content/Maps/Interior/GP2/MOP/S01/MOP_GP2_S01_F02.umap
#	Content/Maps/Interior/GP2/MOP/S02/MOP_GP2_S02_F02-08.umap
#	Content/Maps/Interior/GP2/MOP/S02/MOP_GP2_S02_F02.umap
#	Content/Maps/Interior/GP2/MOP/S03/MOP_GP2_S03_F02-08.umap
#	Content/Maps/Interior/GP2/MOP/S03/MOP_GP2_S03_F02.umap
#	Content/Maps/Interior/GP2/MOP/S04/MOP_GP2_S04_F02-08.umap
#	Content/Maps/Interior/GP2/MOP/S04/MOP_GP2_S04_F02.umap
2023-04-06 00:15:35 +05:00
PC-G13 12910a7cb5 мопснейм 2023-04-06 00:14:32 +05:00
GRAFF 88f371b950 ales 2023-04-05 23:33:53 +05:00
GRAFF 1b81e3ef0b RENAMING, highlights mats, loading shits 2023-04-05 23:31:22 +05:00
PC-G12 01479c0c53 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 21:11:03 +05:00
PC-G12 cd9a426769 4_4 2023-04-05 21:10:46 +05:00
PC-G04 b9d9e7283c Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 20:43:59 +05:00
PC-G04 29a05b2f35 BP_Lamp_KoservaTism 2023-04-05 20:43:43 +05:00
PC-G13 06a71d96a3 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 20:12:07 +05:00
PC-G13 f2130fa05f mops 2023-04-05 20:12:00 +05:00
GRAFF 9e520cbbcc Navigation 2023-04-05 17:56:37 +05:00
PC-G08 1d2bd21cd7 MOPbl 2023-04-05 14:32:15 +05:00
PC-G04 3eb39b4c4f Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 13:01:11 +05:00
PC-G04 0d431cc716 Lamps_Lounge
Interiors
2023-04-05 12:57:01 +05:00
PC-G08 080f4951f3 MopsLightsDoors 2023-04-04 19:20:12 +05:00
PC-G04 e7ff409578 Плинтуса ГП2 2023-04-04 12:53:54 +05:00
PC-G08 53c8aef926 Mops 2023-04-03 19:10:44 +05:00
DESKTOP-8J0BKKD\Admin dc03071d72 Добавление мешей стен в леваки GP2 2023-03-31 19:49:47 +05:00
PC-G08 b390c1922a gp1gp2Mops 2023-03-31 17:51:07 +05:00
PC-G13 dc433e7d8a furniture levels _gp2 2023-03-31 14:43:49 +05:00
PC-G13 7726f57f84 levels 2023-03-22 18:02:01 +05:00
PC-G13 afb9cdd603 FixCall 2023-03-15 18:41:57 +05:00
GRAFF a2c478ba20 крышки, хата, куча кала, в обще +- готово 2023-03-14 03:44:29 +05:00
PC-G13 c4777671fc demoroom 2023-03-13 19:36:56 +05:00
PC-G13 57110fc340 gp2 transforms, demoroom 2023-03-13 18:24:29 +05:00
PC-G13 5fd233c101 zaglushki 2023-03-10 17:40:24 +05:00