Commit Graph

115 Commits

Author SHA1 Message Date
GRAFF 3cb4ebd42d smth 2022-07-25 20:27:32 +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
GRAFF b9f4d6a59c S01+S02+Parking 2022-06-09 16:45:01 +05:00
PC-G12 3af2c63b64 Lights and a boy 2022-06-09 16:42:44 +05:00
PC-G12 0483a60e27 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-06-08 19:53:58 +05:00
PC-G12 3c11c97315 Yards_Lights_ and_Yard 2022-06-08 19:53:35 +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 67465084f3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-06-07 19:09:54 +05:00
PC-G12 939a5035e9 Light_Decals 2022-06-07 19:01:59 +05:00
EgorSuv 841f2cf867 MERGE 2022-06-07 13:12:17 +05:00
EgorSuv c903e3d158 vr bugs fixed 2022-06-07 13:12:13 +05:00
GRAFF 8af66644db tkt 2022-06-07 12:39:38 +05:00
GRAFF 7dbbc6912d tkt 2022-06-07 10:39:30 +05:00
GRAFF a7a5a5c603 tkt 2022-06-06 18:03:42 +05:00
GRAFF ebf6b523f0 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-06-06 17:38:39 +05:00
GRAFF 5d4c15e4ce tkt 2022-06-06 17:38:34 +05:00
PC-G12 f6485d8d02 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-06-06 17:36:28 +05:00
PC-G12 72d7b8307e Light 2022-06-06 17:35:59 +05:00
GRAFF 4851cc9afa Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis 2022-06-06 15:05:35 +05:00
GRAFF 2a727f8678 tkt 2022-06-06 15:05:33 +05:00
DESKTOP-8J0BKKD\Admin 8fd898612d TKT_Parking 2022-06-06 14:49:37 +05:00
PC-G12 623dcb74a6 Build 2022-06-03 19:55:30 +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 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