Commit Graph

32 Commits

Author SHA1 Message Date
GRAFF 70114f1793 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/S01F02.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F03-10.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F03.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F11.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F12.umap
#	Content/Maps/Yard_GP4.umap
#	Content/SkatePark/Naberez_Model/fix/Yard/MI_Roof4.uasset
2022-03-22 08:50:56 +05:00
JohnnyHatchet 9122701af3 Двор 2022-03-22 07:28:32 +05:00
GRAFF 58a7df15ae еще пачка всякого, добавил таги, запекатель параллаксов 2022-03-18 16:58:38 +05:00
GRAFF a0618fa4a2 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Blueprints/Lamp/BP_spotlight.uasset
#	Content/Blueprints/Lamp/BP_spotlight_1.uasset
#	Content/Blueprints/Lamp/BP_spotlight_egg.uasset
#	Content/Blueprints/Lamp/BP_spotlight_sphere.uasset
#	Content/Blueprints/Lamp/BP_spotlight_xiaomi.uasset
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_0.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_1.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_2.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_3.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_4.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_5.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_7.umap
#	Content/Maps/Landscape.umap
#	Content/Maps/Main_Building.umap
#	Content/Materials/Instances/MI_Brick_01.uasset
#	Content/Materials/Instances/MI_RMA_Fasad_RAL_9003.uasset
2022-03-17 17:05:24 +05:00
GRAFF 407047409d куча барахла еще 2022-03-17 17:00:50 +05:00
JohnnyHatchet 57fd964f13 Fixup redirections 2022-03-17 04:26:55 +05:00
GRAFF 15f0b60364 куча хлама 2022-03-14 17:18:24 +05:00
GRAFF 5d643ab427 без людей но со всем остальным, сдача 2 этапа 2022-03-01 13:55:55 +05:00
GRAFF fc8511454f всякие допилы говна, сдача 2 этапа 2022-03-01 13:09:50 +05:00
GRAFF 4508fbf18b Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/SkatePark/Naberez_Model/fix/Yard/MI_Roof6.uasset
#	Content/SkatePark/Naberez_Model/fix/Yard/umsmah1g_2K_Normal.uasset
2022-02-28 19:04:31 +05:00
GRAFF 1c18765aab добавление коллизий всему и вся, правки травы и еще чего то 2022-02-28 18:06:32 +05:00
JohnnyHatchet bed61ac1a4 Fix normal + fix outside gp fake 2022-02-28 13:45:00 +05:00
GRAFF 0ba22bd555 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Materials/Instances/M_Plastic_RAL_716.uasset
#	Content/Materials/Master/M_RMA_Tile_Triplanar.uasset
#	Content/Meshes/test_import_SM_HouseTerritory.uasset
#	Content/SkatePark/Naberez_Model/fix/Yard/MI_Roof3.uasset
2022-02-28 11:11:22 +05:00
GRAFF 99b632df44 ходилка по всяким местам, сплайн-тачка 2022-02-28 11:09:32 +05:00
JohnnyHatchet b38028c0c2 GP 1/2/3 + park +cars color random 2022-02-28 06:48:09 +05:00
JohnnyHatchet 997852e75b yard GP_4/ yard GP_5/ Yard/ Playground Ship/ Foliage/ Cars 2022-02-28 04:08:36 +05:00
JohnnyHatchet 457f46c053 Yard_GP_4 2022-02-26 19:29:00 +05:00
JohnnyHatchet e3ce980026 Yards 2022-02-25 21:21:16 +05:00
GRAFF 4b20846dd3 что то 2022-02-24 14:39:32 +05:00
PC-G09 9958347a0c GP4 GP5 Yard 2022-02-21 18:20:29 +05:00
PC-G09 0528b575ac Naberejka 2022-02-20 17:18:12 +05:00
PC-G09 565981852f Naberejka 2022-02-19 22:04:58 +05:00
PC-G09 9f3a725e8a Nabeejnaya 2022-02-18 19:36:36 +05:00
PC-G09 51ead7566b Naberejnaya 2022-02-17 20:02:57 +05:00
PC-G09 4845d02c09 Naberejnaya 2022-02-17 19:33:26 +05:00
PC-G09 3838e6db1f Naberejnaya 2022-02-17 17:57:31 +05:00
PC-G09 c9ff4bbc8b Naberejka 2022-02-17 17:32:15 +05:00
PC-G09 8233bfecb0 Naberejnaya trees 2022-02-17 14:20:28 +05:00
PC-G09 56be76b7dd Exterior 2022-02-17 14:09:29 +05:00
PC-G09 7d989ab362 Exterior 2022-02-16 18:07:26 +05:00
PC-G09 386dcbb3be Exterior + sofa mat 2022-02-16 15:40:16 +05:00
PC-G09 c9451d9221 Naberejnaya 2022-02-15 20:05:59 +05:00