1133 Commits

Author SHA1 Message Date
PC-G13 ff70671d22 pravpn'ki 2024-05-31 19:49:59 +05:00
Dron e3c19a6ff8 fixes 2024-05-22 17:57:49 +05:00
PC-G13 2208e5f0be some fixes 2024-05-15 18:14:49 +05:00
Dron 1d423afda0 elevators 2024-05-09 14:01:08 +05:00
Dron 58667a6db5 cars, some else 2024-05-09 00:28:47 +05:00
Dron 48881a3d87 some shit 2024-05-08 14:50:53 +05:00
PC-G04 1d34a1dac2 всякие правки интерьерные 2024-05-08 14:40:32 +05:00
PC-G04 f566fe7971 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2024-05-08 13:40:05 +05:00
PC-G04 8771cee5b8 Крышки и дверь в МОП 2024-05-08 13:39:59 +05:00
Dron 7df3b333f5 da blyat ya ne mogu 2024-05-08 13:02:00 +05:00
Dron 56400e90cd many stuff 2024-05-07 14:53:29 +05:00
Dron 9665402f53 sky control adopt, interior lighting fixes 2024-05-03 00:06:02 +05:00
PC-G13 40622d347c parking 2024-05-02 13:46:58 +05:00
PC-G04 6a7ac42062 Котики в квартирах 2024-04-19 19:25:03 +05:00
PC-G04 26f517b7fe pedro pedro OSM 2024-04-19 19:19:22 +05:00
PC-G13 5118b5099d Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F02-08_A00_fur.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F02-08_A01_fur.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F02-10_A02_fur.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F02-10_A03_fur.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F02-10_A04_fur.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F02-10_A05_fur.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F02-10_A06_fur.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F09-10_A07_fur.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F11-12_A02_fur.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F11-12_A05_fur.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F11-12_A06_fur.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F11-12_A07_fur.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F11-13_A03_fur.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F11-13_A04_fur.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F13_A08_fur.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F13_A09_fur.umap
2024-04-19 19:12:11 +05:00
PC-G13 3d1f413931 forest_far 2024-04-19 19:11:32 +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 aa59df1e51 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2024-04-19 15:05:20 +05:00
PC-G13 af198e21a5 walls, mops, lamps 2024-04-19 15:05:13 +05:00
Dron ef8384ca79 5.3 new sky, dynamic lamps (need setup instances), new plugins 2024-04-18 21:06:31 +05:00
Dron 45cc93bda0 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/mainScene.umap
2024-04-18 19:23:24 +05:00
Dron 1a0437f848 maket online 2024-04-18 19:21:54 +05:00
PC-G13 805213846b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2024-04-18 18:47:00 +05:00
PC-G13 1d4f2e0578 5.3 2024-04-18 18:46:57 +05:00
PC-G04 e78e825ce0 Мигрейт котов 2024-04-18 18:28:11 +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 3ef5e68765 p1 2024-04-17 19:48:09 +05:00
PC-G13 c3bfba9fe7 mda 2024-04-17 15:52:24 +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 9213c4fa57 maket socket 2024-04-16 19:52:04 +05:00
Dron 8ad7c2e9e6 parallax,elevators, utp 2024-04-15 21:17:22 +05:00
Dron 568cf76228 sshhhit 2024-04-15 01:20:26 +05:00
Dron 7267cd9894 gp9 online 2024-04-13 22:39:43 +05:00
PC-G13 c72f3a9529 yard meshes fix, caps 2024-04-12 20:26:58 +05:00
Dron abcc890d6b lifts, someshit 2024-04-11 19:27:57 +05:00
Dron 0f6891035b triggers 2024-04-09 23:25:14 +05:00
PC-G13 eaee5abacc baked 2024-03-29 14:01:44 +05:00
PC-G13 1cdac1a2e6 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2024-03-28 13:14:08 +05:00
PC-G13 20f022b18d bake, terassu 2024-03-28 13:13:49 +05:00
PC-G11 6a64126a69 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2024-03-28 12:46:03 +05:00
PC-G11 03c86721c1 A17-20 A26-29 Windows 2024-03-28 12:45:59 +05:00
NIK 0317885518 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2024-03-27 19:05:49 +05:00
NIK 20b4a0e2b7 S9_F21-23_Points 2024-03-27 19:05:46 +05:00
PC-G11 4b78769371 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2024-03-27 18:23:10 +05:00
PC-G11 031fc03983 A07-10 Windows 2024-03-27 18:23:04 +05:00
NIK edb581d3fa Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2024-03-27 17:27:55 +05:00