Commit Graph

57 Commits

Author SHA1 Message Date
GRAFF c23af11d82 redirecos 2022-12-26 14:17:51 +05:00
GRAFF da0cb2fde8 redirectores 2022-12-26 14:11:39 +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
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 efc34c142a bugs fixed 2022-08-31 20:25:14 +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
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 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 89394d50fa navigation, tkt landscape, optimized and lods added 2022-08-16 15:46:53 +05:00
Andrew bf4c276c2e texture optimization 2022-08-09 18:08:50 +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
DESKTOP-8J0BKKD\Admin a2dacde786 Текстуры 2022-08-01 15:12:24 +05:00
GRAFF 4069ea662f skytex 2022-07-28 23:30:49 +05:00
GRAFF e43474a517 tkt 2022-06-28 14:38:55 +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 b9f4d6a59c S01+S02+Parking 2022-06-09 16:45:01 +05:00
GRAFF 6f27ca941f tkt_S2 2022-06-08 12:13:03 +05:00
PC-G12 f227a10d45 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-06-03 18:07:17 +05:00
PC-G12 f9c04e9e38 FoliageCars 2022-06-03 18:07:02 +05:00
GRAFF ca822e3a69 tkt 2022-06-03 18:00:20 +05:00
PC-G12 9a18f227d0 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-06-02 18:42:21 +05:00
PC-G12 8f0640fde5 EnvironmentBuild_5_4 2022-06-02 18:41:48 +05:00
GRAFF e63491b564 Yard_Collision 2022-06-02 18:05:02 +05:00
GRAFF a42cbbea14 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis
# Conflicts:
#	Content/Taktika/Maps/TKT_Landscape.umap
2022-06-02 16:38:01 +05:00
GRAFF 901c52cbab tkt 2022-06-02 16:37:37 +05:00
PC-G12 cac1125919 Decals_Yard 2022-06-02 16:34:58 +05:00
PC-G12 7893e0df76 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis
# Conflicts:
#	Content/Taktika/Maps/TKT_Landscape.umap
2022-06-01 19:58:10 +05:00
PC-G12 19efbb50ca Monetka 2022-06-01 19:56:32 +05:00
EgorSuv 5e3db03352 some changes 2022-06-01 16:00:32 +05:00
EgorSuv 16001616e0 MERGE 2022-05-31 16:18:34 +05:00
EgorSuv 7e150b04a8 level pack loading added, pawn walking camera fixed 2022-05-31 16:17:21 +05:00
GRAFF 537b6863b7 кiт кродеться к гиту 2022-05-31 16:13:08 +05:00
GRAFF 43072ce29f tkt 2022-05-31 13:45:47 +05:00
EgorSuv a1c5a6fd1c MERGE 2022-05-30 17:27:47 +05:00