Commit Graph

143 Commits

Author SHA1 Message Date
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
GRAFF d3f31241b4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-07-04 13:51:49 +05:00
GRAFF c6d703b09b someshit 2022-07-04 13:51:42 +05:00
EgorSuv 6c270ef1e6 merge 2022-06-29 14:13:01 +05:00
EgorSuv e359a6b55f some changes 2022-06-29 14:10:51 +05:00
GRAFF aeed9c07d5 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-28 14:39:14 +05:00
GRAFF e43474a517 tkt 2022-06-28 14:38:55 +05:00
PC-G12 ae1957e50c A 2022-06-28 13:04:51 +05:00
PC-G12 8f9407d77b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-06-23 15:10:18 +05:00
PC-G12 0161288887 Tradizio_F2 2022-06-23 15:09:52 +05:00
GRAFF 2bc5fb986c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis
# Conflicts:
#	Content/Tradicio/Lamp_Blueprints/Tradicio_L_BP/BP_XIAOMI_LAMP_650_MM.uasset
2022-06-23 14:16:00 +05:00
GRAFF 20919630d1 someshit_baked-TKT_S01F03+Otrada_S01_F01-02+refl 2022-06-23 14:15:48 +05:00
PC-G12 5e7333e2ec Reflections 2022-06-23 12:04:19 +05:00
PC-G12 dcd57f98c5 Reflect 2022-06-22 11:57:04 +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 e066384a48 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-06-09 16:45:04 +05:00