Dron/Ivazovsky
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
377 Commits 9 Branches 0 Tags
46563bbf4e220f261aa7fca9746df7ea77f1df3d
Commit Graph

377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PC-G03 4fb1e3ff72 S03A03 2022-03-23 11:59:30 +05:00
PC-G08 fae8b815b5 S03A00 2022-03-23 11:51:22 +05:00
GRAFF 905abc65ff ААААААААААААААААААААААААААА БЛЕЯТЬААААААА 2022-03-23 01:34:38 +05:00
PC-G04 3f6b845026 S03A02, S05A09 2022-03-22 21:53:18 +05:00
PC-G12 080428a307 s03a04 2022-03-22 20:20:23 +05:00
PC-G06 c8ac07e587 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-22 20:19:12 +05:00
PC-G06 cef555c90e S03_A01_Mat 2022-03-22 20:19:05 +05:00
JohnnyHatchet eaff79f8bc Nightlight test lvl 2022-03-22 20:03:44 +05:00
PC-G12 21de9fedf0 Curtain 2022-03-22 17:45:03 +05:00
PC-G03 82d9cdeb52 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-22 17:37:35 +05:00
PC-G03 2053e2f063 S05A05-08 2022-03-22 17:37:23 +05:00
PC-G12 0fa068f858 Level_0-4 2022-03-22 17:32:50 +05:00
PC-G04 58640b1b97 S05A009 2022-03-22 17:09:46 +05:00
PC-G04 1d7b16c7e5 S05A09, S05F01 2022-03-22 17:05:53 +05:00
PC-G08 526a09ee8e S00 2022-03-22 16:45:58 +05:00
PC-G06 103ed61522 S03A01 2022-03-22 16:43:36 +05:00
PC-G06 ab6eb61ff8 S03_Test 2022-03-22 16:22:08 +05:00
PC-G08 5cece3b98f S03 interiors 2022-03-22 16:16:20 +05:00
PC-G03 02e81c541f Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 
# Conflicts:
#	Content/Maps/Interiors/GP4S5/Unique/S05A07.umap
 2022-03-22 15:57:40 +05:00
PC-G12 ad809ca6b0 merge 2022-03-22 15:49:15 +05:00
PC-G03 e267679c9a no message 2022-03-22 15:26:13 +05:00
PC-G12 0af030fc55 Plintuth 2022-03-22 15:25:18 +05:00
PC-G08 f03129a4e0 s05a01 2022-03-22 14:10:21 +05:00
PC-G03 43d45438ef S01A08, S05A08 2022-03-22 13:09:41 +05:00
PC-G12 bd11520b35 Kitchen 2022-03-22 13:05:21 +05:00
GRAFF d631be4980 НУ ВООООТ 2022-03-22 10:46:46 +05:00
GRAFF b40f1d7ef8 ХУУУУУУУУУУУУУУУУЙ 2022-03-22 09:13:08 +05:00
GRAFF 70114f1793 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/S01F02.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F03-10.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F03.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F11.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F12.umap
#	Content/Maps/Yard_GP4.umap
#	Content/SkatePark/Naberez_Model/fix/Yard/MI_Roof4.uasset
 2022-03-22 08:50:56 +05:00
GRAFF 8ad3f1e65a sdfnslfg 2022-03-22 08:48:05 +05:00
JohnnyHatchet 9122701af3 Двор 2022-03-22 07:28:32 +05:00
GRAFF c792c32e1d чтоб принять 2022-03-22 03:45:44 +05:00
JohnnyHatchet 9d371bc5d8 Двери в мопы 2022-03-22 02:51:48 +05:00
JohnnyHatchet 634ad689b5 Фонтан + беседка двор гп4 2022-03-22 01:21:03 +05:00
GRAFF 4bc67d6a74 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/S01A00.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A01.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A02.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A03.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A04.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A05.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A06.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A07.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A08.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A09.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A10.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A11.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A01.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A02.umap
 2022-03-21 23:18:22 +05:00
GRAFF d0374d966f всякая штука 2022-03-21 23:15:47 +05:00
PC-G06 0a57b31022 Box_Brush_Convert 2022-03-21 21:39:01 +05:00
PC-G06 8f7d0e7a8f Gp4S3 2022-03-21 20:33:00 +05:00
PC-G03 2007d51d77 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/S01A03.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A06.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A08.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A11.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A01.umap
 2022-03-21 20:21:09 +05:00
PC-G03 36ead82def S01A03-S01A06-S01A08-S01A11-S05A06-S05A07-S05A08 2022-03-21 20:17:01 +05:00
PC-G12 849c9018b3 S05_A01_A04_A05 2022-03-21 19:56:40 +05:00
PC-G08 08691e0f8b S05A03 плинтусы 2022-03-21 19:11:12 +05:00
PC-G08 6af8ed8483 S05A03 2022-03-21 19:00:17 +05:00
PC-G06 331d5cd9f4 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-21 14:51:33 +05:00
PC-G06 7cc155ce10 Plintus_Dom_5 2022-03-21 14:51:25 +05:00
Igor 5888379d80 Dom5_lvl2 2022-03-21 14:25:19 +05:00
PC-G12 4bb12e6870 sass0501 2022-03-21 13:08:49 +05:00
PC-G12 6ae4a499e9 Revert "no message" 
This reverts commit 20e0736e20.
 2022-03-21 13:06:59 +05:00
PC-G08 20e0736e20 no message 2022-03-21 12:38:28 +05:00
GRAFF f4550ff35d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/S01A01_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/S01A04_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_0.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_1.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_10.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_2.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_3.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_4.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_4_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_5.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_6.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_7.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_8.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_9.umap
#	Content/Maps/L_Lighting.umap
#	Content/Maps/MainSceneMigrate.umap
#	Content/Maps/Main_Building.umap
#	Content/Materials/Instances/M_Greeds_Inst.uasset
#	Content/Materials/Instances/M_Plastic_RAL_6005.uasset
#	Content/Materials/Instances/M_Plastic_RAL_7026.uasset
#	Content/Materials/Instances/M_Plastic_RAL_716.uasset
#	Content/Materials/Instances/t_conditioner_grid_Opacity.uasset
#	Content/Meshes/Furniture/Custom/SM_Celling_Lamp_1.uasset
#	Content/Meshes/Furniture/Custom/SM_Celling_Lamp_2.uasset
#	Content/Meshes/Furniture/Custom/SM_Celling_Lamp_3.uasset
#	Content/Meshes/test_import_SM_HouseTerritory.uasset
#	Content/Peoples/Male_01/SM_Male_01_fbm/9_meshes_Merge_Normal.uasset
 2022-03-21 11:48:57 +05:00
GRAFF a6aee8e3d5 тучи тучи а тучи каак ЛЮЮЮЮДИ 2022-03-21 11:32:26 +05:00