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

87 Commits

Author SHA1 Message Date
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
PC-G06 1c15e83b0e S02_Window 2022-04-06 17:00:25 +05:00
JohnnyHatchet 285a163ca8 Лифты 2022-04-05 10:17:26 +05:00
JohnnyHatchet 7288ff3275 Parking + Elevators 2022-04-05 06:05:11 +05:00
JohnnyHatchet fe6072d105 Parking 2022-03-31 19:27:11 +05:00
GRAFF 2e6a34a767 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 2022-03-31 12:19:44 +05:00
PC-G06 78bbbfe386 S02_Furniture 2022-03-30 15:47:11 +05:00
GRAFF 77d3d3e649 подкрутил карту, панорама 2022-03-29 16:29:55 +05:00
GRAFF d9c1a28027 дохера всего, апдейты из моей ветки 2022-03-28 16:52:04 +05:00
GRAFF aefc87b39a ухх блять ну вроде пашет 2022-03-28 15:12:26 +05:00
GRAFF 79834db85d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Interiors/GP4S2/Unique/S02F03-13.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03F03-15.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03F03.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A00.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A01.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A02.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A03.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A04.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A05.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A06.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A07.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A08.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A09.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05F01.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05F02.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05F09.umap
#	Content/Meshes/Interiors/GP4S5/Unique/SM_dom_5_Hall.uasset
#	Content/Meshes/Lightning/BP_short_picket_light.uasset
#	Content/Meshes/Tree_Crone_2_FoliageType.uasset
 2022-03-26 11:29:17 +05:00
GRAFF b6cba38361 я щас сдохну уже 2022-03-26 11:25:10 +05:00
JohnnyHatchet ab3c0bd355 BP_Lightnings 2022-03-26 07:53:32 +05:00
GRAFF eda7455bb0 всё почти рабочее 2022-03-26 06:06:50 +05:00
GRAFF 0f36e651e5 всякое разное, и даже работает 2022-03-25 14:32:47 +05:00
GRAFF c8933ec319 merge DEV to master 2022-03-24 13:30:34 +05:00
GRAFF df24de7f10 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Config/DefaultEngine.ini
#	Content/Maps/Interiors/GP4S1/Unique/S01A08.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A05.umap
#	Content/Maps/NightlightAim.umap
#	Content/Maps/Yard_GP4.umap
#	Content/Materials/FakeInteriors/MI_CubeRoom_1.uasset
#	Content/Materials/FakeInteriors/MI_CubeRoom_2.uasset
#	Content/Materials/FakeInteriors/MI_CubeRoom_3.uasset
#	Content/Materials/FakeInteriors/MI_CubeRoom_6.uasset
#	Content/Materials/FakeInteriors/MI_FakeEmpty.uasset
#	Content/Meshes/Furniture/Custom/SM_CylLamp_AI.uasset
#	Content/Meshes/Furniture/Custom/SM_Door_AI_SM_Door_AI.uasset
#	Content/Meshes/Furniture/Custom/SM_Door_AI_SM_Door_Frame.uasset
#	Content/Meshes/Furniture/Custom/SM_Door_Front_AI_SM_Door_Front_AI.uasset
#	Content/Meshes/Furniture/Custom/SM_Door_Front_Frame_AI.uasset
 2022-03-24 13:14:31 +05:00
GRAFF cf0c2ba87c ещё тут всякое 2022-03-24 13:07:17 +05:00
PC-G06 ee7f953982 S03_Mesh 2022-03-23 20:52:42 +05:00
GRAFF 905abc65ff ААААААААААААААААААААААААААА БЛЕЯТЬААААААА 2022-03-23 01:34:38 +05:00
GRAFF d631be4980 НУ ВООООТ 2022-03-22 10:46:46 +05:00
GRAFF b40f1d7ef8 ХУУУУУУУУУУУУУУУУЙ 2022-03-22 09:13:08 +05:00