Commit Graph

591 Commits

Author SHA1 Message Date
PC-G13 f1081d6dfb Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-12-04 15:01:19 +05:00
PC-G13 12d90d372d int terrASSes windows, s01 some rebake 2023-12-04 14:59:40 +05:00
JohnnyHatchet 6e03fb01a5 DEREVYA 2023-12-04 14:18:17 +05:00
JohnnyHatchet 73aa1f1606 Folliage reimport KURRRWA 2023-12-04 10:59:19 +05:00
JohnnyHatchet f6396bc50a Folliage 2023-12-04 10:35:40 +05:00
JohnnyHatchet 4c8a38f441 KUDA J TI V LANSCAPE TO NU 2023-12-04 07:49:10 +05:00
JohnnyHatchet 47275465aa GrAss 2023-12-04 07:33:27 +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
PC-G08 70f2b9f2d7 roads 2023-12-03 14:10:27 +05:00
JohnnyHatchet 200382f6d5 Up 2023-12-03 09:28:11 +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-G08 ca1366ce30 mafsFix 2023-12-02 18:59:54 +05:00
PC-G08 9ba51aa6b7 mafsNewTextures 2023-12-02 18:10:07 +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-G08 e974be85ad gp9-10_materls 2023-12-02 14:59:41 +05:00
JohnnyHatchet 0c889e4174 tachki 2023-12-02 14:40:35 +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
Dron 4f95ae6b9f shadows 2023-12-02 12:41:00 +05:00
JohnnyHatchet 78e0cdc9d0 Road mat + pp in landscape 2023-12-02 10:36:52 +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 2c9bd4004f many fixes, core override, UNREAL 5.3 2023-12-02 02:33:31 +05:00
Dron 035067c2a5 fasadhide/points/core override/ 2023-12-01 23:52:23 +05:00
Dron c14691a73d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-12-01 23:50:25 +05:00
PC-G08 88df831019 p78910 2023-12-01 23:10:18 +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 5e18196cf9 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-12-01 19:34:22 +05:00
PC-G13 8995a04132 int 2023-12-01 19:34:16 +05:00
PC-G08 f382527376 genplanGP7_8 2023-12-01 18:36:37 +05:00
PC-G08 74ce00bdd8 gp07-08Yard 2023-12-01 17:56:11 +05:00
PC-G13 9929f891c3 2F lvls 2023-12-01 15:44:35 +05:00
PC-G13 ef93329559 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-12-01 14:09:42 +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
JohnnyHatchet 3d927c8a39 Nasral akkuratno 2023-12-01 11:49:55 +05:00
JohnnyHatchet b482280c17 Up 2023-12-01 09:56:55 +05:00
JohnnyHatchet 28d1143291 Fix + Merge
Replace BP Foliage to SM, Merge from LR, Nanite
2023-12-01 07:05:37 +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