EgorSuv/Fortis
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
343 Commits 3 Branches 0 Tags
ff88db21e82b0eebb258fe2abc97fa0cf87f5ccc
Commit Graph

158 Commits

Author SHA1 Message Date
PC-G04 ff88db21e8 S01F06 2025-01-10 13:43:55 +05:00
Evgenii 138c00ecf5 facade 1.2.1, 1.2.2 2025-01-10 11:16:45 +05:00
Dron 7f27181d34 ААААААААА 2025-01-09 22:08:58 +05:00
Dron 5764fa654e ass 2024-12-27 13:13:00 +05:00
Dron 8db4ffe23d fix yard tour 2024-12-25 21:01:51 +05:00
Dron f03c909097 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 
# Conflicts:
#	Content/Taktika/Maps/TKT_Landscape.umap
#	Content/Taktika/Maps/TKT_MainScene.umap
 2024-12-25 19:22:00 +05:00
Dron 2b65e064a4 mda 2024-12-25 19:21:24 +05:00
PC-G09 f56bf4bdd2 Trees Outside 2024-12-25 17:43:09 +05:00
Dron c3a956022c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 
# Conflicts:
#	Content/Taktika/Maps/TKT_Yard.umap
 2024-12-24 19:52:06 +05:00
Dron 66c4629204 hueta eshe 2024-12-24 19:51:33 +05:00
PC-G04 6bb6fc022e Стилобат 2024-12-24 18:02:32 +05:00
Dron 8fd867b36d Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2024-12-24 15:13:09 +05:00
Dron 18814c0920 caps engaged 2024-12-24 15:13:03 +05:00
PC-G04 084ca232b6 своими пидорскми пректми на кнец гда у мня 6 кдрв 2024-12-24 15:10:14 +05:00
Evgenii b2142dc49a gp 1.1.2 2024-12-24 13:52:58 +05:00
PC-G13 7cedb2822f Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 
# Conflicts:
#	Content/Taktika/Maps/Interior/TKT_S01F02-05_Interior.umap
#	Content/Taktika/Maps/Interior/TKT_S01F06_Interior.umap
#	Content/Taktika/Maps/Interior/TKT_S01F07-21_Interior.umap
#	Content/Taktika/Maps/Interior/TKT_S02F02-05_Interior.umap
#	Content/Taktika/Maps/Interior/TKT_S02F06_Interior.umap
#	Content/Taktika/Maps/Interior/TKT_S02F07-16_Interior.umap
 2024-12-23 21:52:44 +05:00
PC-G13 1358d017f6 coll Apcaps wallcaps 2024-12-23 21:52:23 +05:00
Dron 6e15c2f3eb house 1 engaged, ebuchiy fortis, interior ligts 2024-12-23 20:54:07 +05:00
PC-G04 6660627a83 есть свои приколы, но думаю всё получится 2024-12-23 10:46:38 +05:00
PC-G04 466d25240a КРышки осталось доделать и всёёёё 2024-12-22 19:19:20 +05:00
JohnnyHatchet 9e6b464ca1 Outside 2024-12-20 16:05:05 +05:00
PC-G04 cdb6bc3364 Ебучий первый дом готов 2024-12-20 15:44:18 +05:00
Evgenii fcc3039148 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2024-12-19 11:32:26 +05:00
Evgenii 6833a55a9d gp 1.1.1, 1.1.3 2024-12-19 11:32:16 +05:00
PC-G04 71cd68aec1 иНТЕРЬЕРЫ 2024-12-19 11:08:41 +05:00
Dron 1f01f428d9 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2024-12-09 18:16:39 +05:00
Dron eb545e013a tkt new uds 2024-12-09 18:15:33 +05:00
PC-G04 53d51e338e renameLevels 2024-12-07 13:03:34 +05:00
Dron 256fc7f48b nahui 2024-04-09 12:45:29 +05:00
PC-G04 f7ee92dd13 WaterTKT 2024-04-09 11:42:03 +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 d200a77719 ehse peredelki 2022-12-27 16:34:00 +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 623db81379 ух блять 2022-10-26 18:38:40 +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 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