Commit Graph

25 Commits

Author SHA1 Message Date
GRAFF b0e2fbbf49 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Maps/Masharov_Yard.umap
#	Content/Maps/mainScene.umap
2022-09-16 20:49:59 +05:00
GRAFF e743e43179 pointFade, переклепал текстуры в который раз, гора косяков 2022-09-16 20:49:06 +05:00
GRAFF d580c52ea8 smt 2022-09-16 17:42:10 +05:00
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 0255e3ae45 gp2-3 2022-09-13 17:19:55 +05:00
GRAFF 94519a8e1c оптимизация тачек, лендскейпа, починки всякие, интерфейс, инкрементный фильтр 2022-09-09 22:40:47 +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 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 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
GRAFF 3046c5e91d всякое 2022-08-29 12:55:17 +05:00
GRAFF 637a9e8332 gp3 2022-08-27 15:48:58 +05:00
PC-G12 f0c9d22967 MOPs 2022-08-26 14:53:51 +05:00
PC-G12 42835e69d7 MOPs 5 11 16 2022-08-25 19:59:00 +05:00
PC-G12 43f99e11b3 F05 2022-08-25 13:42:55 +05:00
PC-G12 670cb28a66 Gp3_F01 2022-08-24 14:53:45 +05:00
PC-G12 96aac4ad07 MOP_F1 2022-08-23 19:51:09 +05:00
GRAFF 593042a336 GP3_Interior 2022-08-22 14:59:53 +05:00