EgorSuv/SibIntel1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,071 Commits 4 Branches 2 Tags
40622d347c15de0747cc2be7880356c9432d8a21
Commit Graph

600 Commits

Author SHA1 Message Date
PC-G13 40622d347c parking 2024-05-02 13:46:58 +05:00
PC-G04 406529d54a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 
# Conflicts:
#	Content/Maps/Interior/GP7/Se01/F11-12/Walls/S7_Se01_F11-12_A00_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F02-05_A02_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F02-05_A10_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F02-10_A05_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F02-10_A06_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F02-10_A09_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F06-08_A07_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F06-08_A12_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F09-10_A08_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F09-10_A11_walls.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-03_06-07_A05_walls.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-03_A02_walls.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-03_A03_walls.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-03_A06_walls.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-05_A00_walls.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-08_A01_walls.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F09_A07_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A02_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A03_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A04_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A05_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A06_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A07_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F13_A08_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F13_A09_walls.umap
 2024-04-19 19:10:10 +05:00
PC-G04 c0cc21a0a9 коты/кошки и материал лендскейпа 2024-04-19 19:02:44 +05:00
PC-G13 af198e21a5 walls, mops, lamps 2024-04-19 15:05:13 +05:00
PC-G13 ab3bdcac06 bp_lamp, int mats, meshes 2024-04-18 18:24:21 +05:00
PC-G13 61bd7de0c9 p2 2024-04-17 19:49:28 +05:00
PC-G13 a70c8c0e84 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 
# Conflicts:
#	Content/Maps/Interior/GP9/F03-20_22/Furniture/S9_Se01_F03-09_A01_fur.umap
#	Content/Maps/Interior/GP9/F03-20_22/Furniture/S9_Se01_F03-19_A06_fur.umap
#	Content/Maps/Interior/GP9/F03-20_22/Furniture/S9_Se01_F10-13_A11_fur.umap
#	Content/Maps/Interior/GP9/F03-20_22/Furniture/S9_Se01_F10-19_A14_fur.umap
#	Content/Maps/Interior/GP9/F03-20_22/Furniture/S9_Se01_F16-19_A17_fur.umap
#	Content/Maps/Interior/GP9/F03-20_22/Furniture/S9_Se01_F16-19_A18_fur.umap
#	Content/Maps/Interior/GP9/F03-20_22/Walls/S9_Se01_F20_A24_walls.umap
#	Content/Maps/Interior/GP9/F03-20_22/Walls/S9_Se01_F22_A38_walls.umap
#	Content/Maps/Interior/GP9/MOPs/S9_Se01_F03-09_MOP.umap
#	Content/Maps/Interior/GP9/MOPs/S9_Se01_F10-13_MOP.umap
#	Content/Maps/Interior/GP9/MOPs/S9_Se01_F14-15_MOP.umap
#	Content/Maps/Interior/GP9/MOPs/S9_Se01_F16-19_MOP.umap
#	Content/Maps/Interior/GP9/MOPs/S9_Se01_F20_22_MOP.umap
#	Content/Maps/Interior/GP9/MOPs/S9_Se01_F21_MOP.umap
#	Content/Maps/Interior/GP9/MOPs/S9_Se01_F23_MOP.umap
 2024-04-17 00:12:35 +05:00
PC-G13 8343c9dc64 ssd kaput temp commit 2024-04-17 00:07:00 +05:00
Dron 568cf76228 sshhhit 2024-04-15 01:20:26 +05:00
PC-G13 c72f3a9529 yard meshes fix, caps 2024-04-12 20:26:58 +05:00
PC-G13 eaee5abacc baked 2024-03-29 14:01:44 +05:00
PC-G13 20f022b18d bake, terassu 2024-03-28 13:13:49 +05:00
PC-G13 b1d677db72 mops, int, terasses, caps, + fasadhide in shaiders 2024-03-27 12:42:38 +05:00
PC-G13 586d40ba2c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2024-03-26 14:23:31 +05:00
PC-G13 51053c0e90 int + mops baked 2024-03-26 14:23:28 +05:00
PC-G11 e5b1d70db6 S9 A13 A14 2024-03-26 11:19:18 +05:00
PC-G11 6cf308d4c9 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2024-03-22 17:09:35 +05:00
PC-G11 396a41ecc2 Parking_GP9_GP2 2024-03-22 17:09:19 +05:00
PC-G13 49088da5ff Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2024-03-22 14:19:14 +05:00
PC-G13 56a8609e27 gp9 int, windows 2024-03-22 14:19:11 +05:00
PC-G04 3c591570ec S9A08 2024-03-20 15:38:52 +05:00
PC-G04 8c0f7eff79 a07 2024-03-19 19:29:52 +05:00
PC-G04 b783076c3d S9_A06 2024-03-18 20:41:27 +05:00
PC-G13 1c809f7936 plinths 2024-03-18 17:41:39 +05:00
PC-G13 f637a2f500 leroooooy masharo-ov 2024-03-18 16:40:51 +05:00
PC-G13 e9083e75fe Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2024-03-18 13:42:13 +05:00
PC-G13 bec348848b gp9mops 2024-03-18 13:42:11 +05:00
PC-G04 50e5740e53 bruh 2024-03-15 18:30:29 +05:00
PC-G04 2b72a2aad1 Машаааааров ярд, лендскейп, фасад 2024-03-15 18:22:40 +05:00
PC-G04 99d5342dce ФасадГп9 2024-03-15 16:57:45 +05:00
PC-G04 265e9b0200 МАФы 2024-03-14 19:55:09 +05:00
PC-G04 65627dfde6 MAFs, Yrad, GP9 floor 2024-03-14 18:44:39 +05:00
PC-G13 123e97354d gp9, yard+mops, 2024-03-14 13:51:34 +05:00
Dron 20849d7f63 fix parking, udate a09 2023-12-29 21:40:43 +05:00
PC-G04 3804dedfdd Квартира А09 в 3 секции, терассса, фасады 2023-12-29 17:59:08 +05:00
Dron 5f6c8ff43f ФФФФФФФФВАААААААААА 2023-09-30 00:34:34 +05:00
Dron 25ef1fc0a9 aaa 2023-09-26 18:39:12 +05:00
PC-G09 d56db7a713 Vneshka 2023-09-20 13:50:08 +05:00
PC-G09 0c6785d86c Vneshka 2023-09-17 20:18:13 +05:00
Dron 4d3e876cff wdf 2023-09-11 21:20:26 +05:00
Dron 9ecac316c6 pizda kak mnogo vsyakogo 2023-09-07 22:46:42 +05:00
PC-G04 0898cb4fb4 6 2023-09-07 18:20:25 +05:00
PC-G04 61d9fb9312 МОПы ГП7, Здание Машарова ГП2 2023-09-07 17:57:08 +05:00
PC-G04 daf124d33b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-09-06 20:57:08 +05:00
PC-G04 6eaf50a80e Кэпы ГП7 в фасады 2023-09-06 20:57:01 +05:00
PC-G13 720082d047 parking gp7, building gp2 2023-09-06 20:00:16 +05:00
PC-G04 f5fbe4df3d Паркинг ГП7 2023-09-06 19:32:57 +05:00
PC-G04 02e89593a4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 
# Conflicts:
#	Content/Maps/Landscape_Remake.umap
#	Content/Maps/Masharov_Yard.umap
 2023-09-06 17:46:13 +05:00
PC-G04 c7b3c86cd0 Под ГП7 2023-09-06 17:45:52 +05:00
PC-G13 c0b7809a31 yard, landscape 2023-09-06 16:47:30 +05:00