Commit Graph

87 Commits

Author SHA1 Message Date
Dron aab518cf20 AAAAAAAAAAAAAAA 2025-12-24 16:47:35 +05:00
Dron 8266343ecd aa 2025-11-20 15:42:09 +05:00
Dron ab24e6353e v3 done 2025-09-25 15:33:25 +05:00
Dron 2a6b4c1846 upd streetlamp, light, dof, c++ xml parse 2025-09-23 19:37:20 +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
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
Dron 6835d1dc4d fix elevators, people 2024-07-08 20:04:34 +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 a6b41b3499 many shit 2024-05-30 13:26:11 +05:00
Dron a07721289a ффффф 2024-05-21 21:20:16 +05:00
Dron 4f295e3fa6 kucha vsego 2024-05-20 20:05:56 +05:00
Dron 8799d72dc8 caps, flatN, elevator, doors, lvlmanage,sky tvix, volumes 2024-05-17 00:43:06 +05:00
Dron 4a51947349 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Config/DefaultEngine.ini
#	Content/Blueprints/Lamp/BP_InteriorLamp.uasset
2024-05-11 17:06:28 +05:00
PC-G04 bde46e4f4f Gp8_S02 квартиры 2024-05-04 18:32:49 +05:00
PC-G13 58bab16e45 gp7 tumendinamics 2024-04-26 13:58:02 +05:00
Dron 501f62d351 optimize xml, people upd 2024-03-28 18:10:01 +05:00
Dron f3474e6b4e ?? 2024-01-26 12:49:48 +05:00
Dron 3e40eb7441 vagina 2023-12-26 01:01:03 +05:00
Dron d2014b7589 pizdec 2023-12-25 09:30:55 +05:00
Dron b7c06beead 2d plans, all good NIKITA BLYAT PUSHIT KTO BUDET 2023-12-25 03:49:17 +05:00
Dron 1773b8ff74 car, people subdiv 2023-12-20 22:18:58 +05:00
Dron 9fd28ffdb0 people, mops 2023-12-19 14:20:05 +05:00
Dron 6984494958 ыыы 2023-12-12 14:50:39 +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
Dron b38a0eaa53 ds 2023-12-04 15:22:56 +05:00
Dron f6f3c03fd1 aa 2023-12-04 14:24:07 +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
Dron b9774956ff barmen govorit: 4to to ty vygladish kak psevdosobaka sutulaya, tyazholyi reid v zonu vydalsya? 2023-12-04 02:05:08 +05:00
Dron 4f95ae6b9f shadows 2023-12-02 12:41:00 +05:00
Dron 035067c2a5 fasadhide/points/core override/ 2023-12-01 23:52:23 +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 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 e5b9fd03e9 qr 2023-11-22 19:47:52 +05:00
Dron 6d934da77e Merge branch 'master' into ue5.1
# Conflicts:
#	Content/Blueprints/Player/myGM.uasset
#	Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset
#	Content/Blueprints/UI/WBPS/filter/Filter.uasset
#	Content/Blueprints/World/fakeHorizon.uasset
#	Content/Maps/Landscape.umap
#	Content/Maps/MainScene.umap
#	Content/Maps/Underground_parking_GP4.umap
#	Content/Maps/Yard_GP4.umap
#	plugins/JPrinter/Intermediate/Build/Win64/UE4/Inc/JPrinter/Timestamp
#	plugins/JPrinter/Intermediate/Build/Win64/UE4/Shipping/JPrinter/Module.JPrinter.cpp.obj
#	plugins/JPrinter/Intermediate/Build/Win64/UE4/Shipping/JPrinter/Module.JPrinter.gen.cpp.obj
#	plugins/createProcess/Intermediate/Build/Win64/UE4/Inc/createProcess/Timestamp
#	plugins/createProcess/Intermediate/Build/Win64/UE4/Shipping/createProcess/Module.createProcess.cpp.obj
#	plugins/createProcess/Intermediate/Build/Win64/UE4/Shipping/createProcess/Module.createProcess.gen.cpp.obj
#	plugins/manageTextFile/Intermediate/Build/Win64/UE4/Inc/manageTextFile/Timestamp
#	plugins/manageTextFile/Intermediate/Build/Win64/UE4/Shipping/manageTextFile/Module.manageTextFile.cpp.obj
#	plugins/manageTextFile/Intermediate/Build/Win64/UE4/Shipping/manageTextFile/Module.manageTextFile.gen.cpp.obj
2023-11-08 19:11:03 +05:00
EgorSuv 19796e975d ue5 merge with english 2023-02-10 15:33:12 +05:00
EgorSuv 32440ee90f unreal engine 5.1 update, level load fixed 2023-02-10 15:24:22 +05:00
EgorSuv e9f3169a6f init 2023-02-06 17:17:44 +05:00
GRAFF b9c7fbef18 что то делалось 2022-09-01 13:43:05 +05:00
GRAFF 905ac6b6bf Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 2022-07-05 14:13:53 +05:00
JohnnyHatchet ef471dd408 Мохнатые холмы два 2022-07-05 11:53:07 +05:00
JohnnyHatchet f449f948b5 dopil 2022-06-28 20:53:25 +05:00