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

1355 Commits

Author SHA1 Message Date
milek7
1c1f2f625e Merge branch 'milek-dev' into gfx-work 2019-03-16 02:28:36 +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
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
milek7
a8809f1852 python window gamma 2019-03-13 20:58:46 +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
milek7
dba2308997 viewport changes 2019-03-12 22:17:13 +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
tmj-fstate
4051892066 maintenance: minor code tweaks 2019-03-12 18:49:06 +01:00
milek7
e85d588851 multi viewports (temporaily disable VAO) 2019-03-12 00:53:34 +01:00
milek7
3693c1660e renderer changes, time and environment window 2019-03-09 21:14:01 +01:00
milek7
748e7b1dda imgui include fix 2019-03-06 17:42:52 +01:00
milek7
1f0d8c4dc8 semaphores controllable on minimap 2019-03-06 00:58:12 +01:00
milek7
2d66192c9a replace spaces in monitor name 2019-03-06 00:56:55 +01:00
Królik Uszasty
f1ba909a94 Stuff for EW58: handle FVE408, valve EP1, enhanced TUHEX for 3-stage ED brake, old blending for DC-ED and EP brake 2019-03-05 20:00:44 +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
milek7
1bb700c1ec Merge branch 'milek-dev' into gfx-work 2019-02-26 22:07:04 +01:00
Milek7
8a5ca4e05a Set up CI with Azure Pipelines 2019-02-25 23:09:42 +01:00
milek7
064b360a53 map work 2019-02-25 00:41:11 +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
939aa73384 switch state visualisation, semaphore tracking for map purposes 2019-02-22 22:21:23 +01:00
milek7
2bacb941c0 Merge branch 'udpnetwork' into gfx-work 2019-02-21 19:58:21 +01:00
milek7
8ea6fe4df6 Merge branch 'gfx-work' of github.com:Milek7/maszyna into gfx-work 2019-02-21 19:58:11 +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
milek7
cbd640a6aa nonglobal eventlauncher should launch individually for each client (could cause duplicated event launches, but previous behaviour is obviously wrong) 2019-02-20 21:47:13 +01:00
milek7
32e79f7b06 fix lua error handling 2019-02-19 20:34:38 +01:00
tmj-fstate
bc60b5ac62 potential vbo render path crash fix, minor bug fixes 2019-02-19 14:48:35 +01:00
milek7
3269a089f3 fixup 2019-02-19 14:32:09 +01:00
milek7
48afd2f62f map rendering improvements 2019-02-19 01:34:55 +01:00
milek7
01ff1cc217 fixup 2019-02-19 01:28:35 +01:00
milek7
87acb6bc15 remove glut 2019-02-19 01:27:57 +01:00
milek7
c6388e5be6 write lua errors to errorlog 2019-02-19 01:20:10 +01:00
milek7
e607dae38e write lua errors to errorlog 2019-02-19 01:19:40 +01:00
milek7
5b32b4e926 higher quality map 2019-02-19 01:19:11 +01:00
milek7
81101ae7b0 remove unused vmd code 2019-02-18 21:05:51 +01:00
milek7
6d60fb28ea gl buffers refactoring 2019-02-18 19:23:48 +01:00
milek7
89cf20a251 map improvements 2019-02-18 17:46:31 +01:00