Commit Graph

65 Commits

Author SHA1 Message Date
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
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
DESKTOP-8J0BKKD\Admin a2dacde786 Текстуры 2022-08-01 15:12:24 +05:00
GRAFF 4069ea662f skytex 2022-07-28 23:30:49 +05:00
GRAFF 3cb4ebd42d smth 2022-07-25 20:27:32 +05:00
GRAFF e43474a517 tkt 2022-06-28 14:38:55 +05:00
GRAFF 20919630d1 someshit_baked-TKT_S01F03+Otrada_S01_F01-02+refl 2022-06-23 14:15:48 +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 71b686892e Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-06-08 12:13:08 +05:00
GRAFF 6f27ca941f tkt_S2 2022-06-08 12:13:03 +05:00
PC-G12 939a5035e9 Light_Decals 2022-06-07 19:01:59 +05:00
GRAFF 7dbbc6912d tkt 2022-06-07 10:39:30 +05:00
GRAFF 5d4c15e4ce tkt 2022-06-06 17:38:34 +05:00
DESKTOP-8J0BKKD\Admin 8fd898612d TKT_Parking 2022-06-06 14:49:37 +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 111eca95f3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-06-03 18:00:23 +05:00
GRAFF ca822e3a69 tkt 2022-06-03 18:00:20 +05:00
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 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
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
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
GRAFF 537b6863b7 кiт кродеться к гиту 2022-05-31 16:13:08 +05:00
GRAFF 43072ce29f tkt 2022-05-31 13:45:47 +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