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

191 Commits

Author SHA1 Message Date
milek7
52a69590dd Merge remote-tracking branch 'youby/master' into sim 2019-04-02 23:07:57 +02:00
milek7
20755795ea separate shp buzzer, other changes 2019-04-02 21:53:19 +02: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
99c0888965 Merge branch 'gfx-work' into sim 2019-03-23 12:47:20 +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
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
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
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
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
tmj-fstate
9cb268042b scenario ui panel 2019-03-05 19:45:15 +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
milek7
b5b230902a Merge branch 'milek-dev' into udpnetwork 2019-02-21 19:57:08 +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
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
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
milek7
204b600177 Merge branch 'tmj-dev' into milek-dev 2019-01-14 23:28:07 +01:00
milek7
f55a5465ef work 2019-01-14 22:45:22 +01:00
milek7
cb106fb135 work 2019-01-13 14:19:21 +01:00
tmj-fstate
84830882c5 generic cab control state indicators, ai master controller logic enhancements, battery charging for diesel powered vehicles workaround, water heater damage fix, ai route scanning fixes, material loading fix 2019-01-12 16:50:20 +01:00
milek7
030d137f29 Merge branch 'gfx-work' into udpnetwork 2019-01-01 00:26:19 +01:00
milek7
63afece4a6 work 2019-01-01 00:26:11 +01:00
milek7
de38d99ac1 Merge branch 'milek-dev' into gfx-work 2019-01-01 00:25:18 +01:00
milek7
4495f6a436 Merge branch 'tmj-dev' into milek-dev 2018-12-31 23:49:10 +01:00
tmj-fstate
bdbbaafc83 build 181231. cab control tweaks, python interpreter stderr initialization fail fallback, enabled cab reflections, more parameters exposed to python scripts, minor ai logic enhancements, minor debug enhancements 2018-12-31 22:00:58 +01:00
milek7
45ffc56802 Merge branch 'milek-dev' into gfx-work 2018-12-09 23:31:10 +01:00
milek7
574e2cf340 Merge branch 'tmj-dev' into milek-dev 2018-12-09 23:19:36 +01:00
tmj-fstate
57327f9653 master controller return delay 2018-12-08 14:31:19 +01:00
milek7
3c33bf8133 Merge branch 'milek-dev' into gfx-work 2018-12-03 23:43:02 +01:00
milek7
0b152dbcae Merge branch 'tmj-dev' into milek-dev 2018-12-03 23:11:09 +01:00
tmj-fstate
8d910e434f compartment lighting system enhancement, lowpoly system tweaks, minor bug fixes 2018-11-12 23:26:29 +01:00
milek7
63b77f1ae0 Merge branch 'milek-dev' into gfx-work 2018-11-11 00:02:59 +01:00