Commit Graph

141 Commits

Author SHA1 Message Date
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
PC-G08 74ce00bdd8 gp07-08Yard 2023-12-01 17:56:11 +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 e42a1b1e51 MP 2023-11-30 12:06:12 +05:00
PC-G12 1967e3ed0f MP 2023-11-29 19:58:45 +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-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 e5b9fd03e9 qr 2023-11-22 19:47:52 +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
PRAyMU 5f71a3f73a M_Test_Room_P2 2023-11-15 01:04:34 +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
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
JohnnyHatchet 1ea1e16067 Парк между ГП4 и ГП5 2022-07-07 07:24:56 +05:00
GRAFF 3783b5111e добавил пиздюков, скейтеров, велик 2022-07-07 01:21:24 +05:00
JohnnyHatchet 4cf98855d4 Мохнатые холмы 2022-07-04 09:03:13 +05:00
JohnnyHatchet 1a7b5f7219 Dopil 4 2022-07-02 19:11:28 +05:00
JohnnyHatchet 2859c439ee Dopil 3 2022-07-01 22:36:58 +05:00
JohnnyHatchet c07b396516 Dopil2 2022-06-30 20:09:10 +05:00
JohnnyHatchet f449f948b5 dopil 2022-06-28 20:53:25 +05:00
JohnnyHatchet 3ea8fa92d7 Stone border Yard 2022-05-06 18:04:28 +05:00
GRAFF 0cc18a55c9 всякое хуякое 2022-04-20 20:21:04 +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 79caaf2b19 ооой мляяяя 2022-04-08 11:21:22 +05:00
GRAFF 4856dd3c62 sdfsdf 2022-04-07 21:29:50 +05:00
GRAFF ef8f9707fa Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 2022-04-07 20:01:34 +05:00
GRAFF 94187c56e2 MOOOOREEE 2022-04-07 19:30:54 +05:00
PC-G06 4c16576670 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-04-07 18:56:35 +05:00
PC-G04 385b2d6240 MOPs1 2022-04-07 18:40:07 +05:00
PC-G06 8c7f900bae GP4_correction 2022-04-07 18:12:01 +05:00
GRAFF 0076654b59 всякая байда и мопы с моей ветки 2022-04-07 13:54:21 +05:00
GRAFF 868ebbc210 лифты вроде расставил, ща попробую другой способ еще 2022-04-07 13:35:28 +05:00
GRAFF e354f1787d баба с коляской, паркинг, лифт, и всякое 2022-04-07 10:48:34 +05:00