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

66 Commits

Author SHA1 Message Date
GRAFF 0cc18a55c9 всякое хуякое 2022-04-20 20:21:04 +05:00
GRAFF c06503bbec всякая говнина, конвертер картинок, скриншоты в мыло, 2 мыла 2022-04-17 18:32:42 +05:00
GRAFF 8db9667560 еще немного 2022-04-11 11:44:00 +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
Igor 23d0b124fe S02 2022-04-09 14:37:53 +05:00
GRAFF 45e2673636 Fix animals 2022-04-08 18:03:01 +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 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
Igor 7af6a4399b MOP S02 2022-04-07 19:24:05 +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 1c15e83b0e S02_Window 2022-04-06 17:00:25 +05:00
PC-G06 ce60080037 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-04-06 13:20:05 +05:00
PC-G06 db945d397f S02_Window 2022-04-06 13:20:01 +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-G12 4835890cc6 Curtains 2022-04-01 12:37:20 +05:00
Igor 300da1bd57 dom_2_lvl_0_6_7_8_13 2022-03-31 18:30:44 +05:00
PC-G10 bf16e5f3c0 S02A02 2022-03-31 18:07:29 +05:00
PC-G08 ba353f4d83 S02_MOPs 2022-03-31 17:08:03 +05:00
PC-G03 b554e855f7 Dom2 (A03, A05, A10, A12) 2022-03-31 15:50:46 +05:00
PC-G12 dfae895338 01040911 2022-03-31 15:02:13 +05:00
PC-G12 1acca649e9 S02_04_11 2022-03-31 14:42:39 +05:00
PC-G03 c1ea29b629 Dom 2 (A03, A05, A10, A12) 2022-03-31 13:13:11 +05:00
PC-G04 4feeadd394 MOP_S2,3,4 2022-03-30 21:30:30 +05:00
PC-G12 2bc5f0fdae s02A04 2022-03-30 20:02:50 +05:00
PC-G12 7673c159dd Probes_S04_03040708. LvS02_010409 2022-03-30 18:46:12 +05:00
Igor 47c7ee1d3b dom2_lvl_0_7_8 2022-03-30 18:36:15 +05:00
PC-G08 fead8e8ad3 S03_MOPs 2022-03-30 18:05:58 +05:00
PC-G12 a7dcb2b041 S02_1_4_9 2022-03-30 15:52:12 +05:00
PC-G06 78bbbfe386 S02_Furniture 2022-03-30 15:47:11 +05:00
PC-G03 c2b132c64b S02(A05, A12) 2022-03-30 13:17:48 +05:00
Igor 665f5f937e dom2_lvl0 2022-03-29 19:59:07 +05:00
Igor 1803843823 dom2_lvl_0_1_2_3_4 2022-03-29 18:26:48 +05:00
PC-G03 1fbc3b686e S02 - (A05, A06, A12, A13) 2022-03-29 18:25:18 +05:00
PC-G12 b7d98c641e 7-11_Storki 2022-03-29 18:21:53 +05:00
PC-G06 918d020903 S02_Mesh 2022-03-29 18:20:50 +05:00