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

128 Commits

Author SHA1 Message Date
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
EgorSuv 76f7916657 фиксы: 
фейд скайлайта, оптимизация яркости фейка, лифты, появление 1х этажей
 2022-09-06 18:12:39 +05:00
Andrew 53eeb79211 LOD fix 2022-09-05 17:47:53 +05:00
EgorSuv eb902d5aeb TEXTURE CUMBACK 2022-09-02 14:05:45 +05:00
EgorSuv 7b8c85b49f Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-08-31 20:25:34 +05:00
EgorSuv efc34c142a bugs fixed 2022-08-31 20:25:14 +05:00
GRAFF 22384b07ea ints 2022-08-31 19:40:16 +05:00
DESKTOP-8J0BKKD\Admin a45cfaacf3 Фикс дома 2 2022-08-30 16:13:14 +05:00
DESKTOP-8J0BKKD\Admin 77c4de7ac9 Фикс дома 2022-08-30 14:40:28 +05:00
EgorSuv b45b47ddec parking added, bugs fixed 2022-08-29 17:50:57 +05:00
FORTIS\Fortis Development b21fd42a15 LOD and Proxy Mashes created 2022-08-25 18:13:14 +05:00
FORTIS\Fortis Development 7514381c9d TKT LOD fix 2022-08-22 15:17:06 +05:00
FORTIS\Fortis Development bd318cd024 TKT LOD fix 2022-08-22 15:11:02 +05:00
EgorSuv c9a81c5588 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-08-18 19:09:31 +05:00
EgorSuv a868071f3b distance ring, fade and sky light conflict, fixed, second house in tactics added 2022-08-18 19:09:14 +05:00
FORTIS\Fortis Development da64529589 TKT LOD Optimization 2022-08-18 19:03:48 +05:00
EgorSuv e5d0ce9f39 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-08-16 15:47:29 +05:00
EgorSuv 89394d50fa navigation, tkt landscape, optimized and lods added 2022-08-16 15:46:53 +05:00
FORTIS\Fortis Development 372bdceaf2 lightmap optimization 2022-08-16 15:39:00 +05:00
GRAFF 22824047b9 smth 2022-08-05 18:41:30 +05:00
GRAFF cc0dec4d5b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-08-05 12:37:15 +05:00
GRAFF eb40278d9a treesnsmth 2022-08-05 12:29:32 +05:00
EgorSuv 2a9b43c779 reboot added, UI fixed 2022-08-04 18:48:02 +05:00
GRAFF 4069ea662f skytex 2022-07-28 23:30:49 +05:00
GRAFF 8f6ea14d2a sk 2022-07-27 17:59:13 +05:00
GRAFF ad33499853 smth 2022-07-27 16:15:38 +05:00
GRAFF 92b698aba2 tkt_unbakedcaps,fixtradicioskylight,reflfix 2022-07-26 23:17:25 +05:00
GRAFF 5c3a23fbdc ma baker 2022-07-26 18:17:46 +05:00
GRAFF 3cb4ebd42d smth 2022-07-25 20:27:32 +05:00
GRAFF c6d703b09b someshit 2022-07-04 13:51:42 +05:00
GRAFF e43474a517 tkt 2022-06-28 14:38:55 +05:00