9d20c9ac61
fixes
2026-11-10 17:09:19 +01:00
8701c5de02
Merge branch 'master' into feat/renderers-cleanup
2026-11-10 17:09:09 +01:00
ee6f9a0aa2
Merge branch 'master' of https://github.com/MaSzyna-EU07/maszyna into feat/wasm-screens
2026-11-10 16:23:35 +01:00
e433b43fef
Script screens: led_post and resize of the Lua screens on the gpu
2026-11-10 16:22:35 +01:00
c4924f756d
Lua script screens beside the WebAssembly ones
2026-11-10 15:29:25 +01:00
a73585dca0
Dont copy entire python env when already present
2026-11-10 01:05:58 +01:00
18c333b089
wasm display support
2026-11-10 00:57:37 +01:00
c9792672c6
fix(render): textures of a far vehicle no longer come back black with gfx.resource.move ( #308 )
2026-11-10 00:41:14 +01:00
ff2ff308ed
Some optimalisations
2026-11-09 20:58:02 +01:00
maj00r
685258d787
Merge pull request #274 from MaSzyna-EU07/feat/elf-master-controller-emergency-brake
...
Elf: emergency brake position in the master controller (eu07/maszyna#413 )
2026-11-09 18:59:12 +01:00
jerrrrycho
12299bb1fa
Merge remote-tracking branch 'origin/master' into feat/elf-master-controller-emergency-brake
2026-11-09 16:33:31 +01:00
1760c90934
Merge pull request #271 from MaSzyna-EU07/feat/diesel-throttle-position-marker
...
Throttle position marker for diesel locomotives (#74 )
2026-11-09 15:23:17 +00:00
jerrrrycho
6f1055e09d
fix: a duplicated cab control keeps its scale table
...
MirrorCopy() of a duplicate: yes control (#285 ) now copies the scaletable: of the
duplicate's definition too, so the copy is animated on the same non-uniform scale.
build-feat-diesel-throttle-position-marker
2026-11-09 16:13:43 +01:00
jerrrrycho
478727850d
Merge remote-tracking branch 'origin/master' into feat/diesel-throttle-position-marker
...
# Conflicts:
# vehicle/Gauge.h
# vehicle/Train.cpp
2026-11-09 16:07:48 +01:00
jerrrrycho
cf3080c1f3
Merge remote-tracking branch 'origin/master' into feat/elf-master-controller-emergency-brake
...
# Conflicts:
# McZapkie/Mover.cpp
2026-11-09 15:30:38 +01:00
d5e524ee60
Merge pull request #231 from dos1/aiui
...
driveruipanels: Allow to toggle AI driver from the driving aid
2026-11-09 13:00:26 +00:00
f908ae307b
Merge pull request #265 from pwarszawski/feat/ai-braking-gradients
...
AI on up gradients: hold a train coming to a stand, start on the train brake
2026-11-09 12:59:34 +00:00
d6b9a94079
Merge pull request #267 from MaSzyna-EU07/fix/light-programmer-coupled-side-headlights
...
Light programmer: switch off the lights at the coupled end, not the opposite one (eu07/maszyna#395 )
2026-11-09 12:58:57 +00:00
7c103b5d2d
Merge pull request #268 from MaSzyna-EU07/fix/ws-hold-coil-lever-bistable
...
Bistable hold coil lever of the line breaker (eu07/maszyna#364 )
2026-11-09 12:57:49 +00:00
f61a4ab2e7
Merge pull request #269 from MaSzyna-EU07/fix/diesel-smoke-after-ignition
...
Diesel exhaust smoke only once the engine fires (eu07/maszyna#523 )
2026-11-09 12:57:02 +00:00
7edf23b8ff
Merge pull request #270 from MaSzyna-EU07/fix/fpslimit-frame-pacing
...
fpslimit: pace frames in integer clock ticks, show the real frame rate (eu07/maszyna#416 )
2026-11-09 12:56:40 +00:00
fa00fff594
Merge pull request #273 from MaSzyna-EU07/feat/6dg-power-demand-5pct-steps
...
6Dg: power demand in 5% steps (eu07/maszyna#412 )
2026-11-09 12:55:39 +00:00
ff88868d32
Merge pull request #275 from MaSzyna-EU07/fix/sm42-shunt-mode-toggle
...
SM42: shunt mode at the first move of the switch, CA off in the shunt mode
2026-11-09 12:54:21 +00:00
889aa2d5db
Merge pull request #278 from MaSzyna-EU07/feat/shunt-lock-resistive
...
Field shunting locked at zero and on resistive positions (eu07/maszyna#402 )
2026-11-09 12:53:57 +00:00
4a9ab1447e
Merge pull request #279 from MaSzyna-EU07/fix/multiple-unit-electric-diesel
...
No multiple-unit control between electric and diesel locomotives (eu07/maszyna#520 )
2026-11-09 12:53:30 +00:00
0c95dbfa5a
Merge pull request #280 from MaSzyna-EU07/feat/radio-fuse
...
Radio fuse: a cut-off in the radio's power supply (eu07/maszyna#438 )
2026-11-09 12:53:14 +00:00
ebc9eb8740
Merge pull request #281 from MaSzyna-EU07/feat/shunt-pantograph-config
...
AI: suggested pantograph setup for shunting in the .fiz (eu07/maszyna#461 )
2026-11-09 12:52:58 +00:00
3710b2e5d6
Merge pull request #284 from MaSzyna-EU07/feat/light-programmer-cab-light
...
Light programmer: cab light flag per position (eu07/maszyna#529 )
2026-11-09 12:51:37 +00:00
fedbf458b5
Merge pull request #285 from MaSzyna-EU07/feat/duplicate-cab-control-submodels
...
Cab controls with more than one submodel (eu07/maszyna#527 )
2026-11-09 12:50:54 +00:00
28337b5f28
Merge pull request #286 from MaSzyna-EU07/fix/dimmer-position-bounds
...
fix(lights): keep the headlight dimmer position within the DimmerList
2026-11-09 12:50:35 +00:00
c1089a6b16
Merge pull request #292 from MaSzyna-EU07/fix/en57-ep2-brake-charging
...
EN57 brakes: charging when hauled with the brake hose alone, Knorr EP brake only with control power
2026-11-09 12:48:13 +00:00
cb1dd60630
Merge pull request #293 from MaSzyna-EU07/fix/door-inner-faces-lowpoly-lighting
...
Door wings: let the low poly interior have its own, moving inside of the doors (eu07/maszyna#512 )
2026-11-09 12:47:58 +00:00
8ec5d91307
Merge pull request #294 from MaSzyna-EU07/feat/second-loco-engine-start
...
Separate engine start switches for the vehicles in multiple
2026-11-09 12:47:44 +00:00
af44ed72af
Merge pull request #298 from MaSzyna-EU07/feat/editor-tutorial-gifs
...
feat(editor): the clips of the tutorial lessons
2026-11-09 12:47:22 +00:00
71733a343a
Merge pull request #299 from MaSzyna-EU07/fix/ui-tooltips-stay-in-window
...
fix(ui): tooltips and popups stay in the main window, and a long tooltip wraps
2026-11-09 12:46:56 +00:00
edea0dc0f5
Merge pull request #301 from pwarszawski/fix/python-screens-pillow
...
Python screens: ship Pillow with the Windows build, and the screen module for Pillow 10+
2026-11-09 12:46:42 +00:00
65468a2eae
Merge pull request #302 from miloszunio/fix/gizmo-yaw-rotation-master
...
fix(editor): model yaw rotation with the gizmo jumps past 90 degrees
2026-11-09 12:46:24 +00:00
c0524552f1
Merge pull request #303 from MaSzyna-EU07/fix/legacy-renderer-instance-scale
...
fix(render): scale of model instances in the legacy and simple renderers
2026-11-09 11:39:41 +00:00
963d65192a
fix(render): scale of model instances in the legacy and simple renderers
build-fix-legacy-renderer-instance-scale
2026-11-09 11:23:46 +01:00
Claude
58e4bbff49
fix(editor): a model turned with the gizmo about the vertical axis no longer jumps back and forth
...
The angles of the whole gizmo matrix were decomposed every frame and the model was turned by their difference from its own.
The decomposition gives the angle about the vertical axis only within -90..90 degrees: past 90 it comes out as 180 - angle
with the other two axes turned by 180, so a drag one way turned the model back and flipped it. The turn is now taken from
the delta matrix of this frame (small, so its angles decompose with no ambiguity) and wrapped to -180..180.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
Claude-Session: https://claude.ai/code/session_01DDcMn1Q7wdYkbxDUWscNHZ
2026-11-09 07:56:51 +01:00
jerrrrycho
38202f4e57
Merge remote-tracking branch 'origin/master' into feat/second-loco-engine-start
...
# Conflicts:
# CMakeLists.txt
build-feat-second-loco-engine-start
2026-11-08 21:51:59 +01:00
jerrrrycho
c0f1749e87
Merge remote-tracking branch 'origin/master' into fix/door-inner-faces-lowpoly-lighting
...
# Conflicts:
# vehicle/DynObj.cpp
build-fix-door-inner-faces-lowpoly-lighting
2026-11-08 21:47:32 +01:00
jerrrrycho
01ec499f54
Merge remote-tracking branch 'origin/master' into feat/diesel-throttle-position-marker
...
# Conflicts:
# vehicle/Train.cpp
2026-11-08 21:37:31 +01:00
jerrrrycho
d50a724bc8
Merge remote-tracking branch 'origin/master' into fix/ws-hold-coil-lever-bistable
...
# Conflicts:
# vehicle/Train.cpp
build-fix-ws-hold-coil-lever-bistable
2026-11-08 21:28:09 +01:00
jerrrrycho
db65dfa5f0
test: file-local helpers instead of lambdas in the brake handle tests (Sonar S2259)
...
The analyser loses track of references captured by lambdas; the St113 EP and MHZ buttons tests call plain helpers, as ep_brake() and ready_knorr_ep() do, which it doesn't report.
build-fix-en57-ep2-brake-charging
2026-11-08 21:15:12 +01:00
pwarszawski
eb75089ba2
Python screens: ship Pillow with the Windows build, and the screen module for Pillow 10+
...
- The Windows build job installs Pillow into the Python 3.14 whose Lib, with
site-packages, CMake copies next to the executable as python64\Lib, as the
Linux job already does; the README says the same for a local build.
- Both build jobs copy staticFiles/python/local (the Python 3 version of the
module every cab screen subclasses) into python/local of the build.
- The module puts back what Pillow 10 removed and the screen scripts use:
ImageFont.getsize() and ImageDraw.textsize() on top of getbbox() /
textbbox(), and Image.ANTIALIAS as LANCZOS. With an older Pillow nothing
changes.
Part of #300 .
2026-11-08 21:12:35 +01:00
maj00r
6824e8ae22
Merge pull request #287 from MaSzyna-EU07/fix/msaa-alpha-tested-tracks
...
fix(render): antialias alpha tested edges with multisampling (eu07/maszyna#449 )
2026-11-08 21:03:47 +01:00
maj00r
9fecba82f0
Merge pull request #291 from MaSzyna-EU07/fix/sod-lamp-whole-consist
...
SOD lamp: doors of the whole consist, three states (eu07/maszyna#288 )
2026-11-08 20:56:20 +01:00
maj00r
17676863bc
Merge pull request #266 from MaSzyna-EU07/feat/exe-test-mode
...
Test mode: `--test` runs a scenery unattended and exits with the result (#541 )
2026-11-08 20:41:57 +01:00
pwarszawski
1cb365a2a8
Merge master into feat/ai-braking-gradients (after #297 )
2026-11-08 20:40:54 +01:00