Dron/Ivazovsky
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
617 Commits 9 Branches 0 Tags
c16ae75ed5157e896f8cc8672de10403eeb60263
Commit Graph

108 Commits

Author SHA1 Message Date
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
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 3783b5111e добавил пиздюков, скейтеров, велик 2022-07-07 01:21:24 +05:00
GRAFF 5a6590cc1f добавил велик на карту 2022-07-05 17:24:30 +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
DESKTOP-8J0BKKD\Admin e7cff66cfd Светильники на набережной 2022-06-14 18:23:24 +05:00
GRAFF f19afc23d7 перевод 2022-05-07 23:53:42 +05:00
GRAFF 9e5112e4c3 начало локализации 2022-05-06 14:14:16 +05:00
GRAFF 0773499bb7 калич 2022-05-05 16:03:53 +05:00
GRAFF e49639c89d доавил звуки, и еще по мелочи 2022-04-23 15:42:42 +05:00
GRAFF 0cc18a55c9 всякое хуякое 2022-04-20 20:21:04 +05:00
GRAFF 8dee98005b лодочки и прочая фигня 2022-04-18 17:29:38 +05:00
GRAFF c06503bbec всякая говнина, конвертер картинок, скриншоты в мыло, 2 мыла 2022-04-17 18:32:42 +05:00
GRAFF 8db9667560 еще немного 2022-04-11 11:44:00 +05:00
GRAFF 2cdf663d96 ух ебать ну вроде сделал 2022-04-11 05:51:22 +05:00
GRAFF 0b5b390cc7 просто гора всякого еще 2022-04-10 01:04:22 +05:00
GRAFF 34d46b6078 полный идиотизм с лифтами 2022-04-09 21:13:50 +05:00
GRAFF 345b125793 АААААЫЫААЫА ЩАС СДОХНУ 2022-04-08 14:39:55 +05:00
GRAFF 79caaf2b19 ооой мляяяя 2022-04-08 11:21:22 +05:00
GRAFF 4856dd3c62 sdfsdf 2022-04-07 21:29:50 +05:00
GRAFF 94187c56e2 MOOOOREEE 2022-04-07 19:30:54 +05:00
GRAFF 868ebbc210 лифты вроде расставил, ща попробую другой способ еще 2022-04-07 13:35:28 +05:00
GRAFF e354f1787d баба с коляской, паркинг, лифт, и всякое 2022-04-07 10:48:34 +05:00
GRAFF 0f4ebf3a47 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/S01A01_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/S01A04_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/S01A05.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A07.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F01.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F02.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F03-10.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F11.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F12.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02F01.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A03.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A08.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A09.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03F01.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04F03-etc.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A06.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05F02.umap
#	Content/Maps/Underground_parking_GP4.umap
#	Content/Meshes/Interiors/GP4S4/Unique/SM_dom_4_F01.uasset
#	Content/Meshes/Interiors/SM_Parking_Underground_fix.uasset
 2022-04-06 20:01:28 +05:00
GRAFF eff3c9be30 дохуища всякого, планшет рабочий 2022-04-06 19:58:02 +05:00