Commit Graph

84 Commits

Author SHA1 Message Date
GRAFF d580c52ea8 smt 2022-09-16 17:42:10 +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
DESKTOP-8J0BKKD\Admin 6543b56ba3 Правки GP3 2022-09-14 18:07:20 +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 738da108c1 gp3 2022-09-12 19:38:47 +05:00
GRAFF 1512444078 gp3_check_gp2baketocheck 2022-09-12 13:25:19 +05:00
GRAFF 3ab5e34064 a00,a06, lamps 2022-09-07 18:12:38 +05:00
GRAFF c418221cf9 миллиард говна 2022-09-01 05:09:34 +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
PC-G06 cf2e9bb6fe FbBake_S03A15_18_19_Part_1 2022-08-29 17:41:11 +05:00
PC-G12 c612be8cd3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-29 17:27:32 +05:00
PC-G12 473baea758 13_16_17 2022-08-29 17:27:20 +05:00
GRAFF 48a4625dba 060705 2022-08-29 17:05:23 +05:00
GRAFF 29b26e20d0 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP3/F19/S03F19A07.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F05-06_A04.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F05-06_A08.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F07-08_A08.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F09-10_A08.umap
#	Content/Meshes/Interior/GP3/Plinth/SM_S03A08_Plintuth.uasset
2022-08-29 14:18:46 +05:00
GRAFF 2b3dc3a2ac gp3_06-08 2022-08-29 14:18:02 +05:00
PC-G12 e0125edb45 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-29 11:56:47 +05:00
PC-G03 af00927755 S03A18 2022-08-29 11:21:59 +05:00
PC-G12 333b64e793 21_12 2022-08-28 16:27:37 +05:00
PC-G12 24c7efc671 11 2022-08-28 15:05:30 +05:00
PC-G04 2ffb2d05de Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP3/Furniture/F_S03A01.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F07-08_A01.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F09-10_A01.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F11-12_A01.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F15_A01.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F16_A01.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F17-18_A01.umap
#	Content/Meshes/Interior/GP3/Plinth/SM_S03A54_Plintuth.uasset
#	Content/Meshes/Interior/GP3/Plinth/SM_S03A68_Plintuth.uasset
2022-08-28 13:45:53 +05:00
PC-G04 3dbf971d1a 03A01,03A20 2022-08-27 19:49:05 +05:00
PC-G12 d9f3f94c38 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-27 19:46:45 +05:00
PC-G12 ba5fe01ff1 09 2022-08-27 19:46:37 +05:00
Igor e0f47add6b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-27 19:32:21 +05:00
Igor 2045133460 F_S03A19 2022-08-27 19:32:13 +05:00
PC-G06 25515643a8 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-27 19:10:01 +05:00
PC-G06 a9d9eb7278 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP3/Furniture/F_S03A03.umap
#	Content/Maps/Interior/GP3/Furniture/F_S03A04.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F07-08_A03.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F09-10_A03.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F11-12_A03.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F13-14_A03.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F15_A03.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F16_A03.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F17-18_A03.umap
2022-08-27 19:09:48 +05:00
PC-G12 707ae58610 Cumeat 2022-08-27 19:03:20 +05:00
PC-G06 5c80f1e2f9 S02_S03_S04_S05_S014_For_Bake 2022-08-27 19:01:04 +05:00
PC-G12 82e5f48814 Channel 2022-08-27 18:25:08 +05:00
PC-G12 4b6e7eab4c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-27 18:00:44 +05:00
PC-G12 5d57975dd2 00_01 2022-08-27 18:00:38 +05:00
PC-G08 5705a6c4f2 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-27 16:54:45 +05:00
PC-G08 b37dbc618b Interiror_F19A00_A21_A11 2022-08-27 16:53:49 +05:00
PC-G12 ed881e4a32 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-27 16:36:32 +05:00
PC-G12 c574e5c8f9 Conf_Bake 2022-08-27 16:36:26 +05:00
PC-G04 5a1c44b9d9 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-27 16:30:15 +05:00
PC-G04 f91c11767f ИРИНА 2022-08-27 16:29:54 +05:00
PC-G03 6ea897d579 S03 - a03, a13, a17 2022-08-27 16:04:05 +05:00
PC-G06 118ce4e572 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-27 15:30:37 +05:00
PC-G06 0bc9cc2f74 S03_A18_Part_1 2022-08-27 15:30:03 +05:00
PC-G12 18d051790e Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-26 19:45:00 +05:00
PC-G12 db38f0b5e8 BakeFake_00 2022-08-26 19:44:44 +05:00