Commit Graph

39 Commits

Author SHA1 Message Date
GRAFF 22824047b9 smth 2022-08-05 18:41:30 +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
DESKTOP-8J0BKKD\Admin a2dacde786 Текстуры 2022-08-01 15:12:24 +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 92b698aba2 tkt_unbakedcaps,fixtradicioskylight,reflfix 2022-07-26 23:17:25 +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 a3f8f97ba7 apartment point upgrade 2022-07-26 16:36:29 +05:00
GRAFF c6d703b09b someshit 2022-07-04 13:51:42 +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 4353288bb7 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-20 14:09:09 +05:00
GRAFF f55533fa88 tkt, Freestylo mopsik 2022-06-20 14:08:52 +05:00
PC-G12 1ed5efcb6b hat 2022-06-20 14:04:17 +05:00
PC-G12 861ca649de Otrada_MOP 2022-06-16 16:13:26 +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 2a727f8678 tkt 2022-06-06 15:05:33 +05:00
GRAFF ca822e3a69 tkt 2022-06-03 18:00:20 +05:00
GRAFF 901c52cbab tkt 2022-06-02 16:37:37 +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
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
EgorSuv 327041ce9c merge 2022-05-30 13:44:37 +05:00
EgorSuv a52c64495a walking pawn camera update, added game modes to all rc 2022-05-30 13:43:25 +05:00
PC-G06 79902f343e TKT_S01_F03_F04_Interior 2022-05-27 17:04:23 +05:00
EgorSuv 76df2a1cde old content added 2022-05-26 18:32:27 +05:00