Dron/Ivazovsky
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
203 Commits 9 Branches 0 Tags
905abc65ff061ec1fac991a3e84fcee66cb25ebb
Commit Graph

23 Commits

Author SHA1 Message Date
GRAFF 905abc65ff ААААААААААААААААААААААААААА БЛЕЯТЬААААААА 2022-03-23 01:34:38 +05:00
GRAFF b40f1d7ef8 ХУУУУУУУУУУУУУУУУЙ 2022-03-22 09:13:08 +05:00
GRAFF 8ad3f1e65a sdfnslfg 2022-03-22 08:48:05 +05:00
GRAFF 4bc67d6a74 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/S01A00.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A01.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A02.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A03.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A04.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A05.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A06.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A07.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A08.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A09.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A10.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A11.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A01.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A02.umap
 2022-03-21 23:18:22 +05:00
GRAFF d0374d966f всякая штука 2022-03-21 23:15:47 +05:00
PC-G06 8f7d0e7a8f Gp4S3 2022-03-21 20:33:00 +05:00
PC-G03 36ead82def S01A03-S01A06-S01A08-S01A11-S05A06-S05A07-S05A08 2022-03-21 20:17:01 +05:00
GRAFF f4550ff35d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/S01A01_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/S01A04_BuiltData.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_10.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_4_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_5.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_6.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_7.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_8.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_9.umap
#	Content/Maps/L_Lighting.umap
#	Content/Maps/MainSceneMigrate.umap
#	Content/Maps/Main_Building.umap
#	Content/Materials/Instances/M_Greeds_Inst.uasset
#	Content/Materials/Instances/M_Plastic_RAL_6005.uasset
#	Content/Materials/Instances/M_Plastic_RAL_7026.uasset
#	Content/Materials/Instances/M_Plastic_RAL_716.uasset
#	Content/Materials/Instances/t_conditioner_grid_Opacity.uasset
#	Content/Meshes/Furniture/Custom/SM_Celling_Lamp_1.uasset
#	Content/Meshes/Furniture/Custom/SM_Celling_Lamp_2.uasset
#	Content/Meshes/Furniture/Custom/SM_Celling_Lamp_3.uasset
#	Content/Meshes/test_import_SM_HouseTerritory.uasset
#	Content/Peoples/Male_01/SM_Male_01_fbm/9_meshes_Merge_Normal.uasset
 2022-03-21 11:48:57 +05:00
JohnnyHatchet d9c4c56bb0 Фулл апдейт по фасадам + ОРМка 2022-03-20 18:58:56 +05:00
PC-G04 bee7c9e425 dom_1_FL1,dom_1_Hall,dom_1_Hall_F11,dom_1_Hall_F12 2022-03-18 20:09:28 +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
PC-G06 5b99f9a6d9 Eclectic_Material_Part_2 2022-03-11 17:43:14 +05:00
PC-G06 787fdd0689 Eclectic_Material_Part_1 2022-03-10 17:18:07 +05:00
GRAFF fc8511454f всякие допилы говна, сдача 2 этапа 2022-03-01 13:09:50 +05:00
PC-G09 c9451d9221 Naberejnaya 2022-02-15 20:05:59 +05:00
PC-G09 8eaa961d24 Naberejnaya playground 2022-01-18 17:48:24 +05:00
PC-G09 255c975a67 Внешка (заправка, автосалон), нарезка квартир по номерам 2022-01-17 15:21:27 +05:00
GRAFF 89d92dad95 водичка, деревце, окошки, синева, центр карты 2021-12-10 14:49:59 +05:00
PC-G09 e569f81157 Перенос мастеров в мастеры, вода поинтересней вроде, Декаль спортивной прощадки за ГП 4 2021-12-10 02:41:03 +05:00
PC-G09 3f0ff21202 Новый лес 2021-12-09 19:53:57 +05:00
PC-G09 40f70385c0 Сборка 2021-12-07 12:55:31 +05:00