EgorSuv/SibIntel1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
361 Commits 4 Branches 2 Tags
8caf4df53c2c623fbbdb4c2ca69eed8317752583
Commit Graph

127 Commits

Author SHA1 Message Date
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
JohnnyHatchet 8ffd07acdc RT Glass 2022-07-18 19:27:03 +05:00
GRAFF b91b531ea7 вход с 2 этажа, 2этажные переключения, всякое говно еще, тачки катают по светофорам, коллизии 2022-07-18 02:58:05 +05:00
GRAFF 567e7c29ec caps 2022-07-16 21:49:55 +05:00
GRAFF 11f61c23a9 комерс 2022-07-16 17:27:33 +05:00
GRAFF e60568e598 cummerce 2022-07-15 18:43:26 +05:00
GRAFF 6940f381ca cummerce 2022-07-15 16:05:51 +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
GRAFF 26f9b1992c f2full+mops 2022-07-14 17:00:18 +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
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 f49c40ecd8 bp_tochannel2_someprobes_someshitaswell 2022-07-13 17:11:33 +05:00
GRAFF 8130cf2685 probes_tvvidos 2022-07-12 17:34:31 +05:00
GRAFF 7a13be35ca уфффф 2022-07-12 05:34:44 +05:00
GRAFF 483eaeb472 уф 2022-07-12 04:43:38 +05:00
GRAFF 1130ed211e koliza 2022-07-11 21:52:09 +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 c0dac5cc89 mops_F2-20 2022-07-11 17:55:05 +05:00
GRAFF d87cab31dc refl_singspivots 2022-07-11 15:00:16 +05:00
GRAFF ef43cd3d16 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-11 12:28:10 +05:00
GRAFF 9bf066c207 bake_pivotsingsov 2022-07-11 12:27:37 +05:00
GRAFF fb77d65acb Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 
# Conflicts:
#	Content/Meshes/Interior/GP2/MOP/Elevator/SM_Elevator.uasset
 2022-07-10 12:46:37 +05:00
GRAFF 2f0730d3a8 еще пачка изменений, циферки, лифт, пиздюки, коллизии 2022-07-10 12:44:24 +05:00
GRAFF 88ea1d965e Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-08 20:11:29 +05:00
GRAFF 4c403a05f8 кнупки 2022-07-08 20:11:26 +05:00
PC-G12 bd4c5283ec Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 
# Conflicts:
#	Content/Meshes/Interior/GP2/MOP/HallDoor/SM_Door_Outer.uasset
 2022-07-08 19:10:31 +05:00
PC-G12 37d50e3fce Mops 2022-07-08 19:07:58 +05:00
GRAFF f4cff46e92 baker 2022-07-08 18:13:30 +05:00
GRAFF 47d640a706 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 
# Conflicts:
#	Content/Maps/Interior/GP2/S02A30.umap
#	Content/Maps/Interior/GP2/S02A31.umap
#	Content/Maps/Interior/GP2/S02A47.umap
#	Content/Meshes/Interior/GP2/Plintuth/Plinth_Up/SM_S02A30_Plinth.uasset
#	Content/Meshes/Interior/GP2/SM_S02A30.uasset
 2022-07-08 10:45:49 +05:00
GRAFF 325f4302a6 mama mama, ma baker 2022-07-08 10:45:33 +05:00
PC-G06 e4587618b5 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-07 20:14:45 +05:00
PC-G06 6cd8561207 S0_New_UV_Part_1 2022-07-07 20:14:42 +05:00
PC-G12 28c9d15314 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-07 20:09:15 +05:00
PC-G12 0c55ced6ec Mopz 2022-07-07 20:08:50 +05:00
PC-G06 6a5253fb87 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-07 18:04:58 +05:00
PC-G06 0924317541 S02_Mesh_18_20_27_28_52 2022-07-07 18:04:54 +05:00
GRAFF d0495811d1 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 
# Conflicts:
#	Content/Meshes/Interior/GP2/SM_S02A18.uasset
#	Content/Meshes/Interior/GP2/SM_S02A20.uasset
#	Content/Meshes/Interior/GP2/SM_S02A27.uasset
 2022-07-07 17:32:45 +05:00