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

145 Commits

Author SHA1 Message Date
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
GRAFF 558981b84c 22 2022-07-11 18:50:45 +05:00
GRAFF 09d9f00b92 p 2022-07-11 18:29:03 +05:00
PC-G12 2966bb78e4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-11 18:28:02 +05:00
PC-G12 b945d876e0 53-43 41-36 2022-07-11 18:27:19 +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
GRAFF dcaaf47521 ma baker 2022-07-07 17:32:24 +05:00
PC-G06 f97f65c6bb S02_Door_Inner 2022-07-07 17:17:52 +05:00
GRAFF 7a0fd727f2 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-07 14:31:51 +05:00
GRAFF cc25272b39 ma baker 2022-07-07 14:31:47 +05:00
PC-G12 6bd7faa5b0 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 
# Conflicts:
#	Content/Maps/Interior/GP2/S02F02.umap
 2022-07-07 12:12:50 +05:00
PC-G12 fb0dd38a36 MOPS 2022-07-07 12:10:33 +05:00
GRAFF 81adb1c8cf Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 
# Conflicts:
#	Content/Maps/Interior/GP2/S02A01.umap
#	Content/Meshes/Interior/Window/SM__GP2_Windows_8.uasset
 2022-07-06 19:19:23 +05:00
GRAFF b3f52b0654 baking_mops 2022-07-06 19:18:33 +05:00
PC-G06 b2bfa0b9a3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-06 19:18:03 +05:00
PC-G06 4355c94ebe S02_Larin_S 2022-07-06 19:18:00 +05:00
PC-G10 34646dbf5d S02A01 09 19 30 44 2022-07-06 16:26:19 +05:00
PC-G06 7249e84ffc S0_Danis 2022-07-06 15:57:10 +05:00
PC-G06 929264aa25 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-06 15:14:38 +05:00
Lenta_Mebiusa c4f876e285 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-06 15:10:33 +05:00
Lenta_Mebiusa 6f0c16e37f S02A43 2022-07-06 15:10:23 +05:00