Commit Graph

64 Commits

Author SHA1 Message Date
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
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
EgorSuv fecfc092a8 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-08-30 16:43:49 +05:00
EgorSuv 960c169400 bugs fixed 2022-08-30 16:43:42 +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 b45b47ddec parking added, bugs fixed 2022-08-29 17:50:57 +05:00
EgorSuv e36bb091d4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-08-25 19:38:23 +05:00
EgorSuv a9bea8cc99 procedural mesh optimized, fade function added, ui updated 2022-08-25 19:37:48 +05:00
FORTIS\Fortis Development b21fd42a15 LOD and Proxy Mashes created 2022-08-25 18:13:14 +05:00
FORTIS\Fortis Development bd318cd024 TKT LOD fix 2022-08-22 15:11:02 +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
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
EgorSuv 3a9359da86 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-08-09 17:54:45 +05:00
EgorSuv 3d07d364ed ui fixed 2022-08-09 17:53:46 +05:00
PC-G12 4b1c95a377 Volumetric_Vol2 2022-08-08 14:45:52 +05:00
PC-G12 47fd1d0d25 Volumetric 2022-08-08 12:55:31 +05:00
PC-G12 9f37d3a0a7 Trdz_V 2022-08-05 19:56:51 +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
PC-G12 1f7f70accb Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis
# Conflicts:
#	Content/Otrada/Meshes/Otrada/JeKa/Interior/SM_A12_F18_WallCap.uasset
#	Content/Otrada/Meshes/Otrada/JeKa/Interior/SM_A12_F1_WallCap_Highlight.uasset
#	Content/Otrada/Meshes/Otrada/JeKa/Interior/SM_A12_F24_WallCap.uasset
#	Content/Otrada/Meshes/Otrada/JeKa/Interior/SM_A12_F2_WallCap.uasset
#	Content/Tradicio/Meshes/Interior/Tradicio_Interior_F3/SM_Tradicio_Cap_1.uasset
#	Content/Tradicio/Meshes/Interior/Tradicio_Interior_F3/SM_Tradicio_Cap_2.uasset
#	Content/Tradicio/Meshes/Interior/Tradicio_Interior_F3/SM_Tradicio_Cap_3.uasset
2022-08-05 12:24:36 +05:00
PC-G12 db385f8750 Some_Caps 2022-08-05 12:01:43 +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
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 68636a9eb7 kirisha 2022-07-26 18:36:34 +05:00
GRAFF 5c3a23fbdc ma baker 2022-07-26 18:17:46 +05:00
GRAFF c6d703b09b someshit 2022-07-04 13:51:42 +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
PC-G12 8f9407d77b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-06-23 15:10:18 +05:00
PC-G12 0161288887 Tradizio_F2 2022-06-23 15:09:52 +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