Dron/TEM2Personal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
185 Commits 2 Branches 1 Tag
dron
Commit Graph

185 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dron 030221c8a5 disable license 2024-10-22 13:24:37 +05:00
GRAFF a4abb8bc51 v1.0 с лицензией 2021-10-28 19:13:21 +05:00
GRAFF 028829d250 v0.98 с патчем фиксом планшетов 2021-10-13 19:03:20 +05:00
GRAFF 679565c835 Merge branch 'master' of http://192.168.1.163:3000/Dron/TEM2Personal into dron 
# Conflicts:
#	Content/Asset/Railway/RailwayPlatform/BP_platform.uasset
#	Content/maps/All_X6_Y4_Landskape.umap
#	Content/maps/All_X7_Y3_Buildings.umap
#	Content/maps/All_X7_Y3_Landskape.umap
#	Content/maps/All_X7_Y3_Railway.umap
#	Content/maps/Trains.umap
#	Content/maps/Vyazma-Mesherskaya.umap
#	Content/maps/Vyazma.umap
#	Content/maps/mainScene.umap
 2021-10-11 19:45:46 +05:00
GRAFF 3e63ba1a93 ghjj 2021-10-11 19:43:53 +05:00
GRAFF 191454cb66 Названия станций, небольшие правки по ходу 2021-10-11 17:16:54 +05:00
GRAFF f7ca035e4b свежак 2021-10-11 15:37:53 +05:00
GRAFF 39bc6a4589 кучи кала 2021-10-11 15:27:04 +05:00
GRAFF 1176782c94 Merge branch 'master' of http://192.168.1.163:3000/Dron/TEM2Personal into dron 2021-10-06 20:10:33 +05:00
GRAFF 5756eaa0f9 Излом рельсы, выброс и новые столбы 2021-10-06 19:51:45 +05:00
GRAFF 3a13bac954 Merge branch 'master' of http://192.168.1.163:3000/Dron/TEM2Personal into dron 
# Conflicts:
#	Content/maps/mainScene.umap
 2021-10-06 15:50:28 +05:00
GRAFF 6861fe076f Лоды: грузовые вагоны + пассажирский 2021-10-06 13:54:00 +05:00
Vladimir 4a7e692c13 Ретоп пассажирской 2021-10-06 13:13:40 +05:00
GRAFF 04c987a4a3 поправил косяки с допокнами 2021-10-05 04:12:11 +05:00
GRAFF 69acbca5b0 еще пара моментов 2021-10-01 21:13:56 +05:00
GRAFF 2e5f854594 включил убляданский микрофон 2021-10-01 20:38:13 +05:00
GRAFF d3ea9e8f3b Merge branch 'master' of http://192.168.1.163:3000/Dron/TEM2Personal into dron 
# Conflicts:
#	Content/Asset/Streetlight/BP_streetLight.uasset
#	Content/Blueprints/Player/GI.uasset
#	Content/Blueprints/Player/VR/BP_Manometr.uasset
#	Content/Blueprints/Player/VR/BP_MotionController.uasset
#	Content/Blueprints/Player/VR/Ipad.uasset
#	Content/Blueprints/Player/VR/MotionControllerPawn.uasset
#	Content/Blueprints/UI/IpadW.uasset
#	Content/Blueprints/World/Spawners/TroubleOnWay.uasset
#	Content/Blueprints/World/Spawners/WagonMesh.uasset
#	Content/Blueprints/World/Weather/MySunSky.uasset
#	Content/maps/mainScene.umap
 2021-09-30 19:19:57 +05:00
GRAFF 7a64ec7f9f синхрон с моей веткой, на версии билда 0.9 2021-09-30 19:16:55 +05:00
GRAFF e8f366038c v1.0 v0.9blin 2021-09-30 18:29:31 +05:00
GRAFF 3204b8ebe7 Merge branch 'master' of http://192.168.1.163:3000/Dron/TEM2Personal into dron 2021-09-29 18:47:26 +05:00
GRAFF 31520b2bd8 Сокеты к тормозам грузовой телеги 2021-09-29 18:33:24 +05:00
PC-G12 a89957d8eb Pressure_Level_Polycut 2021-09-29 18:31:44 +05:00
Vladimir 055cc59b3c Сокет для колодок на тормозах пассажирской телеги 2021-09-29 18:28:41 +05:00
GRAFF 3a262b9021 Merge branch 'master' of http://192.168.1.163:3000/Dron/TEM2Personal into dron 2021-09-29 17:53:25 +05:00
GRAFF 41cae3b783 f 2021-09-29 17:34:11 +05:00
GRAFF 41d958bc4f Merge branch 'master' of http://192.168.1.163:3000/Dron/TEM2Personal 2021-09-29 17:18:43 +05:00
GRAFF 4d40ff3b19 Wiper 2es6 s animoi 2021-09-29 17:18:26 +05:00
Vladimir ba86293c13 Переделал тормозную систему пассажирской телеги 2021-09-29 17:13:03 +05:00
GRAFF 3d310c4757 Merge branch 'master' of http://192.168.1.163:3000/Dron/TEM2Personal into dron 2021-09-29 16:21:26 +05:00
GRAFF b46fa59ea6 Sockets 2021-09-29 16:07:38 +05:00
GRAFF 6afe764c9d Merge branch 'master' of http://192.168.1.163:3000/Dron/TEM2Personal into dron 2021-09-29 13:58:20 +05:00
Vladimir c8acb34cda Добавил вариацию на тормозную систему телеги 2021-09-29 13:21:15 +05:00
GRAFF 1f9a880869 Небольшие правки, поправлены названия и положение сокетов, разделены фары еп20 и тем2 на отдельные айдишки 2021-09-29 13:18:34 +05:00
Vladimir c4bb4d5092 Вернул сокеты грузовых и пассажирского 2021-09-29 12:37:27 +05:00
GRAFF 25eb5a3e64 минор, добавил имя сервера 2021-09-29 12:23:50 +05:00
GRAFF 8464e8e6cc Merge branch 'master' of http://192.168.1.163:3000/Dron/TEM2Personal into dron 
# Conflicts:
#	Content/Asset/Railway/EP20/Insts/MI_EP20_ElectricTrain_RedLight.uasset
#	Content/Asset/Railway/EP2D/Base_meshes/EP2D/SM_EP2D_ElectricTrain_Main_Damages_SM_EP2D_ElectricTrain_Main.uasset
#	Content/Asset/Railway/TEM2/Tex/M_Telega_TEM2.uasset
#	Content/Asset/Railway/TEM2/Tex/T_Telega_ORM.uasset
 2021-09-29 12:22:30 +05:00
GRAFF 71d3805a39 Merge branch 'master' of http://192.168.1.163:3000/Dron/TEM2Personal into dron 
# Conflicts:
#	Content/Asset/Railway/2ES6/SM_2ES6.uasset
#	Content/Asset/Railway/EP20/SM_EP20.uasset
#	Content/Asset/Railway/RailwayCarriageCartMalfunctions/SM_RailwayCarriageCart_Damage.uasset
#	Content/Asset/Railway/TEM2/SM_TEM2.uasset
#	Content/Asset/RailwayArrows/SM_railway.uasset
#	Content/Asset/Streetlight/BP_streetLight.uasset
#	Content/Asset/Streetlight/BP_streetLight1.uasset
#	Content/maps/All_X6_Y4_Buildings.umap
#	Content/maps/All_X6_Y4_Landskape.umap
#	Content/maps/All_X7_Y3_Buildings.umap
#	Content/maps/All_X7_Y3_Landskape.umap
#	Content/maps/All_X7_Y3_Railway.umap
#	Content/maps/Semlevo.umap
#	Content/maps/Vyazma-Mesherskaya.umap
#	Content/maps/Vyazma.umap
#	Content/maps/mainScene.umap
#	Content/maps/start.umap
 2021-09-29 12:14:26 +05:00
PC-G12 5705dea6ef q 2021-09-28 19:29:17 +05:00
PC-G12 a0cc0afb50 Stolbiks 2021-09-28 18:29:59 +05:00
GRAFF 098d1d0c42 7.3 правка км столбов 2021-09-28 18:21:33 +05:00
PC-G12 bc3fe09cc4 2es6 2021-09-28 16:29:07 +05:00
PC-G12 635e13b190 BrakeBake 2021-09-28 16:17:43 +05:00
GRAFF 2fdadb1bb0 BrakeSystem Grand Opening 2021-09-28 15:46:09 +05:00
GRAFF 1611272352 davlenie 2021-09-28 13:29:04 +05:00
Vladimir 5fc28b2f1d Микроправки 2021-09-28 11:28:49 +05:00
PC-G12 0535bf69c2 . 2021-09-28 11:03:40 +05:00
GRAFF 95dfcace61 Замена тормозов грузовой телеги. 2021-09-27 18:18:33 +05:00
GRAFF 4786c888fb Небольшие фиксы, рельс, рельефа, окон, сокеты под колеса еп20 и 2ес6 2021-09-27 16:50:06 +05:00
GRAFF d353ab7ded Небольшие правки. 2021-09-27 12:16:00 +05:00
Vladimir 0c156e4d45 Правки по стрелкам и светофорам 2021-09-27 11:59:25 +05:00