Commit Graph

565 Commits

Author SHA1 Message Date
JohnnyHatchet 0c889e4174 tachki 2023-12-02 14:40:35 +05:00
PC-G12 180aad1850 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-12-02 14:32:57 +05:00
PC-G12 eeba501f0e GP 2023-12-02 14:26:44 +05:00
Dron 4f95ae6b9f shadows 2023-12-02 12:41:00 +05:00
JohnnyHatchet 78e0cdc9d0 Road mat + pp in landscape 2023-12-02 10:36:52 +05:00
PC-G13 f244fea985 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/MainScene.umap
#	Content/SkatePark/Naberez_Model/fix/Yard/MI_SidewalkYard_OldCity.uasset
2023-12-02 02:46:13 +05:00
PC-G13 b1e2f6643c int 2023-12-02 02:45:05 +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 c14691a73d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-12-01 23:50:25 +05:00
PC-G08 88df831019 p78910 2023-12-01 23:10:18 +05:00
Dron 4b4c3176b2 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-12-01 21:37:22 +05:00
PC-G13 5e18196cf9 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-12-01 19:34:22 +05:00
PC-G13 8995a04132 int 2023-12-01 19:34:16 +05:00
PC-G08 f382527376 genplanGP7_8 2023-12-01 18:36:37 +05:00
PC-G08 74ce00bdd8 gp07-08Yard 2023-12-01 17:56:11 +05:00
PC-G13 9929f891c3 2F lvls 2023-12-01 15:44:35 +05:00
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
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 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
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-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