Dron/Ivazovsky
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
241 Commits 9 Branches 0 Tags
df24de7f10cf8370ff9e197e70cbb09e44b3ebcf
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
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 e713bdd716 Add complex collisions + насыпал тачек на первый план 2022-03-21 00:55:34 +05:00
JohnnyHatchet fbd823d457 Правки фасадов второстепенных зданий + добавил изгородь и входы во двор с лодами + высота канта двора 2022-03-19 06:30:30 +05:00
GRAFF 58a7df15ae еще пачка всякого, добавил таги, запекатель параллаксов 2022-03-18 16:58:38 +05:00
JohnnyHatchet 905f3f2186 Add Genplan GP45 back 2022-03-17 20:07:42 +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 fc8511454f всякие допилы говна, сдача 2 этапа 2022-03-01 13:09:50 +05:00
GRAFF 1c18765aab добавление коллизий всему и вся, правки травы и еще чего то 2022-02-28 18:06:32 +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
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 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
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 56be76b7dd Exterior 2022-02-17 14:09:29 +05:00
GRAFF fb9c00e7a5 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Maps/MainSceneMigrate.umap
#	Content/Materials/Instances/MI_RMA_naberejnaya1.uasset
#	Content/Materials/LandscapeMaterials/MI_sand.uasset
 2022-02-17 13:51:59 +05:00
PC-G09 4d99a762f9 Exterior 2022-02-16 19:57:46 +05:00
GRAFF e876ddece9 куча всякого, встроил управление по хттп, новый интерфейс, новая защита 2022-01-20 13:39:25 +05:00
PC-G09 df6c351602 Генпланы, парк, увеличение радиуса 2021-12-17 16:01:17 +05:00
PC-G09 a28b0a67a4 Дов внешнки - голограмма, фикс блина (центровка) 2021-12-10 15:32:30 +05:00
PC-G09 e8297a791e Дома окружение доп 2021-12-10 13:00:59 +05:00
PC-G09 d81a60cca7 Генплан школа 2021-12-10 12:29:19 +05:00
PC-G09 e569f81157 Перенос мастеров в мастеры, вода поинтересней вроде, Декаль спортивной прощадки за ГП 4 2021-12-10 02:41:03 +05:00
PC-G09 51ef6fb17a Генпланы 2021-12-09 16:47:23 +05:00
PC-G09 8d95392fd2 Генпланы, набережная 2021-12-07 19:31:20 +05:00
GRAFF 95380dca42 погнали, версия 4.27.1 2021-11-29 21:09:12 +05:00