Commit Graph

45 Commits

Author SHA1 Message Date
GRAFF da0cb2fde8 redirectores 2022-12-26 14:11:39 +05:00
GRAFF 9b9ffee9f2 всякое 2022-12-26 12:47:33 +05:00
GRAFF dcf62fc914 много всякого 2022-12-22 17:35:54 +05:00
GRAFF 6abcb08dae куча правок и всякгого 2022-12-16 16:46:32 +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
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 864ced150f texturecuback2 2022-09-02 17:22:55 +05:00
EgorSuv eb902d5aeb TEXTURE CUMBACK 2022-09-02 14:05:45 +05:00
FORTIS\Fortis Development a5b109c727 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-08-29 17:56:57 +05:00
FORTIS\Fortis Development 304cc9666e Otrada LODs added 2022-08-29 17:54:47 +05:00
EgorSuv a9bea8cc99 procedural mesh optimized, fade function added, ui updated 2022-08-25 19:37:48 +05:00
FORTIS\Fortis Development 372bdceaf2 lightmap optimization 2022-08-16 15:39:00 +05:00
Andrew 939ae7f002 interior texture optimization 2022-08-10 18:56:50 +05:00
Andrew 88fcbfbb96 merge 2022-08-09 18:14:45 +05:00
Andrew bf4c276c2e texture optimization 2022-08-09 18:08:50 +05:00
PC-G12 cea5b5d837 TC? 2022-08-05 18:25:10 +05:00
PC-G12 e17e702147 Texture_Correction? 2022-08-05 17:18:16 +05:00
Andrew 8be33d6d05 merge 2022-08-04 19:11:06 +05:00
Andrew 8bfb3ca001 level collision fix 2022-08-04 19:02:54 +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
EgorSuv a3f8f97ba7 apartment point upgrade 2022-07-26 16:36:29 +05:00
GRAFF aeed9c07d5 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis
# Conflicts:
#	Content/Furniture/All/Materials/Inst/Wood/MI_Wood_Kitchen_Triplanar.uasset
2022-06-28 14:39:14 +05:00
GRAFF e43474a517 tkt 2022-06-28 14:38:55 +05:00
PC-G12 ae1957e50c A 2022-06-28 13:04:51 +05:00
GRAFF 2bc5fb986c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis
# Conflicts:
#	Content/Tradicio/Lamp_Blueprints/Tradicio_L_BP/BP_XIAOMI_LAMP_650_MM.uasset
2022-06-23 14:16:00 +05:00
GRAFF 20919630d1 someshit_baked-TKT_S01F03+Otrada_S01_F01-02+refl 2022-06-23 14:15:48 +05:00
PC-G12 5e7333e2ec Reflections 2022-06-23 12:04:19 +05:00
PC-G12 dcd57f98c5 Reflect 2022-06-22 11:57:04 +05:00
GRAFF f55533fa88 tkt, Freestylo mopsik 2022-06-20 14:08:52 +05:00
GRAFF ccb872ca2d tkt 2022-06-15 14:09:58 +05:00
GRAFF 6f27ca941f tkt_S2 2022-06-08 12:13:03 +05:00
GRAFF ca822e3a69 tkt 2022-06-03 18:00:20 +05:00
GRAFF 5ae9286735 tkt_ 2022-06-02 17:28:31 +05:00
GRAFF 43072ce29f tkt 2022-05-31 13:45:47 +05:00
GRAFF f585c9dc84 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-05-27 17:18:21 +05:00
GRAFF 7ad0c193c6 TKT_draftbakepreparanus 2022-05-27 17:07:32 +05:00
PC-G06 79902f343e TKT_S01_F03_F04_Interior 2022-05-27 17:04:23 +05:00
EgorSuv 76df2a1cde old content added 2022-05-26 18:32:27 +05:00