eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,198 Commits 13 Branches 7 Tags
075d88e8d7abb5e0bc8fc4b0f5f1853487362e19
Commit Graph

1198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
milek
075d88e8d7 fix stdafx cotire 2019-03-25 20:56:22 +00:00
milek
810ea151e2 fix compiling on MacOS 2019-03-25 20:23:32 +00:00
milek7
1fba251baf change __linux__ to __unix__ 2019-03-25 20:20:22 +00:00
milek
c09160d8f5 uart now optional, macos openal fix 2019-03-25 20:20:10 +00:00
milek7
aaf67caae2 Merge branch 'master' of https://github.com/Xoov/maszyna into milek-dev 2019-03-23 12:41:34 +01:00
milek7
f117801edc Merge branch 'tmj-dev' into milek-dev 2019-03-23 12:36:56 +01:00
Królik Uszasty
511d1c57d9 Added SpeedCtrl for TRAXX 2019-03-23 11:51:24 +01:00
Królik Uszasty
8fddbadbaf Fix for AI decoupling old Knorr/West locomotives 2019-03-23 08:52:47 +01:00
Królik Uszasty
e4dca57de4 Merge remote-tracking branch 'refs/remotes/TMJ/master' 2019-03-23 08:01:13 +01:00
tmj-fstate
ae5daac939 minor bug fixes 2019-03-23 01:54:26 +01:00
Królik Uszasty
a767e36be8 AI does not fear SlippingWheels when driving ElectricInductionMotor vehicle + fix for adhesion calculation when slipping 2019-03-22 21:44:04 +01:00
tmj-fstate
73af767312 audio transcript sound volume based filtering, minor ai logic fixes 2019-03-22 21:43:36 +01:00
Królik Uszasty
14e3a27026 AI does not fear SlippingWheels when driving ElectricInductionMotor vehicle + fix for adhesion calculation when slipping 2019-03-22 20:26:59 +01:00
tmj-fstate
faaabf116b build 190322. support for vehicle load visualization model override, skydome brightness tweaks 2019-03-22 15:45:20 +01:00
Królik Uszasty
df068534d4 Fix for Handle=H14K1 with BrakeValve=K 2019-03-22 00:13:45 +01:00
Królik Uszasty
75cc0b2a24 Fix for autoreturning controller 2019-03-22 00:13:41 +01:00
Królik Uszasty
ea8b38489a AI does not fear accelerating a bit too fast 2019-03-22 00:13:38 +01:00
Królik Uszasty
a3af2453a0 Reworked main brake handle usage by AI - it can use time-dependent handles now. 2019-03-22 00:13:33 +01:00
Królik Uszasty
019a0c2cf6 Preparation for rework of main brake handle usage by AI 2019-03-22 00:13:29 +01:00
Królik Uszasty
3f12f9231f Vehicles with EIMCtrlType>0 use integrated controller instead of localbrake handle 2019-03-22 00:13:23 +01:00
Królik Uszasty
be63aa7452 Fix for Handle=H14K1 with BrakeValve=K 2019-03-21 23:17:41 +01:00
Królik Uszasty
91a7a94682 Fix for autoreturning controller 2019-03-21 21:47:35 +01:00
Królik Uszasty
403c29746d AI does not fear accelerating a bit too fast 2019-03-21 17:47:16 +01:00
Królik Uszasty
3fd408bd46 Reworked main brake handle usage by AI - it can use time-dependent handles now. 2019-03-21 17:25:05 +01:00
Królik Uszasty
ef1ccb448a Preparation for rework of main brake handle usage by AI 2019-03-21 15:27:10 +01:00
Królik Uszasty
72fa1c22a2 Vehicles with EIMCtrlType>0 use integrated controller instead of localbrake handle 2019-03-21 09:50:40 +01:00
Królik Uszasty
b600d0fb85 Merge with TMJ 2019-03-21 08:03:36 +01:00
tmj-fstate
ab16fc17d9 vehicle controllers ai logic fixes 2019-03-21 01:36:29 +01:00
tmj-fstate
fe6789778f vehicle controllers ai logic fixes, minor refactoring 2019-03-19 22:38:46 +01:00
tmj-fstate
3edd22e9fa diesel engine startup check fix 2019-03-17 19:45:45 +01:00
Królik Uszasty
4855b3a5a5 New Handle type MHZ_6P for Traxx 2019-03-17 19:09:29 +01:00
Królik Uszasty
fb36c1348b Fix for MHZ_K5P - no sudden overload in middle posistion 2019-03-17 19:09:16 +01:00
Królik Uszasty
ea5f3ae27a Fixed SpeedControl for EN57-like EMUs 2019-03-17 19:09:09 +01:00
tmj-fstate
04db86baa6 cooling fans state indicator, minor diesel engine logic tweaks 2019-03-17 19:08:53 +01:00
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