Commit Graph

367 Commits

Author SHA1 Message Date
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
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
e46add2939 SecuritySystem fixes 2019-03-18 22:37:02 +01:00
milek7
99e7ef5513 python screen windows without context sharing 2019-03-18 17:02:54 +01:00
milek7
e6e5d6645b shader fix, vehicle move feature 2019-03-17 23:55:40 +01:00
tmj-fstate
04db86baa6 cooling fans state indicator, minor diesel engine logic tweaks 2019-03-17 19:08:53 +01:00
milek7
16570f8d23 move vehicle param window to vehicle list, add radiostop button 2019-03-16 20:51:51 +01:00
milek7
20652829b1 separate cabsignal acknowledge 2019-03-16 17:50:17 +01:00
milek7
e3c88b9834 network-aware obstacles, other changes 2019-03-16 17:13:46 +01:00
milek7
8b642205eb alerter fixes, removing obstacles, python config changes 2019-03-16 12:43:34 +01:00
milek7
608af111a2 Merge branch 'gfx-work' into sim 2019-03-16 02:28:42 +01:00
milek7
1c1f2f625e Merge branch 'milek-dev' into gfx-work 2019-03-16 02:28:36 +01:00
milek7
3556a2d0e6 vehicle params window, aware system rewrite, sifa 2019-03-16 02:17:41 +01:00
milek7
4bc90cdd19 Merge branch 'tmj-dev' into milek-dev 2019-03-16 01:37:38 +01:00
Królik Uszasty
8d67338950 Small fix to eimic and speedcontrol interaction 2019-03-14 20:11:04 +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
milek7
ef82aa8589 splittable python windows 2019-03-13 01:03:38 +01:00
milek7
38ea3f5737 python without submodel texture 2019-03-12 23:11:31 +01:00
Królik Uszasty
868c86c6e2 Corrected "desired percent" for Python screens 2019-03-12 19:00:32 +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
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
tmj-fstate
e356172a81 build 190227. joint master controlled cab control, minor bug fixes 2019-02-27 16:22:46 +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
3c693c731b destroy non-player trains in singleplayer 2019-02-21 19:57:21 +01:00
milek7
b5b230902a Merge branch 'milek-dev' into udpnetwork 2019-02-21 19:57:08 +01:00
milek7
56584dc13e configurable fullscreen monitors 2019-02-21 18:29:16 +01:00
milek7
267c4472a3 Merge branch 'tmj-dev' into milek-dev 2019-02-21 18:18:32 +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
milek7
6962e25042 network improvements and fixes 2019-02-06 00:03:48 +01:00
milek7
5a0bb610db network improvements 2019-02-05 00:07:34 +01:00
milek7
85ad17af3c network fixes and improvements, code refactoring 2019-02-03 23:24:34 +01:00
tmj-fstate
e71db46de0 build 190129. door control system enhancements, minor bug fixes 2019-01-29 16:29:37 +01:00
milek7
40d324b957 Merge branch 'gfx-work' into udpnetwork 2019-01-27 22:19:52 +01:00
milek7
1f987294b2 Merge branch 'milek-dev' into gfx-work 2019-01-27 21:07:03 +01:00
milek7
4f030959e3 Merge branch 'tmj-dev' into milek-dev 2019-01-27 20:44:37 +01:00
tmj-fstate
753cf7ee5d refactoring: python task data creation moved to the task queue worker 2019-01-23 19:38:59 +01:00
milek7
84153aac80 Merge branch 'gfx-work' into udpnetwork 2019-01-19 19:51:54 +01:00
milek7
e976c452d2 Merge branch 'milek-dev' into gfx-work 2019-01-19 19:51:32 +01:00
milek7
b648ca7c44 Merge branch 'tmj-dev' into milek-dev 2019-01-19 19:14:47 +01:00
tmj-fstate
330e52d4fc build 190119. minor diagnostics enhancement, minor ai enhancement, minor bug fixes 2019-01-19 14:33:39 +01:00
milek7
f63bd04bfe work 2019-01-18 00:26:48 +01:00
milek7
aa82349aee Merge branch 'gfx-work' into udpnetwork 2019-01-14 23:33:38 +01:00
milek7
a73d58ff77 Merge branch 'milek-dev' into gfx-work 2019-01-14 23:31:26 +01:00