16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 06:59:17 +02:00
Commit Graph

1164 Commits

Author SHA1 Message Date
milek7
7daf38b169 Merge commit '6b56fbddbeb231f28fd11c08c88dd4ef95db8f93' into milek-dev 2019-03-16 21:08:25 +01:00
Królik Uszasty
6b56fbddbe New Handle type MHZ_6P for Traxx 2019-03-16 20:43:12 +01:00
milek7
4bc90cdd19 Merge branch 'tmj-dev' into milek-dev 2019-03-16 01:37:38 +01:00
Królik Uszasty
ca0c904d6a Fix for MHZ_K5P - no sudden overload in middle posistion 2019-03-15 20:41:11 +01:00
Królik Uszasty
1151925e1b Fixed SpeedControl for EN57-like EMUs 2019-03-15 12:31:34 +01:00
Królik Uszasty
8d67338950 Small fix to eimic and speedcontrol interaction 2019-03-14 20:11:04 +01:00
Królik Uszasty
3de04fdb67 SpeedCntrl affects also first vehicle now 2019-03-14 20:10:52 +01:00
tmj-fstate
cf91f7e031 cooling fan cab control, dedicated tempomat cab control, minor vehicle preparation ai logic tweaks, minor timetable ui panel tweaks 2019-03-14 20:09:30 +01:00
Królik Uszasty
7249ffd068 Small fix to eimic and speedcontrol interaction 2019-03-14 18:58:31 +01:00
Królik Uszasty
f02d30fd9a SpeedCntrl affects also first vehicle now 2019-03-14 14:44:19 +01:00
Królik Uszasty
b8ff8703c5 AI now uses EIMCtrlType no 1 and 2 correctly 2019-03-12 19:02:04 +01:00
Królik Uszasty
05f0fbb7dd Added instant 0 for EIMCtrlType == 1 (Traxx) 2019-03-12 19:01:48 +01:00
Królik Uszasty
18e46aa063 Corrected shifting speed for EIMCtrlType == 2 2019-03-12 19:01:30 +01:00
Królik Uszasty
868c86c6e2 Corrected "desired percent" for Python screens 2019-03-12 19:00:32 +01:00
Królik Uszasty
69ad8943ae New MainCtrlTypes for EIM Integrated Control dedicated to Traxx and Elf 2019-03-12 18:59:17 +01:00
Królik Uszasty
90df9b9b12 Unified multiplier for "brakes" gauge with other pneumatic gauges 2019-03-12 18:56:31 +01:00
tmj-fstate
4051892066 maintenance: minor code tweaks 2019-03-12 18:49:06 +01:00
Królik Uszasty
c36fc565e5 AI now uses EIMCtrlType no 1 and 2 correctly 2019-03-12 18:37:14 +01:00
Królik Uszasty
d307e96275 Added instant 0 for EIMCtrlType == 1 (Traxx) 2019-03-10 08:49:07 +01:00
Królik Uszasty
2f755cfe21 Corrected shifting speed for EIMCtrlType == 2 2019-03-09 22:12:48 +01:00
Królik Uszasty
d8f3f6fe6b Corrected "desired percent" for Python screens 2019-03-08 20:49:23 +01:00
Królik Uszasty
38b822165f Merge with TMJ 2019-03-08 20:28:13 +01:00
Królik Uszasty
902ed83281 New MainCtrlTypes for EIM Integrated Control dedicated to Traxx and Elf 2019-03-08 19:35:34 +01:00
Królik Uszasty
b11358f9bf Unified multiplier for "brakes" gauge with other pneumatic gauges 2019-03-06 20:05:26 +01:00
Królik Uszasty
f1ba909a94 Stuff for EW58: handle FVE408, valve EP1, enhanced TUHEX for 3-stage ED brake, old blending for DC-ED and EP brake 2019-03-05 20:00:44 +01:00
tmj-fstate
9cb268042b scenario ui panel 2019-03-05 19:45:15 +01:00
Królik Uszasty
5b20724845 Stuff for EW58: handle FVE408, valve EP1, enhanced TUHEX for 3-stage ED brake, old blending for DC-ED and EP brake 2019-03-05 16:53:58 +01:00
tmj-fstate
400b067628 build 190303. loose shunting ai mode, minor ai logic tweaks, doorstep state readout for python scripts 2019-03-04 15:26:41 +01:00
Królik Uszasty
8082d45527 merge with tmj 2019-03-03 21:28:28 +01:00
Królik Uszasty
2fefc39db9 ref_commit 2019-03-03 21:25:49 +01:00
tmj-fstate
e356172a81 build 190227. joint master controlled cab control, minor bug fixes 2019-02-27 16:22:46 +01:00
Milek7
8a5ca4e05a Set up CI with Azure Pipelines 2019-02-25 23:09:42 +01:00
tmj-fstate
8da3a9a74f build 190223. doorstep cab control devices, door control system logic tweaks and fixes 2019-02-24 02:26:53 +01:00
tmj-fstate
b72e237ab1 refactoring: obstacle detection system component separation, partial leverage of new structure 2019-02-23 15:26:59 +01:00
milek7
267c4472a3 Merge branch 'tmj-dev' into milek-dev 2019-02-21 18:18:32 +01:00
milek7
32e79f7b06 fix lua error handling 2019-02-19 20:34:38 +01:00
tmj-fstate
bc60b5ac62 potential vbo render path crash fix, minor bug fixes 2019-02-19 14:48:35 +01:00
milek7
01ff1cc217 fixup 2019-02-19 01:28:35 +01:00
milek7
87acb6bc15 remove glut 2019-02-19 01:27:57 +01:00
milek7
c6388e5be6 write lua errors to errorlog 2019-02-19 01:20:10 +01:00
tmj-fstate
bc7df7fa59 build 190215. timetable consist data tweaks 2019-02-15 20:03:32 +01:00
Królik Uszasty
c40b54fd93 Added parameters of train (mass and length) for driver timetable panel 2019-02-15 16:10:26 +01:00
tmj-fstate
6947107f3c door operation permit preset cab control, door control system enhancements, minor bug fixes 2019-02-15 16:07:02 +01:00
Królik Uszasty
ca46597916 Added parameters of train (mass and length) for driver timetable panel 2019-02-11 20:53:09 +01:00
tmj-fstate
852fdcfa0e minor bug fixes 2019-02-06 16:48:03 +01:00
tmj-fstate
e71db46de0 build 190129. door control system enhancements, minor bug fixes 2019-01-29 16:29:37 +01:00
milek7
4dc7b3d3d0 fix: replace backslashes in TAnimModel parsing 2019-01-27 21:53:15 +01:00
milek7
0bf7238b00 walk lerping also for Y 2019-01-27 21:10:41 +01:00
milek7
4f030959e3 Merge branch 'tmj-dev' into milek-dev 2019-01-27 20:44:37 +01:00
milek7
30f3d559a9 Merge branch 'master' of github.com:Milek7/maszyna into milek-dev 2019-01-27 20:43:50 +01:00