Commit Graph

1104 Commits

Author SHA1 Message Date
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
NIK 7bc8e17ba3 S9_Points 2024-03-27 17:27:37 +05:00
PC-G04 a12443d40c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2024-03-27 16:24:44 +05:00
PC-G04 c0ac5ae39c A06 окна 2024-03-27 16:24:40 +05:00
PC-G11 942482d754 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2024-03-27 16:15:46 +05:00
PC-G11 ffc89b1dcc S9 A33 A34 2024-03-27 16:15:42 +05:00
PC-G04 1f4600d9c6 27.28.29 2024-03-27 16:12:28 +05:00
PC-G13 d37eedc593 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2024-03-27 12:42:42 +05:00
PC-G13 b1d677db72 mops, int, terasses, caps, + fasadhide in shaiders 2024-03-27 12:42:38 +05:00
PC-G04 f185f8dc2b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2024-03-27 12:21:35 +05:00
PC-G04 855f664edc a 2024-03-27 12:21:31 +05:00
PC-G11 dd6cf3a59d Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2024-03-27 11:39:45 +05:00
PC-G11 e4bf2b38c2 S9_A47_A48 2024-03-27 11:39:19 +05:00
NIK ec097713d8 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2024-03-26 20:04:50 +05:00
NIK 692644d94e flatData add S9 2024-03-26 20:04:46 +05:00
PC-G04 3b6260bf57 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2024-03-26 19:22:25 +05:00
PC-G04 76ab6b0950 a17 a18 a19 2024-03-26 19:21:50 +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-G04 f4257d5a09 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2024-03-22 15:56:29 +05:00
PC-G04 dbfb5e1a82 S09A17-A18 2024-03-22 15:56:26 +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 422d19fb4a S09A17 2024-03-21 16:33:57 +05:00
PC-G04 69b10a8416 s09a10 2024-03-20 19:25:43 +05:00
PC-G04 073c68548d s09a09 2024-03-20 18:27:59 +05:00
PC-G04 3c591570ec S9A08 2024-03-20 15:38:52 +05:00