Dron/Ivazovsky
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
129 Commits 9 Branches 0 Tags
58a7df15ae181f437eab266d98d42525880d4bd8
Commit Graph

107 Commits

Author SHA1 Message Date
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
PC-G06 e9c02dc03b Plintus_WallPicture_Hookan 2022-03-17 16:58:07 +05:00
JohnnyHatchet 1a4f1643b0 Новые фасады + фикс для процедурного меша 2022-03-17 04:26:15 +05:00
Igor f0ca2332e4 Dom1_flat_1,2,5 2022-03-16 18:43:32 +05:00
PC-G06 ff5da097be Door_Mesh_And_Mat 2022-03-16 18:37:43 +05:00
PC-G04 7a7a88f6d3 dom_1_flat_4_Interior 2022-03-16 18:22:12 +05:00
JohnnyHatchet 004ebd3b08 Fix all flats + fix fasade 1 2 5 2022-03-15 19:37:03 +05:00
PC-G06 8cad594926 Dom_1_Flat_All 2022-03-15 19:33:01 +05:00
PC-G04 acbd747dbe dom_1_f4 2022-03-15 19:18:55 +05:00
PC-G03 83deecc734 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_2.umap
 2022-03-15 19:14:54 +05:00
PC-G03 3fe002b8af d_1_F3 2022-03-15 19:14:14 +05:00
Igor deb182ad67 dom_1_F1_F2_F5 2022-03-15 19:04:52 +05:00
PC-G06 14ed31d2a2 BP_Light_intensity_and_Door 2022-03-15 17:20:08 +05:00
GRAFF 795fdbbbbd Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 2022-03-14 18:58:23 +05:00
JohnnyHatchet f4bd3a055a New flats S3 + interiors aim map 2022-03-14 17:40:31 +05:00
GRAFF 82abd78661 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 2022-03-14 17:18:41 +05:00
GRAFF 15f0b60364 куча хлама 2022-03-14 17:18:24 +05:00
PC-G06 1c44097bd6 Lamp_Mesh 2022-03-14 16:35:59 +05:00
PC-G06 5b99f9a6d9 Eclectic_Material_Part_2 2022-03-11 17:43:14 +05:00
PC-G06 2f4f6fbc3e Dom_1_Flat_0 2022-03-10 17:51:42 +05:00
PC-G06 787fdd0689 Eclectic_Material_Part_1 2022-03-10 17:18:07 +05:00
GRAFF 5ad444850b Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	.gitignore
#	Content/Maps/Underground_parking_GP4.umap
#	Content/UltraDynamicSky/Blueprints/Ultra_Dynamic_Sky.uasset
 2022-03-01 13:56:39 +05:00
GRAFF 5d643ab427 без людей но со всем остальным, сдача 2 этапа 2022-03-01 13:55:55 +05:00
GRAFF 5715cc3f0d заменил свет в lighting, удалил лишний динамик скай, поправил постпроцесс в main_migrate 2022-03-01 13:44:26 +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 1fd882d9d5 Ночная подсветка 2022-02-28 08:03:49 +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
PC-G09 47b580decf Мафы 2022-02-24 16:26:49 +05:00
GRAFF c95fb0b61c Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 2022-02-24 14:39:35 +05:00
GRAFF 4b20846dd3 что то 2022-02-24 14:39:32 +05:00
PC-G09 fb7d7447fc Parking 2022-02-24 14:38:27 +05:00
GRAFF a3bfcc2b0b Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Materials/Master/M_RMA_Tile_Master.uasset
#	Content/Materials/Master/M_RMA_Tile_Triplanar.uasset
#	Content/Meshes/Outside/M_Atlas_School1.uasset
 2022-02-24 12:07:39 +05:00
GRAFF c60989d164 ИИ и прочие ништяки 2022-02-24 12:06:34 +05:00
PC-G09 306202a058 Gasstation 2022-02-24 06:27:19 +05:00
PC-G09 0c4604303a Pravii bereg 2022-02-24 02:44:19 +05:00
PC-G09 c74606e474 Pravii bereg 2022-02-23 23:19:20 +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