Commit Graph

420 Commits

Author SHA1 Message Date
GRAFF f9374aa4dc Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Maps/Interior/GP2/S02F03-12.umap
#	Content/Maps/mainScene.umap
2022-09-15 17:57:58 +05:00
GRAFF b92f221b5e ?? 2022-09-15 17:55:33 +05:00
GRAFF 8740547a84 gp3 2022-09-15 14:33:26 +05:00
GRAFF a6d8966bcb Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-14 22:15:55 +05:00
GRAFF 5d9c6c62d7 gp3ska 2022-09-14 22:15:52 +05:00
PC-G12 dce3f8850d Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-14 19:47:35 +05:00
PC-G12 ec0d6a8c47 Parukingu_wip 2022-09-14 19:47:28 +05:00
DESKTOP-8J0BKKD\Admin 6543b56ba3 Правки GP3 2022-09-14 18:07:20 +05:00
PC-G06 ad61431ebf Main_Building_Furniture 2022-09-14 16:19:14 +05:00
GRAFF 74f1c3a8a8 gp3_bakecheck 2022-09-14 13:28:02 +05:00
GRAFF 22f9ce374b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-13 17:20:23 +05:00
GRAFF 0255e3ae45 gp2-3 2022-09-13 17:19:55 +05:00
DESKTOP-8J0BKKD\Admin 8135733259 Правки по GP3 2022-09-13 17:08:48 +05:00
PC-G06 f366783822 S03_Fbake_interior 2022-09-13 16:45:46 +05:00
GRAFF 90cbe837b5 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-12 19:38:51 +05:00
GRAFF 738da108c1 gp3 2022-09-12 19:38:47 +05:00
DESKTOP-8J0BKKD\Admin 8e9f938d54 Правки по хатам GP2 2022-09-12 18:04:55 +05:00
GRAFF 8d6b4ce916 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-12 13:25:21 +05:00
GRAFF 1512444078 gp3_check_gp2baketocheck 2022-09-12 13:25:19 +05:00
GRAFF 94519a8e1c оптимизация тачек, лендскейпа, починки всякие, интерфейс, инкрементный фильтр 2022-09-09 22:40:47 +05:00
GRAFF 4f4c3fab32 Merge branch 'developer' 2022-09-07 20:04:46 +05:00
GRAFF a8fd49cb56 всякое 2022-09-07 20:01:33 +05:00
GRAFF ffeb51dd98 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-07 18:12:40 +05:00
GRAFF 3ab5e34064 a00,a06, lamps 2022-09-07 18:12:38 +05:00
PC-G06 09b699c35c GP_2_Interior_Repair 2022-09-07 18:03:45 +05:00
GRAFF 07e4348772 Fix 1С-2 2022-09-02 12:51:52 +05:00
GRAFF b7d3d38bfa уффффффф 2022-09-01 13:21:32 +05:00
GRAFF c418221cf9 миллиард говна 2022-09-01 05:09:34 +05:00
GRAFF 4032b466f7 всякое 2022-09-01 00:27:33 +05:00
GRAFF 6ad75b92ac Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Maps/Masharov_Buildings.umap
2022-08-31 20:48:52 +05:00
GRAFF dc9e26f337 capsTomops 2022-08-31 20:45:51 +05:00
GRAFF 5deb40ae9c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-31 20:33:33 +05:00
GRAFF 3edcb0890a volumetric_inMops 2022-08-31 20:33:31 +05:00
JohnnyHatchet 0471c50b01 Зелень + фикс коммерции 2022-08-31 17:45:30 +05:00
GRAFF 26f8dbdfbc asd 2022-08-31 16:56:53 +05:00
GRAFF 3471fbc080 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-08-31 13:53:00 +05:00
GRAFF e932338ee9 новые звуки, лифты, анимБПхи новые 2022-08-31 13:49:12 +05:00
GRAFF 5c18534b05 bake_firstwave 2022-08-31 13:24:03 +05:00
GRAFF c5a4f70e01 transforms 2022-08-30 18:06:36 +05:00
GRAFF 8c43349e1c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-30 14:52:55 +05:00
GRAFF acf5a69861 smth 2022-08-30 14:52:49 +05:00
PC-G12 5551a6eb4f Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-30 14:23:48 +05:00
PC-G12 f520859f81 04-05-09-10-22 2022-08-30 14:23:42 +05:00
JohnnyHatchet 4fa3db1d1a Правка уровня стелобата 2022-08-30 13:55:40 +05:00
GRAFF d60fc65f6b Merge branch 'developer'
# Conflicts:
#	Content/Maps/Interior/GP2/S02F01.umap
2022-08-29 23:19:51 +05:00
GRAFF 2489392f03 ишо всякое 2022-08-29 23:17:36 +05:00
PC-G12 0ef3256d30 00 2022-08-29 20:05:42 +05:00
PC-G12 8f9f7ff9b2 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-29 19:50:29 +05:00
PC-G12 d308b67b87 19_00_01_Caps 2022-08-29 19:50:18 +05:00
PC-G04 a0434da4d3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-29 18:15:57 +05:00