16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 00:49:19 +02:00
Commit Graph

1544 Commits

Author SHA1 Message Date
milek7
d364c242aa Merge branch 'milek-dev' into gfx-work 2019-04-05 22:30:50 +02:00
milek7
0861ad9633 build system tweaks 2019-04-05 21:08:26 +02:00
milek7
99ab5ec8c8 Merge branch 'milek-dev' into gfx-work 2019-04-05 19:43:22 +02:00
milek7
7ea8653988 Merge branch 'tmj-dev' into milek-dev 2019-04-05 19:39:25 +02:00
milek7
3c28416912 Merge branch 'milek-dev' into gfx-work 2019-04-05 19:36:50 +02:00
milek7
d8b2c68653 Merge branch 'tmj-dev' into milek-dev 2019-04-05 19:26:42 +02:00
Królik Uszasty
e99dc9a02c AI is able to use MHZ_K8P now 2019-04-05 15:08:58 +02:00
milek7
c17e737abb uart compile fix 2019-04-05 13:58:24 +02:00
milek7
47e8dbf19a reset track offset when repairing 2019-04-04 01:38:00 +02:00
tmj-fstate
a081077c2f build 190403. support for combined rail squeal sound, ai braking logic tweaks 2019-04-04 01:16:00 +02:00
Królik Uszasty
449cd9f637 Added new LocalBrake algorithm for TRAXX - test of mechanism 2019-04-03 16:22:46 +02:00
Królik Uszasty
6769c45103 Better antislipping system in EStED 2019-04-03 16:22:42 +02:00
tmj-fstate
7627d18ad3 ai braking logic tweaks 2019-04-03 16:21:34 +02:00
milek7
63ac1e05e1 add execonexit 2019-04-03 01:55:44 +02:00
milek7
5160073282 fixup dynobj placement, tune network 2019-04-03 01:46:31 +02:00
milek7
4344ec192a network changes 2019-04-03 01:28:46 +02:00
milek7
1b5c3ef306 event fix 2019-04-03 01:05:12 +02:00
milek7
33de53c90c lock vehicle jumping when in motion 2019-04-02 23:09:52 +02:00
milek7
52a69590dd Merge remote-tracking branch 'youby/master' into sim 2019-04-02 23:07:57 +02:00
Królik Uszasty
031da3baf6 Added new LocalBrake algorithm for TRAXX - test of mechanism 2019-04-02 22:54:56 +02:00
milek7
20755795ea separate shp buzzer, other changes 2019-04-02 21:53:19 +02:00
Królik Uszasty
913cfc8ae8 Better antislipping system in EStED 2019-04-02 21:12:46 +02:00
milek7
155217243c gui changes, consist teleport command, etc 2019-04-02 20:42:18 +02:00
tmj-fstate
8600550dcd build 190402. basic implementation for script generated vehicle destination sign textures 2019-04-02 18:51:43 +02:00
milek7
691f0f28b2 changed map colors 2019-04-02 13:10:36 +02:00
milek7
33adffb614 map visualization features 2019-04-02 01:21:49 +02:00
milek7
851deb9142 training changes 2019-04-01 23:51:57 +02:00
milek7
e5e85344ea html reports 2019-04-01 07:59:04 +02:00
milek7
bcc87e3f30 report generation 2019-04-01 01:53:04 +02:00
tmj-fstate
1ced1239e0 vehicle heating system tweaks, vehicle destination sign system enhancements 2019-04-01 01:21:17 +02:00
milek7
891fe7ddee pbo changes, trainingcard remarks 2019-03-31 14:02:43 +02:00
Królik Uszasty
37086a120b Merge remote-tracking branch 'refs/remotes/TMJ/master' 2019-03-30 19:22:58 +01:00
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