Commit Graph

70 Commits

Author SHA1 Message Date
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
PC-G12 b423903d88 Buildings 2022-06-02 18:58:48 +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
EgorSuv 29cff7bbae MERGE 2022-06-02 18:07:01 +05:00
EgorSuv 4779a570ca VR yard fade fixed 2022-06-02 18:06:55 +05:00
GRAFF cd39dae52e Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-06-02 18:05:05 +05:00
GRAFF e63491b564 Yard_Collision 2022-06-02 18:05:02 +05:00
EgorSuv a946304c73 MERGE 2022-06-02 17:33:24 +05:00
EgorSuv 9934e895be tactics lighting modified 2022-06-02 17:33:11 +05:00
GRAFF 5ae9286735 tkt_ 2022-06-02 17:28:31 +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 298415ebb3 MERGE 2022-06-01 18:44:30 +05:00
EgorSuv 4092513642 no changes 2022-06-01 18:44:22 +05:00
GRAFF 637dac2247 tkt 2022-06-01 18:12:48 +05:00
EgorSuv 97b6b1a502 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-06-01 16:26:41 +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
EgorSuv 5e3db03352 some changes 2022-06-01 16:00:32 +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
PC-G12 dee2c8a283 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-06-01 12:00:45 +05:00
PC-G12 5fa1d2c658 Dvors 2022-06-01 12:00:23 +05:00
GRAFF bb33d87e09 tkt 2022-05-31 16:49:38 +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
PC-G12 a35f0369f7 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-05-31 16:13:19 +05:00
PC-G12 78446002dc TrafficLight_Lights_und_BPs_Bake 2022-05-31 16:13:09 +05:00
GRAFF 537b6863b7 кiт кродеться к гиту 2022-05-31 16:13:08 +05:00
GRAFF ef31a338d2 bakedroads_streamingnow 2022-05-31 13:51:59 +05:00
GRAFF 67155fc723 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-05-31 13:45:55 +05:00
GRAFF 43072ce29f tkt 2022-05-31 13:45:47 +05:00
PC-G12 43f4127596 Roads_Bake 2022-05-31 13:39:59 +05:00
PC-G12 22605c3ca3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-05-31 12:02:42 +05:00
PC-G12 e32ad8d7e5 RoadSigns 2022-05-31 12:02:34 +05:00
GRAFF b694af32fa Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-05-31 11:04:49 +05:00
GRAFF d472d3b2f6 tkt 2022-05-31 11:04:47 +05:00
EgorSuv a1c5a6fd1c MERGE 2022-05-30 17:27:47 +05:00
EgorSuv d80e36ac04 rc levels data table added 2022-05-30 17:27:36 +05:00
GRAFF 519cf80035 Elevators 2022-05-30 17:09:35 +05:00
GRAFF e65a9877dc tkt 2022-05-30 16:19:11 +05:00
GRAFF 8ef94a7596 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-05-30 16:15:56 +05:00
GRAFF 78364c807c tkt 2022-05-30 16:15:50 +05:00
PC-G12 12c0bc19c7 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-05-30 16:13:09 +05:00
PC-G12 e215983011 Roads 2022-05-30 16:12:57 +05:00