Commit Graph

299 Commits

Author SHA1 Message Date
PC-G12 f5ba4e0df8 MPd 2023-12-11 12:03:35 +05:00
PC-G12 9cf0749edc MPs 2023-12-08 19:53:00 +05:00
PC-G13 4fb9774360 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-12-08 19:03:00 +05:00
PC-G13 78a6f972ac facades, gp11_12, oms mats, s01, s02, s04 flats partially rebaked, 2023-12-08 19:02:56 +05:00
Dron e77ed2ce46 humans, sshhhhiiiit 2023-12-08 14:15:26 +05:00
Dron 312b58ad96 dohuisha vsego 2023-12-05 00:51:07 +05:00
PC-G13 ff1f6366ac Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-12-04 15:38:50 +05:00
PC-G13 2194811711 ny tu vudal (highlights probably) 2023-12-04 15:38:47 +05:00
Dron e31d6cfbed Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-12-04 15:23:00 +05:00
PC-G13 12d90d372d int terrASSes windows, s01 some rebake 2023-12-04 14:59:40 +05:00
Dron f6f3c03fd1 aa 2023-12-04 14:24:07 +05:00
Dron 27a24e6ea8 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-12-04 04:35:31 +05:00
Dron d5cbe57b01 a stalker emu: da esli by reid, ya sidel vsyu noch aivaz kovyral
-AHAHAHAH vot eto ty vydal a
-tak ne smeshno je
2023-12-04 04:35:12 +05:00
PC-G13 537370306c highlights?? 2023-12-04 02:58:54 +05:00
Dron f24c8161ac Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/MainScene.umap
#	Content/Meshes/Interiors/GP7/S01/SM_GP7_S01_A10.uasset
#	Content/Meshes/Interiors/GP7/S01/SM_GP7_S01_A10_Ceiling.uasset
#	Content/Meshes/Interiors/GP7/S01/SM_GP7_S01_A10_Floor.uasset
2023-12-04 02:06:14 +05:00
Dron b9774956ff barmen govorit: 4to to ty vygladish kak psevdosobaka sutulaya, tyazholyi reid v zonu vydalsya? 2023-12-04 02:05:08 +05:00
PC-G13 2d1a646341 int 2023-12-04 01:32:22 +05:00
PC-G13 66c6ec0438 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-12-03 19:17:01 +05:00
PC-G13 fa7dc5940f ny i 4to tam so stalkerom to? 2023-12-03 19:16:56 +05:00
Dron 4204d2d84c zahodit znachit stalker v bar.. 2023-12-03 01:43:29 +05:00
PC-G13 d71e8746b4 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-12-02 23:21:14 +05:00
PC-G13 f07e373da4 int 2023-12-02 23:21:06 +05:00
PC-G12 64757f4995 MP 2023-12-02 17:05:38 +05:00
PC-G12 54b9a1d066 MP 2023-12-02 16:59:00 +05:00
PC-G12 4ba1f4427e MP 2023-12-02 15:35:54 +05:00
PC-G12 180aad1850 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-12-02 14:32:57 +05:00
PC-G12 eeba501f0e GP 2023-12-02 14:26:44 +05:00
PC-G13 f244fea985 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/MainScene.umap
#	Content/SkatePark/Naberez_Model/fix/Yard/MI_SidewalkYard_OldCity.uasset
2023-12-02 02:46:13 +05:00
PC-G13 b1e2f6643c int 2023-12-02 02:45:05 +05:00
Dron 035067c2a5 fasadhide/points/core override/ 2023-12-01 23:52:23 +05:00
Dron 4b4c3176b2 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-12-01 21:37:22 +05:00
PC-G13 8995a04132 int 2023-12-01 19:34:16 +05:00
PC-G13 9929f891c3 2F lvls 2023-12-01 15:44:35 +05:00
PC-G13 f61e3efa61 int 2023-12-01 14:09:37 +05:00
Dron 0d9cad036c Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/MainScene.umap
2023-12-01 12:50:36 +05:00
PC-G13 017a43fa68 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Maps/Main_Building.umap
2023-12-01 01:08:42 +05:00
PC-G13 3a54253cfd int 2023-12-01 01:08:03 +05:00
Dron f7e0ec41a4 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-12-01 01:00:23 +05:00
Dron c4cb901c45 delete gp4, points 2023-12-01 00:26:33 +05:00
PC-G12 b5f76169c8 MP 2023-11-30 20:01:05 +05:00
PC-G12 e42a1b1e51 MP 2023-11-30 12:06:12 +05:00
PC-G12 1967e3ed0f MP 2023-11-29 19:58:45 +05:00
PC-G12 004ac2bd27 GP 2023-11-29 12:07:35 +05:00
PC-G12 9ab3d56b29 GP 2023-11-28 20:06:55 +05:00
PC-G12 b79e33f226 GP 2023-11-27 19:55:55 +05:00
PC-G13 433741f953 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-11-27 14:33:45 +05:00
PC-G13 c77e9070c4 я маслину поймал 2023-11-27 14:33:33 +05:00
PC-G12 e3bff91d02 GP 2023-11-27 11:59:39 +05:00
PC-G12 a9bd477a1c TR 2023-11-23 19:58:13 +05:00
PC-G12 e5b9fd03e9 qr 2023-11-22 19:47:52 +05:00