16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 04:39:18 +02:00

2814 Commits

Author SHA1 Message Date
milek7
a8a0cbb9b3 shader loading tweak 2019-03-28 21:06:41 +01:00
milek7
cbf3011371 python.uploadmain option 2019-03-28 00:26:13 +01:00
milek7
803bf23715 perf window 2019-03-27 23:13:51 +01:00
tmj-fstate
9bca179752 build 190327. tempomat status cab indicator, nullptr crash fixes, ai logic tweaks. 2019-03-27 20:42:31 +01:00
milek7
1248d71c8a add MacOS azure job 2019-03-25 22:27:43 +01:00
milek7
24316f3d27 restore old PNG finding, for older CMake 2019-03-25 22:06:08 +01:00
milek7
6d4d7248e2 restore old PNG finding, for older CMake 2019-03-25 22:05:34 +01:00
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
milek
33a4bb2b14 fix compiling on MacOS 2019-03-25 20:17:27 +00:00
milek
409a5340aa Merge branch 'gfx-work' of https://github.com/Milek7/maszyna into gfx-work 2019-03-25 19:54:24 +00:00
milek7
901175f54a change __linux__ to __unix__ 2019-03-25 20:54:17 +01:00
milek
01ac5535f1 uart now optional, macos openal fix 2019-03-25 19:53:44 +00:00
milek7
aa8d66e5da recording 2019-03-25 01:12:19 +01:00
Królik Uszasty
9a94693f96 AI uses SpeedCtrl in TRAXX properly 2019-03-23 23:44:49 +01:00
Królik Uszasty
b9117c6fa8 Added SpeedCtrl for TRAXX 2019-03-23 23:44:45 +01:00
Królik Uszasty
916a611c8d Fix for AI decoupling old Knorr/West locomotives 2019-03-23 23:44:39 +01:00
Królik Uszasty
edb98f41e7 AI uses SpeedCtrl in TRAXX properly 2019-03-23 22:18:17 +01:00
milek7
99c0888965 Merge branch 'gfx-work' into sim 2019-03-23 12:47:20 +01:00
milek7
65eec2ad84 Merge branch 'milek-dev' into gfx-work 2019-03-23 12:42:20 +01:00
milek7
aaf67caae2 Merge branch 'master' of https://github.com/Xoov/maszyna into milek-dev 2019-03-23 12:41:34 +01:00
milek7
b75adc24f2 Merge branch 'milek-dev' into gfx-work 2019-03-23 12:40:46 +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
milek7
a9b6cb5dc8 vigilance system fixes 2019-03-21 21:13:27 +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
milek7
88f64183b7 move python timestamp check (avoid needless gl context switch) 2019-03-19 21:58:51 +01:00