Commit Graph

134 Commits

Author SHA1 Message Date
Dron 0cac718412 many sshhhiiiiiitttt streaming enabled 2024-05-16 02:11:48 +05:00
Dron a7d955010d gavnoi vonyaet 2024-05-15 23:52:28 +05:00
Dron fb7b28a888 keep skuf motherfucker 2024-05-15 13:08:58 +05:00
Dron e6e185a5d8 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-14 21:59:50 +05:00
Dron 4fed4ed3a2 aa 2024-05-14 21:59:47 +05:00
pahachic fefeab8043 Flat data (not cheked) 2024-05-14 20:08:51 +05:00
Dron 805ea3e169 some else 2024-05-14 13:33:14 +05:00
Dron 0edaea0223 infra 2024-05-13 16:36:44 +05:00
Dron 2948a25f4f implementing 2024-05-13 13:11:49 +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
Dron 1b25647521 new core 2024-05-11 17:04:56 +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 34ab2b53ed PS tweaks 2024-01-26 13:47:55 +05:00
Dron f3474e6b4e ?? 2024-01-26 12:49:48 +05:00
Dron 3e40eb7441 vagina 2023-12-26 01:01:03 +05:00
Dron d613c1ace9 zalupa 2023-12-25 10:05:46 +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 a43d779dcc some 2023-12-13 02:21:17 +05:00
Dron 21695ba07a Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/Interiors/GP7/S04/GP7_S04_F14-15_P.umap
2023-12-12 14:50:55 +05:00
Dron 6984494958 ыыы 2023-12-12 14:50:39 +05:00
PC-G13 3634c22b39 mops 2023-12-12 14:19:40 +05:00
PC-G12 593ccb0a69 MP 2023-12-11 19:23:51 +05:00
PC-G12 9cf0749edc MPs 2023-12-08 19:53:00 +05:00
Dron ed2dafd098 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Blueprints/Lamp/BP_lampStreet_GP07_LightColumn.uasset
#	Content/Maps/Yard_GP7-8.umap
2023-12-08 14:16:01 +05:00
Dron e77ed2ce46 humans, sshhhhiiiit 2023-12-08 14:15:26 +05:00
PC-G12 2398c3eeb7 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/Interiors/GP7/S01/GP7_S01_F02-22_MOP.umap
#	Content/Maps/Interiors/GP7/S01/GP7_S01_F23-24_MOP.umap
#	Content/Maps/Interiors/GP7/S02/GP7_S02_F02-18_MOP.umap
#	Content/Maps/Interiors/GP7/S03/GP7_S03-F13_MOP.umap
#	Content/Maps/Interiors/GP7/S03/GP7_S03_F02-12_MOP.umap
2023-12-08 12:06:06 +05:00
PC-G12 3a785da9f9 MP 2023-12-08 11:57:58 +05:00
PC-G08 0209808cb4 mafsFIx+collis 2023-12-06 11:41:15 +05:00
Dron 029b604696 ads 2023-12-05 13:52:27 +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 4204d2d84c zahodit znachit stalker v bar.. 2023-12-03 01:43:29 +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 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 b482280c17 Up 2023-12-01 09:56:55 +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 5aebda038e somepoints 2023-12-01 01:00:08 +05:00
Dron c4cb901c45 delete gp4, points 2023-12-01 00:26:33 +05:00
PC-G08 65e59b42bd gp07-08Yard+09_10 2023-11-30 18:36:23 +05:00
PC-G08 e2ab183a4b YardGP0708 2023-11-28 18:10:19 +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