Commit Graph

66 Commits

Author SHA1 Message Date
Dron ec709a4214 taktika fix 2023-07-30 14:48:08 +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
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 f1633de4ec номера этажей 2022-09-07 16:11:31 +05:00
EgorSuv 76f7916657 фиксы:
фейд скайлайта, оптимизация яркости фейка, лифты, появление 1х этажей
2022-09-06 18:12:39 +05:00
GRAFF 22384b07ea ints 2022-08-31 19:40:16 +05:00
EgorSuv b45b47ddec parking added, bugs fixed 2022-08-29 17:50:57 +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 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 e43474a517 tkt 2022-06-28 14:38:55 +05:00
GRAFF 20919630d1 someshit_baked-TKT_S01F03+Otrada_S01_F01-02+refl 2022-06-23 14:15:48 +05:00
GRAFF ccb872ca2d tkt 2022-06-15 14:09:58 +05:00
GRAFF b9f4d6a59c S01+S02+Parking 2022-06-09 16:45:01 +05:00
GRAFF 6f27ca941f tkt_S2 2022-06-08 12:13:03 +05:00
GRAFF 5d4c15e4ce tkt 2022-06-06 17:38:34 +05:00
DESKTOP-8J0BKKD\Admin 8fd898612d TKT_Parking 2022-06-06 14:49:37 +05:00
GRAFF 111eca95f3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-06-03 18:00:23 +05:00
GRAFF ca822e3a69 tkt 2022-06-03 18:00:20 +05:00
PC-G06 35b677b7a1 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis
# Conflicts:
#	Content/Taktika/Maps/Interior/TKT_S01F03_Interior.umap
#	Content/Taktika/Maps/Interior/TKT_S01F05+_Interior.umap
2022-06-03 17:55:39 +05:00
PC-G06 2a08022e0c TKT_S02_Cap 2022-06-03 17:54:53 +05:00
GRAFF 5ae9286735 tkt_ 2022-06-02 17:28:31 +05:00
GRAFF 901c52cbab tkt 2022-06-02 16:37:37 +05:00
GRAFF 637dac2247 tkt 2022-06-01 18:12:48 +05:00
GRAFF f64c05e7c5 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis
# Conflicts:
#	Content/Taktika/Maps/Interior/TKT_S01F05+_Interior.umap
2022-06-01 16:13:37 +05:00
GRAFF dcf4b6e5c8 tkt 2022-06-01 16:12:59 +05:00
PC-G06 3b7c0dddbf Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis
# Conflicts:
#	Content/Taktika/Assets/Interior/WindowsDoors/SM_ApartDoorR_001.uasset
#	Content/Taktika/Maps/Interior/TKT_S01F05+_Interior.umap
2022-06-01 14:00:21 +05:00
PC-G06 97bf1b0c40 TKT_S02_F03_F04_F05_Interior 2022-06-01 13:49:22 +05:00
GRAFF bb33d87e09 tkt 2022-05-31 16:49:38 +05:00
GRAFF 43072ce29f tkt 2022-05-31 13:45:47 +05:00