Dron/Ivazovsky
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
463 Commits 9 Branches 0 Tags
pixelStreaming
Commit Graph

90 Commits

Author SHA1 Message Date
GRAFF 0cc18a55c9 всякое хуякое 2022-04-20 20:21:04 +05:00
GRAFF 8dee98005b лодочки и прочая фигня 2022-04-18 17:29:38 +05:00
GRAFF c06503bbec всякая говнина, конвертер картинок, скриншоты в мыло, 2 мыла 2022-04-17 18:32:42 +05:00
GRAFF 2cdf663d96 ух ебать ну вроде сделал 2022-04-11 05:51:22 +05:00
GRAFF 0b5b390cc7 просто гора всякого еще 2022-04-10 01:04:22 +05:00
GRAFF 4e429a4091 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Blueprints/Player/GI.uasset
#	Content/Blueprints/Player/MyPC.uasset
#	Content/Blueprints/Player/WalkingPawn.uasset
#	Content/Blueprints/UI/Actors/walkPointer.uasset
#	Content/Blueprints/UI/WBPS/Menu/lift3dPanel.uasset
#	Content/Blueprints/UI/WBPS/Menu/saveData.uasset
#	Content/Blueprints/Utils/levelStruct.uasset
#	Content/Blueprints/World/BM_Elevator.uasset
#	Content/Blueprints/World/BM_Elevator_1.uasset
#	Content/Blueprints/World/BM_Elevator_2.uasset
#	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/GP4S1/Unique/S01F01.umap
#	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/Interiors/GP4S2/Unique/S02A00.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A01.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A02.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A03.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A04.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A05.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A06.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A07.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A08.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A09.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A10.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A11.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A12.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A13.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02F01.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02F02.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02F03-13.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02F14.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A00.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A01.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A02.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A03.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A04.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A05.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A06.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A07.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A08.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A09.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03F01.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03F02.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03F03-15.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03F16-etc.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A00.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A01.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A02.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A03.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A04.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A05.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A06.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A07.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A08.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04F01.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04F02_Hall.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04F03-etc.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A08.umap
#	Content/Maps/Lift_GP4_H1.umap
#	Content/Maps/Lift_GP4_H2.umap
#	Content/Maps/Lift_GP4_H3.umap
#	Content/Maps/Lift_GP4_H4.umap
#	Content/Maps/Lift_GP4_H5.umap
#	Content/Maps/MainScene.umap
#	Content/Maps/Main_Building.umap
#	Content/Maps/Underground_parking_GP4.umap
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_F02.uasset
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_F03-13.uasset
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_F14.uasset
#	Content/Meshes/Interiors/SM_Parking_Underground.uasset
#	Content/Meshes/Interiors/SM_Parking_Underground_asphalt.uasset
 2022-04-09 21:22:14 +05:00
GRAFF 34d46b6078 полный идиотизм с лифтами 2022-04-09 21:13:50 +05:00
PC-G04 c2fafe5614 MOPs1 2022-04-08 18:12:50 +05:00
GRAFF 45e2673636 Fix animals 2022-04-08 18:03:01 +05:00
PC-G04 22cec26098 Interier,MOP_S1 2022-04-08 17:15:04 +05:00
GRAFF dfa1fabe13 OVER 9000 CHANGES 2022-04-08 16:08:23 +05:00
GRAFF 3c2980f7ec New WalkShoes animation and BabyCarriageDriver animation. Fix skin and animals 2022-04-08 13:10:47 +05:00
GRAFF 79caaf2b19 ооой мляяяя 2022-04-08 11:21:22 +05:00
GRAFF d136f6de1e че они тут делают ваще 2022-04-07 21:33:34 +05:00
GRAFF aae38be6c9 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 2022-04-07 21:31:51 +05:00
JohnnyHatchet c50bb71b93 Doors Mop 2022-04-07 20:06:58 +05:00
GRAFF ef8f9707fa Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 2022-04-07 20:01:34 +05:00
PC-G06 820c4b1699 GP4_Correction_2 2022-04-07 19:29:09 +05:00
PC-G06 4c16576670 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-04-07 18:56:35 +05:00
PC-G04 385b2d6240 MOPs1 2022-04-07 18:40:07 +05:00
PC-G06 8c7f900bae GP4_correction 2022-04-07 18:12:01 +05:00
GRAFF e80adf33d9 Слышь, псина 2022-04-07 14:29:54 +05:00
GRAFF 0076654b59 всякая байда и мопы с моей ветки 2022-04-07 13:54:21 +05:00
GRAFF 868ebbc210 лифты вроде расставил, ща попробую другой способ еще 2022-04-07 13:35:28 +05:00
GRAFF e354f1787d баба с коляской, паркинг, лифт, и всякое 2022-04-07 10:48:34 +05:00
GRAFF 0f4ebf3a47 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/S01A05.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A07.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F01.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F02.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F03-10.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F11.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F12.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02F01.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A03.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A08.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A09.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03F01.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04F03-etc.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A06.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05F02.umap
#	Content/Maps/Underground_parking_GP4.umap
#	Content/Meshes/Interiors/GP4S4/Unique/SM_dom_4_F01.uasset
#	Content/Meshes/Interiors/SM_Parking_Underground_fix.uasset
 2022-04-06 20:01:28 +05:00
GRAFF eff3c9be30 дохуища всякого, планшет рабочий 2022-04-06 19:58:02 +05:00
PC-G06 77d8c32a49 GP4_Full(*) 2022-04-06 18:53:59 +05:00
DESKTOP-8J0BKKD\Admin 8fd8870ed6 S04 Window 2022-04-06 15:51:50 +05:00
PC-G04 cf8fa73343 MOPs 2022-04-05 19:24:45 +05:00
PC-G04 09776cfd50 MOPs_sign_exit 2022-04-04 17:48:22 +05:00
PC-G04 2624748cc9 InfoSheet_NumberFloor 2022-04-01 21:11:25 +05:00
PC-G04 3dcfc6758d S01F01,S03F01,S04F01,S05F01_and_Halls(ass) 2022-04-01 20:10:01 +05:00
PC-G04 be1f1351e2 S01F01 2022-03-31 19:14:12 +05:00
PC-G12 f7d3b2193e s05a01 2022-03-29 19:59:05 +05:00
GRAFF d9c1a28027 дохера всего, апдейты из моей ветки 2022-03-28 16:52:04 +05:00
GRAFF c8933ec319 merge DEV to master 2022-03-24 13:30:34 +05:00
PC-G03 43d45438ef S01A08, S05A08 2022-03-22 13:09:41 +05:00
JohnnyHatchet 9d371bc5d8 Двери в мопы 2022-03-22 02:51:48 +05:00
PC-G06 0a57b31022 Box_Brush_Convert 2022-03-21 21:39:01 +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
JohnnyHatchet 1f30bcf5fe Почтовые ящики на первом этаже + раскинул лифты говна для заглушки по всем этажам 2022-03-21 09:37:56 +05:00
JohnnyHatchet c3bdd63a77 Перенос наполнения в лвлы с мопами с 3 по 10 этажи 2022-03-21 08:54:32 +05:00
JohnnyHatchet 1fdb2444ae Крышки - В каждый лвл с этажем (монолитные простенки + крышка для мопа) - В каждый лвл квартиры (крышка квартиры + контуринг / 1 меш 2 id) 2022-03-21 08:39:41 +05:00
JohnnyHatchet 13487a7589 Лестница + ограждение в двухуровневую квартиру 2022-03-21 04:54:43 +05:00
JohnnyHatchet e713bdd716 Add complex collisions + насыпал тачек на первый план 2022-03-21 00:55:34 +05:00
PC-G04 977e14b381 Irina fix 2022-03-20 23:32:44 +05:00
JohnnyHatchet 3f5e3b7d68 Интерьерные окна по всем квартирам S01 2022-03-20 22:27:58 +05:00
JohnnyHatchet b6b024cc6b S01A01 restore 2022-03-20 15:17:55 +05:00