Commit Graph

184 Commits

Author SHA1 Message Date
GRAFF 8caf4df53c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-15 12:29:20 +05:00
GRAFF bff9ac53f4 smsht 2022-08-15 12:29:17 +05:00
PC-G06 48e73c708c Test_Room_GP3_Mesh_Part_1-2 2022-08-12 20:25:45 +05:00
GRAFF 84a39b357e правка косячин и еще дополнения 2022-08-01 01:08:07 +05:00
GRAFF 8cf2b4eb37 много всякого КАЛАА 2022-07-19 04:08:57 +05:00
GRAFF b91b531ea7 вход с 2 этажа, 2этажные переключения, всякое говно еще, тачки катают по светофорам, коллизии 2022-07-18 02:58:05 +05:00
GRAFF 6b12c5943c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-07-16 22:00:14 +05:00
GRAFF 567e7c29ec caps 2022-07-16 21:49:55 +05:00
GRAFF c122da9464 всякое 2022-07-15 20:41:39 +05:00
GRAFF aeb09be06a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Maps/Interior/GP2/S02F01.umap
#	Content/Maps/Masharov_cars.umap
2022-07-15 15:14:19 +05:00
GRAFF b26775b64c УФФФ 2022-07-15 15:12:09 +05:00
PC-G12 91a79bf9d3 numbers 2022-07-14 19:47:55 +05:00
GRAFF 161c10d699 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-14 17:01:33 +05:00
GRAFF 26f9b1992c f2full+mops 2022-07-14 17:00:18 +05:00
PC-G12 a49c070071 Fd 2022-07-14 15:46:24 +05:00
GRAFF e925269d96 Revert "S02_Collision"
This reverts commit 7c07922e99.
2022-07-13 22:21:26 +05:00
GRAFF 1db9b2e327 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-07-13 21:17:34 +05:00
GRAFF aa0f17f4ea dasd 2022-07-13 21:16:55 +05:00
PC-G06 8eb4afe5fe Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-13 20:29:54 +05:00
PC-G06 7c07922e99 S02_Collision 2022-07-13 20:29:20 +05:00
GRAFF c472fb974e svet_potolokMopaFromF2toF3 2022-07-13 19:14:34 +05:00
GRAFF 777d3030a3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Maps/Masharov_Buildings.umap
#	Content/Maps/Masharov_Landscape.umap
#	Content/Maps/Masharov_Yard.umap
#	Content/Maps/mainScene.umap
2022-07-13 17:53:53 +05:00
GRAFF 56c014b2e2 коллизии всякие, интерфейс, косячки 2022-07-13 17:52:29 +05:00
GRAFF 487e198aa3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-13 17:11:41 +05:00
GRAFF f49c40ecd8 bp_tochannel2_someprobes_someshitaswell 2022-07-13 17:11:33 +05:00
PC-G12 bf89e86b81 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-13 16:06:12 +05:00
PC-G12 c381a67a9d mps 2022-07-13 16:05:40 +05:00
GRAFF a4c315d634 bake 2022-07-13 14:46:41 +05:00
GRAFF a678643b9d ммммм, кусные рамы входных дверей 2022-07-13 02:19:57 +05:00
GRAFF 876a3883c8 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-12 20:49:23 +05:00
GRAFF d3b2961b68 волюметрики 2022-07-12 20:49:10 +05:00
PC-G06 7154facfbb S02_Door_Lameli_Plintuth 2022-07-12 19:46:33 +05:00
PC-G06 6fdb1727a4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-12 18:51:29 +05:00
PC-G06 68bb998a92 S02_A00-A21_Door 2022-07-12 18:47:39 +05:00
PC-G12 ac47b0eec9 Doorz 2022-07-12 18:34:50 +05:00
PC-G12 8713a0848b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-12 17:35:55 +05:00
PC-G12 65aa0f5599 1 2022-07-12 17:35:43 +05:00
GRAFF ea6a083a45 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP2/S02A24.umap
2022-07-12 17:34:44 +05:00
GRAFF 8130cf2685 probes_tvvidos 2022-07-12 17:34:31 +05:00
PC-G12 2c3dc8d20f 34-22 2022-07-12 16:01:51 +05:00
GRAFF 7a13be35ca уфффф 2022-07-12 05:34:44 +05:00
GRAFF 483eaeb472 уф 2022-07-12 04:43:38 +05:00
GRAFF 092d8278df F1bake 2022-07-11 21:37:51 +05:00
GRAFF 8bd9541411 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-11 21:01:54 +05:00
GRAFF 9c1e45253d f1_koliz 2022-07-11 21:01:51 +05:00
PC-G12 07ad825cc7 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-11 20:25:38 +05:00
PC-G12 cfa9eef914 MOP 2022-07-11 20:25:34 +05:00
PC-G06 5d2660acc2 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-11 20:02:59 +05:00
PC-G06 909a6bb4b9 S02F01_Mat 2022-07-11 20:02:55 +05:00
GRAFF 91a1c216f7 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-11 18:50:47 +05:00