Commit Graph

162 Commits

Author SHA1 Message Date
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 39515384df Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-08-10 18:58:35 +05:00
Andrew 939ae7f002 interior texture optimization 2022-08-10 18:56:50 +05:00
EgorSuv b33f982da4 UI fixed 2022-08-10 18:51:57 +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 43a481b390 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-08-05 18:41:33 +05:00
GRAFF 22824047b9 smth 2022-08-05 18:41:30 +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
PC-G12 462498fe84 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-08-05 15:00:10 +05:00
PC-G12 fe070b692b Freestyle_Otrada_Caps_IndexFix 2022-08-05 15:00:05 +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 e440935532 merge 2022-08-04 18:49:01 +05:00
EgorSuv 2a9b43c779 reboot added, UI fixed 2022-08-04 18:48:02 +05:00
PC-G12 9442a18e87 RC 2022-08-04 18:33:04 +05:00
DESKTOP-8J0BKKD\Admin a2dacde786 Текстуры 2022-08-01 15:12:24 +05:00
EgorSuv a6d3ffbff6 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-07-29 13:09:21 +05:00
EgorSuv 0fd720d9fc templates update 2022-07-29 13:09:11 +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 f12b5a3323 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-07-27 16:15:47 +05:00
GRAFF ad33499853 smth 2022-07-27 16:15:38 +05:00
EgorSuv 5a9a083649 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-07-27 16:08:18 +05:00
EgorSuv 7079bf8434 fake skylight added 2022-07-27 16:08:07 +05:00
GRAFF a90a66d395 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-07-26 23:17:28 +05:00
GRAFF 92b698aba2 tkt_unbakedcaps,fixtradicioskylight,reflfix 2022-07-26 23:17:25 +05:00
EgorSuv d239e7a7ff merge 2022-07-26 19:15:07 +05:00
EgorSuv e71d2dc2ed bugs fixed 2022-07-26 19:14:39 +05:00
GRAFF 68636a9eb7 kirisha 2022-07-26 18:36:34 +05:00
GRAFF 282f70c819 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-07-26 18:17:52 +05:00
GRAFF 5c3a23fbdc ma baker 2022-07-26 18:17:46 +05:00
EgorSuv 2273346153 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-07-26 16:36:39 +05:00
EgorSuv a3f8f97ba7 apartment point upgrade 2022-07-26 16:36:29 +05:00
GRAFF 70a4679ae4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-07-25 20:27:35 +05:00
GRAFF 3cb4ebd42d smth 2022-07-25 20:27:32 +05:00
EgorSuv 0c10f800a8 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-07-21 17:26:23 +05:00
EgorSuv 077b2700cb light parameter changed 2022-07-21 17:26:19 +05:00