EgorSuv/Fortis
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
240 Commits 3 Branches 0 Tags
7bf5598df4e4a507b986fcd89222f8a3b87e7959
Commit Graph

234 Commits

Author SHA1 Message Date
PC-G04 7bf5598df4 4 2023-09-25 12:35:54 +05:00
PC-G04 088bf445a4 4 2023-09-25 11:12:52 +05:00
PC-G04 e9678754c5 mop_s4 2023-09-22 18:11:19 +05:00
Omar 0b64ecb8a3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2023-09-20 18:47:13 +05:00
Omar d6977a785e S04 MOP 2023-09-20 18:47:06 +05:00
PC-G04 ac85c68ea4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 
# Conflicts:
#	Content/Freestyle/Maps/Interiors/S04/Refl_S04_F01.umap
 2023-09-20 15:42:13 +05:00
PC-G04 08dc17ee38 моп 2023-09-20 15:41:36 +05:00
Omar fae41d0fb6 S04 F2 2023-09-20 15:37:07 +05:00
Omar be667048a6 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2023-09-19 12:59:34 +05:00
Omar d1b21714a4 S04 F2 2023-09-19 12:59:28 +05:00
PC-G04 acbb5bdb46 MOPS 2023-09-18 19:03:34 +05:00
PC-G04 68e3cabb0b second floor 2023-09-18 13:52:18 +05:00
PC-G04 07a9267e6b Mop Cap S4 2023-09-18 12:22:58 +05:00
PC-G04 6591eb8789 МОП4 2023-09-15 15:30:25 +05:00
Omar 5a069dd809 S04 UPD 2023-09-15 12:11:02 +05:00
Omar f97e1e2225 S04 2023-09-15 12:06:02 +05:00
Omar 5ca8ed7bb4 S04 2023-09-14 12:01:10 +05:00
PC-G04 8aeaa74899 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2023-09-13 12:29:07 +05:00
PC-G04 c205d4ac7e а 2023-09-13 12:29:02 +05:00
Omar 758374c26e S04 2023-09-13 12:19:08 +05:00
PC-G04 4e9a6c30a9 Позиция S04F01 2023-09-12 16:12:40 +05:00
PC-G04 31db3d2f55 S4 F01 2023-09-12 15:26:37 +05:00
Dron ec709a4214 taktika fix 2023-07-30 14:48:08 +05:00
GRAFF 4a934b31f9 AUF 2023-06-16 18:11:48 +05:00
GRAFF aca64bf481 еще правочка тридитио 2023-01-23 15:10:31 +05:00
GRAFF 683a255878 исправлена почта, доработаны кп, добавление менеджеров, особенности хат 2023-01-19 19:16:42 +05:00
GRAFF ac182257f1 ogo blyat 2022-12-28 14:24:13 +05:00
GRAFF 7195fa90a8 asdas 2022-12-28 13:39:29 +05:00
GRAFF d200a77719 ehse peredelki 2022-12-27 16:34:00 +05:00
GRAFF c23af11d82 redirecos 2022-12-26 14:17:51 +05:00
GRAFF da0cb2fde8 redirectores 2022-12-26 14:11:39 +05:00
GRAFF 9b9ffee9f2 всякое 2022-12-26 12:47:33 +05:00
GRAFF 38aa1c0d49 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 
# Conflicts:
#	Content/Taktika/Maps/Interior/TKT_S02F05+_Interior_P.umap
 2022-12-22 19:15:42 +05:00
GRAFF dcf62fc914 много всякого 2022-12-22 17:35:54 +05:00
GRAFF 6abcb08dae куча правок и всякгого 2022-12-16 16:46:32 +05:00
PC-G13 9ffcb4cd8f Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 
# Conflicts:
#	Content/Taktika/Maps/Interior/Bakery/TKT_Bakery.umap
#	Content/Taktika/Maps/Interior/TKT_S02F05+_Interior.umap
 2022-11-17 13:09:09 +05:00
PC-G13 eae382e15c cappa 2022-11-17 13:07:31 +05:00
EgorSuv f72255f35e some 2022-11-15 18:24:09 +05:00
EgorSuv 87fce8e617 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 
# Conflicts:
#	Content/Freestyle/Maps/Interiors/Bakery.umap
#	Content/Freestyle/Maps/Interiors/S01/Interior_S01_F01.umap
#	Content/Freestyle/Maps/Interiors/S01/Interior_S01_F02.umap
#	Content/Freestyle/Maps/Interiors/S02/Interior_S02_F01.umap
#	Content/Freestyle/Maps/Interiors/S02/Interior_S02_F02.umap
#	Content/Freestyle/Maps/Interiors/S03/Interior_S03_F01.umap
#	Content/Freestyle/Maps/Interiors/S03/Interior_S03_F02.umap
#	Content/Otrada/Maps/Interior_Levels/A_11/A11_F1.umap
#	Content/Otrada/Maps/Interior_Levels/A_11/A11_F2-6.umap
#	Content/Otrada/Maps/Interior_Levels/A_11/A11_F23-25.umap
#	Content/Otrada/Maps/Interior_Levels/A_11/A11_F7-22.umap
#	Content/Otrada/Maps/Interior_Levels/A_12/A12_F18-23.umap
#	Content/Otrada/Maps/Interior_Levels/A_12/A12_F2-5.umap
#	Content/Otrada/Maps/Interior_Levels/A_12/A12_F24-26.umap
#	Content/Otrada/Maps/Interior_Levels/A_12/A12_F6-17.umap
#	Content/Otrada/Maps/Interior_Levels/A_12/A12_F_1.umap
#	Content/Otrada/Maps/Interior_Levels/Bakery.umap
#	Content/Taktika/Maps/Interior/Bakery/TKT_Bakery.umap
#	Content/Taktika/Maps/Interior/TKT_S02F04_Interior.umap
#	Content/Tradicio/Maps/Tradicio_Interiors/Bakery.umap
#	Content/Tradicio/Maps/Tradicio_Interiors/Tradicio_Interior_F1.umap
#	Content/Tradicio/Maps/Tradicio_Interiors/Tradicio_Interior_F2.umap
#	Content/Tradicio/Maps/Tradicio_Interiors/Tradicio_Interior_F3.umap
 2022-11-03 17:09:12 +05:00
EgorSuv 0cc381c008 ebala vsyakaya 2022-11-03 17:08:33 +05:00
PC-G13 9b6cb1e742 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 
# Conflicts:
#	Content/Freestyle/Maps/Exterior/L_Lighting_Freestyle.umap
#	Content/Freestyle/Maps/Interiors/S01/Interior_S01_F01.umap
#	Content/Freestyle/Maps/Interiors/S01/Interior_S01_F02.umap
#	Content/Freestyle/Maps/Interiors/S02/Interior_S02_F01.umap
#	Content/Freestyle/Maps/Interiors/S02/Interior_S02_F02.umap
#	Content/Freestyle/Maps/Interiors/S03/Interior_S03_F01.umap
#	Content/Freestyle/Maps/Interiors/S03/Interior_S03_F02.umap
#	Content/Furniture/All/Materials/Inst/Wood/MI_Wood_Sonoma_Oak_Brighter.uasset
#	Content/Furniture/All/Materials/Inst/prop/MI_AI_vol3_2_hotplate_01_0.uasset
#	Content/Otrada/Maps/Interior_Levels/A_11/A11_F1.umap
#	Content/Otrada/Maps/Interior_Levels/A_11/A11_F2-6.umap
#	Content/Otrada/Maps/Interior_Levels/A_11/A11_F23-25.umap
#	Content/Otrada/Maps/Interior_Levels/A_11/A11_F7-22.umap
#	Content/Otrada/Maps/Interior_Levels/A_12/A12_F18-23.umap
#	Content/Otrada/Maps/Interior_Levels/A_12/A12_F2-5.umap
#	Content/Otrada/Maps/Interior_Levels/A_12/A12_F24-26.umap
#	Content/Otrada/Maps/Interior_Levels/A_12/A12_F6-17.umap
#	Content/Otrada/Maps/Interior_Levels/A_12/A12_F_1.umap
#	Content/Otrada/Maps/Otrada_Day_Light.umap
#	Content/Taktika/Maps/Interior/TKT_S01F03_Interior.umap
#	Content/Taktika/Maps/Interior/TKT_S01F04_Interior.umap
#	Content/Taktika/Maps/Interior/TKT_S01F05+_Interior.umap
#	Content/Taktika/Maps/Interior/TKT_S02F03_Interior.umap
#	Content/Taktika/Maps/Interior/TKT_S02F04_Interior.umap
#	Content/Taktika/Maps/Interior/TKT_S02F05+_Interior.umap
#	Content/Taktika/Maps/TKT_Day_Light.umap
#	Content/Tradicio/Maps/Tradicio_DayLight.umap
#	Content/Tradicio/Maps/Tradicio_Interiors/Tradicio_Interior_F1.umap
#	Content/Tradicio/Maps/Tradicio_Interiors/Tradicio_Interior_F2.umap
#	Content/Tradicio/Maps/Tradicio_Interiors/Tradicio_Interior_F3.umap
#	Content/Tradicio/Meshes/Interior/Other/SM_Tradicio_Elevator.uasset
 2022-11-03 15:42:11 +05:00
PC-G13 3394a0771a postoptimizaciya 2022-11-03 15:41:20 +05:00
EgorSuv eac9729522 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-10-26 19:41:52 +05:00
EgorSuv 623db81379 ух блять 2022-10-26 18:38:40 +05:00
Andrew 9483fa3e3b нормальные текстуры 2022-09-07 16:26:33 +05:00
EgorSuv 7c03b824ba Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-09-07 16:11:53 +05:00
EgorSuv f1633de4ec номера этажей 2022-09-07 16:11:31 +05:00
Andrew 08afa62fff Tradicio elevator 2022-09-07 11:19:57 +05:00
Andrew 9d0a428317 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 
# Conflicts:
#	Content/Blueprints/Managers/BP_Controller.uasset
#	Content/Freestyle/Maps/FreestyleMainScene.umap
#	Content/Freestyle/Maps/Freestyle_Developer.umap
#	Content/Freestyle/Meshes/MainBuilding/S01/Fixed/SM_Fasad_S01_base.uasset
#	Content/Freestyle/Meshes/MainBuilding/S02/SM_Fasad_S02_base.uasset
#	Content/Freestyle/Meshes/MainBuilding/S03/SM_Fasad_S03_base.uasset
#	Content/Freestyle/Meshes/MainBuilding/S04/SM_Fasad_S04_base.uasset
#	Content/Freestyle/Meshes/MainBuilding/S05/SM_Fasad_S05_base.uasset
#	Content/Otrada/Maps/Otrada_MainScene.umap
#	Content/Taktika/Assets/Exterior/MAF/21_SwingRainbow/SM_MAF_SwingRainbow.uasset
#	Content/Taktika/Maps/TKT_MainScene.umap
#	Content/Taktika/Maps/TKT_OutsideBuildings.umap
#	Content/Tradicio/Maps/Tradicio_MainBuiding.umap
#	Content/Tradicio/Maps/Tradicio_MainScene.umap
 2022-09-06 19:17:39 +05:00
EgorSuv 76f7916657 фиксы: 
фейд скайлайта, оптимизация яркости фейка, лифты, появление 1х этажей
 2022-09-06 18:12:39 +05:00