Dron/Ivazovsky
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
68 Commits 9 Branches 0 Tags
a3bfcc2b0b82460c0f8dcf4960f9dfec095ade64
Commit Graph

41 Commits

Author SHA1 Message Date
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 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 565981852f Naberejka 2022-02-19 22:04:58 +05:00
PC-G09 4845d02c09 Naberejnaya 2022-02-17 19:33:26 +05:00
PC-G09 c9ff4bbc8b Naberejka 2022-02-17 17:32:15 +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 4e538441bf Exterior 2022-02-16 19:17:06 +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
GRAFF 0f6c4c0be2 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Materials/Instances/MI_RMA_Fasad_RAL_6028.uasset
#	Content/Materials/Instances/MI_RMA_Fasad_RAL_9003.uasset
 2022-01-31 18:07:39 +05:00
GRAFF f0baaf1908 всякий кал 2022-01-31 18:07:11 +05:00
PC-G09 6666f2da0e Outside + interior lvls 2022-01-28 17:59:48 +05:00
PC-G09 41d8593279 Outside update + add Furniture (meshes + mat) 2022-01-21 11:01:31 +05:00
GRAFF 0ae54349f5 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Config/DefaultEngine.ini
#	Content/Materials/Instances/M_Plastic.uasset
 2022-01-20 13:40:16 +05:00
GRAFF e876ddece9 куча всякого, встроил управление по хттп, новый интерфейс, новая защита 2022-01-20 13:39:25 +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 54f6561b7d 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/NewMaterial_day_good.uasset
#	Content/Meshes/water.uasset
 2021-12-21 13:34:40 +05:00
PC-G09 a07bf90d22 roads 2021-12-17 18:59:45 +05:00
PC-G09 df6c351602 Генпланы, парк, увеличение радиуса 2021-12-17 16:01:17 +05:00
GRAFF d2d7174e54 пачка всякого 2021-12-13 18:15:08 +05:00
PC-G09 a28b0a67a4 Дов внешнки - голограмма, фикс блина (центровка) 2021-12-10 15:32:30 +05:00
GRAFF 89d92dad95 водичка, деревце, окошки, синева, центр карты 2021-12-10 14:49:59 +05:00
GRAFF 7268408f78 всякая мелочь с выходом и инфрой 2021-12-10 14:45:37 +05:00
GRAFF 88d7be61c8 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Materials/Instances/NewMaterial_day_good.uasset
#	Content/Materials/M_RMA_Tile_Master.uasset
#	Content/SpeedTree/Lipa/MI_Lipa_Leaf.uasset
 2021-12-10 13:05:17 +05:00
PC-G09 d81a60cca7 Генплан школа 2021-12-10 12:29:19 +05:00
PC-G09 f26ae50b88 Набережная 2021-12-10 05:45:04 +05:00
PC-G09 e569f81157 Перенос мастеров в мастеры, вода поинтересней вроде, Декаль спортивной прощадки за ГП 4 2021-12-10 02:41:03 +05:00
GRAFF 957b6a5f8f Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Config/DefaultEngine.ini
#	Content/Maps/Main_Building.umap
 2021-12-09 18:54:51 +05:00
PC-G09 f119149fe0 Промка + деревья на тест 2021-12-09 18:34:53 +05:00
GRAFF 5ae34fd240 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Landscape.umap
 2021-12-09 16:54:35 +05:00
GRAFF d0b40aa55b гора всякого 2021-12-09 16:54:06 +05:00
PC-G09 51ef6fb17a Генпланы 2021-12-09 16:47:23 +05:00
GRAFF 33a7135216 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 2021-12-08 12:45:25 +05:00
GRAFF d55e7528d1 еще правочки 2021-12-08 12:45:21 +05:00
PC-G09 8d95392fd2 Генпланы, набережная 2021-12-07 19:31:20 +05:00
PC-G09 40f70385c0 Сборка 2021-12-07 12:55:31 +05:00