Commit Graph

544 Commits

Author SHA1 Message Date
PC-G13 ef93329559 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-12-01 14:09:42 +05:00
PC-G13 f61e3efa61 int 2023-12-01 14:09:37 +05:00
JohnnyHatchet 3d927c8a39 Nasral akkuratno 2023-12-01 11:49:55 +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 017a43fa68 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Maps/Main_Building.umap
2023-12-01 01:08:42 +05:00
PC-G13 3a54253cfd int 2023-12-01 01:08:03 +05:00
PC-G12 b5f76169c8 MP 2023-11-30 20:01:05 +05:00
PC-G08 65e59b42bd gp07-08Yard+09_10 2023-11-30 18:36:23 +05:00
PC-G12 f165085f22 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-11-30 12:06:17 +05:00
PC-G12 e42a1b1e51 MP 2023-11-30 12:06:12 +05:00
PC-G08 d01463e5f4 YardMafs 2023-11-29 22:10:24 +05:00
PC-G12 1967e3ed0f MP 2023-11-29 19:58:45 +05:00
PC-G08 53491c647b yardGP0708 2023-11-29 18:27:02 +05:00
PC-G12 004ac2bd27 GP 2023-11-29 12:07:35 +05:00
PC-G12 9ab3d56b29 GP 2023-11-28 20:06:55 +05:00
PC-G08 e2ab183a4b YardGP0708 2023-11-28 18:10:19 +05:00
PC-G12 b79e33f226 GP 2023-11-27 19:55:55 +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 e3bff91d02 GP 2023-11-27 11:59:39 +05:00
PC-G12 a9bd477a1c TR 2023-11-23 19:58:13 +05:00
PC-G12 e5b9fd03e9 qr 2023-11-22 19:47:52 +05:00
PC-G12 20a227dae6 FR 2023-11-21 20:03:28 +05:00
PC-G12 a53cef56a4 q 2023-11-20 19:56:32 +05:00
PC-G12 9c86314ae7 fr 2023-11-20 12:14:37 +05:00
PC-G12 9b6c4ca4e0 MPs 2023-11-17 19:58:28 +05:00
PC-G12 f255871c6b 05 2023-11-16 19:52:39 +05:00
PC-G13 272cf7e65c Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Materials/Interior/Minimal/MI_Floor_Parquet_Min.uasset
#	Content/Meshes/Interior/Test_Room/SM_GP1_S01_A00_Floor_Test_Room.uasset
2023-11-16 16:22:47 +05:00
PC-G13 e742367694 levels, gp wip, facades wip, pizdec wip 2023-11-16 16:21:09 +05:00
PC-G12 6c6a5fb4ae 1 2023-11-16 12:37:56 +05:00
PRAyMU e6a96a7e54 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-11-15 01:07:18 +05:00
PRAyMU 5f71a3f73a M_Test_Room_P2 2023-11-15 01:04:34 +05:00
PC-G13 9a03b2e4da mop firstfloor levels 2023-11-14 16:47:00 +05:00
PRAyMU f4db56a7f6 M_Test_Room_P1 2023-11-09 23:36:09 +05:00
PRAyMU aac277d206 Base material minimal style 2023-11-08 20:33:08 +05:00
PRAyMU cd7c0e5e97 MM_Master + Tile Green 2023-11-08 20:27:17 +05:00
Dron a8fc737a20 ыыы 2023-11-08 20:23:46 +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
JohnnyHatchet 9d03a8eb1b Правки фасад + окна в квартирах 2022-08-16 18:51:27 +05:00
DESKTOP-8J0BKKD\Admin 62a4dae398 Правки по домам + бордюры в парк 2022-08-04 12:01:58 +05:00
GRAFF b79d389764 vv 2022-07-10 13:01:56 +05:00
GRAFF bc163e12d4 скейтеры, велики 2022-07-10 12:55:04 +05:00
GRAFF a4bd3bb175 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Maps/MainScene.umap
#	Content/Maps/Yard_GP4.umap
#	Content/Maps/test.umap
#	Content/MigrateFortis/Otrada/Asset/SpeedTree/TreeMats/MM_Grass.uasset
2022-07-07 12:12:26 +05:00
GRAFF 7253f1ef79 правочки 2022-07-07 12:07:52 +05:00
JohnnyHatchet 1ea1e16067 Парк между ГП4 и ГП5 2022-07-07 07:24:56 +05:00