Commit Graph

884 Commits

Author SHA1 Message Date
Dron 2a6b4c1846 upd streetlamp, light, dof, c++ xml parse 2025-09-23 19:37:20 +05:00
PC-G13 7c44a75599 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-09-19 16:59:02 +05:00
PC-G13 541d99f899 mda 2025-09-19 16:26:47 +05:00
Dron 30100643bd Revert "RenderGraffShots"
This reverts commit 0761205f68.

# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Maps/MainScene.umap
#	Content/Maps/Yard_GP8_GP7_New_2.umap
2025-09-18 19:32:45 +05:00
Dron fa4bec3d9a Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Maps/MainScene.umap
2025-09-18 18:36:51 +05:00
PC-G13 b8335383cf Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Materials/MFunctions/MF_BaseUV.uasset
#	Content/Textures/Dummy/T_Dummy_NAC.uasset
2025-09-16 12:36:06 +05:00
PC-G13 ee8b6d9d0f masters, facades 2025-09-16 12:33:52 +05:00
Maria_B ed828434b1 maf gp 12-13 2025-09-15 19:05:39 +05:00
Maria_B af1aeb5885 maf 2025-09-15 18:13:42 +05:00
Maria_B 1369f91dab textures 2025-09-12 01:38:06 +05:00
Maria_B 3469d7af8d MAf gp12-13 2025-09-11 22:08:50 +05:00
Maria_B 110e9f4d75 Foliage gp12-13 2025-09-10 14:58:14 +05:00
5hift 000bdf6428 Gp_fixes 2025-09-03 12:21:46 +05:00
5hift e7b75ea839 Gp_fix_V1 2025-08-29 09:11:52 +05:00
Dmitry 0761205f68 RenderGraffShots 2025-02-24 15:09:52 +05:00
Dron 4610689fbf dis people 2025-02-06 13:21:02 +05:00
Dron 26c7eaca12 бац 2025-01-28 13:12:03 +05:00
Dron 9fdd776719 green fix 2024-08-19 18:23:41 +05:00
NikitsSysun 8e00eb7ef7 чел и колизии 2024-07-15 19:54:00 +05:00
NikitsSysun fc3bec2a19 Убрал деревья 2024-07-11 14:49:26 +05:00
NikitsSysun 664fb176d1 Естественно я обосрался с коммитом и вот еще 2024-07-09 21:34:11 +05:00
NikitsSysun eaca372b7c Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/MainScene.umap
#	Content/Maps/Yard_GP8_GP7_New_2.umap
#	Content/Meshes/Exterior/Yard/GP7_GP8_NEW/New_Middle.uasset
2024-07-09 21:16:29 +05:00
NikitsSysun e9ab6ecba3 Господи пусть больше не будет правок от суки все 2024-07-09 21:14:56 +05:00
Dron 6835d1dc4d fix elevators, people 2024-07-08 20:04:34 +05:00
NikitsSysun 369ee517ff фуляга 2024-07-08 13:24:06 +05:00
NikitsSysun 02c2990971 Фуляга 2024-07-08 13:03:13 +05:00
NikitsSysun b692706923 Мафы 2024-07-08 11:32:37 +05:00
NikitsSysun b9ef8be333 Grass 2024-07-08 10:49:40 +05:00
NikitsSysun ba19cbc87c Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-07-07 00:23:51 +05:00
NikitsSysun b2ed4625a5 Надеюсь не обосрался NEWGP 2024-07-07 00:23:35 +05:00
PC-G12 cbf59c7538 DRMs 2024-06-28 19:42:08 +05:00
PC-G12 c1e997bcdb DRMs 2024-06-27 20:01:07 +05:00
PC-G12 217d47737c DRMs 2024-06-26 19:54:19 +05:00
PC-G12 c754d2ca1a DRMs 2024-06-25 20:03:34 +05:00
PC-G12 512acbb066 DRMs 2024-06-24 19:59:06 +05:00
PC-G12 8a518bfb36 DRMs 2024-06-20 20:07:12 +05:00
PC-G12 9c6d675b64 DRMs 2024-06-19 19:54:12 +05:00
PC-G12 c7f5f341c2 DRMs 2024-06-18 20:04:37 +05:00
PC-G12 962b298070 DRMs 2024-06-17 19:56:51 +05:00
Dron 2a9983fc68 fixes 2024-06-16 01:11:51 +05:00
Dron 59f02678bf фф 2024-06-05 18:05:33 +05:00
Dron 15fc0066a4 АААААА 2024-06-03 16:29:08 +05:00
Dron 6c85c97733 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-30 21:31:37 +05:00
Dron 28e8269d2e VR setup.. 2024-05-30 21:31:30 +05:00
NikitsSysun 3b90ab0054 Замена Уровня GP8 в MainScene 2024-05-30 14:57:17 +05:00
NikitsSysun c3918d4252 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/MainScene.umap
2024-05-30 14:42:28 +05:00
NikitsSysun cf3a4e9acd Люди растения машины 2024-05-30 14:41:44 +05:00
Dron 64d0319ec3 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/Interiors/GP7/S03/GP7_S03_F14-15_P1.umap
#	Content/Maps/Interiors/GP7/S03/GP7_S03_F15_P.umap
2024-05-30 13:26:49 +05:00
Dron a6b41b3499 many shit 2024-05-30 13:26:11 +05:00
NikitsSysun 44098ef800 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-30 10:39:37 +05:00