18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-20 20:54:59 +01:00
Commit Graph

3679 Commits

Author SHA1 Message Date
Claude
fabbfdc782 feat(editor): the wheel held and dragged pans the perspective view too, the ground under the cursor going along with it
Pressing the mouse wheel and dragging pans the top view; now it pans the perspective view as well. The camera moves over the
ground, its height and its turn kept, by as much of the ground as the cursor crosses where it was pressed: metres to a pixel
taken from the distance to what is under the cursor, and a pixel up the screen counted as more of the ground than one across
as the camera looks down less steeply. With nothing under the cursor (the sky) it doesn't start.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DDcMn1Q7wdYkbxDUWscNHZ
2026-11-09 23:24:50 +01:00
Claude
6684baefc3 feat(editor): the points of the roads picked on the screen, also under the terrain; Alt+drag their height
The points where the pieces of a road meet were picked only by the ground clicked: one more than 3 m above or below the
ground under the cursor (a road taken down into a cutting, under an embankment) couldn't be picked again. Now the point
nearest to the cursor on the screen (within 12 px, the one nearer to the camera of those about as near) is picked first,
the ground as before after it.

Alt+LMB on a point and dragging up or down changes the height of the selected points (Ctrl: ten times finer); the change
shows as yellow lines and a label by the cursor while dragging, and is applied, as one step of the history, when the button
is let go.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DDcMn1Q7wdYkbxDUWscNHZ
2026-11-09 23:16:38 +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
dfb2329fb5 Merge remote-tracking branch 'origin/master' into feat/persistent-odometer-store
# Conflicts:
#	vehicle/Train.cpp
2026-11-09 16:33:48 +01:00
jerrrrycho
ada2b0ec23 Merge remote-tracking branch 'origin/master' into feat/mains-before-pantographs 2026-11-09 16:33:34 +01:00
jerrrrycho
8809ce3162 Merge remote-tracking branch 'origin/master' into fix/freight-brake-setting-cw1 2026-11-09 16:33:32 +01:00
jerrrrycho
c440243fad Merge remote-tracking branch 'origin/master' into fix/et42-fans-compressor-lamps-et22-louvre 2026-11-09 16:33:31 +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
jerrrrycho
b256c3efa9 refactor: MOVER.h includes the odometer's plain data only
odometer::reading moves to vehicle/odometerreading.h, the store with its files stays in vehicle/odometer.h, so the
physics header doesn't pull in the filesystem and the streams
2026-11-09 16:31:43 +01:00
jerrrrycho
8029740770 fix: read the odometer files of the koliber screens too, say why the unit renderers' drop a letter
the renderers of the units (elf_v1, impuls_v1) keep the unit's state, their cars are named after the unit and the
letter of the car (EN76-022a .. EN76-022d), so they drop the last character. the koliber screens of scripts/ keep
theirs in scripts/kilometry by the whole name, which wasn't read
2026-11-09 16:27:45 +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
7a9f3e2c39 Merge remote-tracking branch 'origin/master' into feat/mains-before-pantographs
# Conflicts:
#	McZapkie/MOVER.h
2026-11-09 16:13:51 +01: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
ee42a80188 docs: the odometer store is keyed by the vehicle's name in the scenario 2026-11-09 16:12:44 +01:00
jerrrrycho
acf0716a9c fix: keep the odometers of the vehicles with a driver's cab only
every vehicle which ran got a line in the store, the wagons of the AI's trains in every scenario too. the store
records a vehicle with a driver's brake valve (BrakeHandle in the .fiz), which can show its odometer; the locomotives
and units the AI runs before a player's cab loads them still get in with their replaceable made up states. the
states already in the file stay as they are
2026-11-09 16:12:13 +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
729f15e878 fix: a test run neither reads nor saves the player's odometer store
the autotests (--test, Global.test.enabled) run the vehicles of the player's game: their odometers count from the
legacy or made up states in a store of their own, and nothing is written to eu07_odometers.txt
2026-11-09 16:01:16 +01:00
jerrrrycho
e8735f1564 fix: the copies of the odometer counter (duplicate: yes) drop their offset too
the counter's offset no longer applies once it shows the odometer, the copies of the control which master added
kept theirs and showed it on top
2026-11-09 15:54:10 +01:00
jerrrrycho
d53f3cc21a Merge remote-tracking branch 'origin/master' into feat/persistent-odometer-store
# Conflicts:
#	vehicle/Gauge.h
2026-11-09 15:33:03 +01:00
jerrrrycho
91dab65369 Merge remote-tracking branch 'origin/master' into fix/freight-brake-setting-cw1
# Conflicts:
#	CMakeLists.txt
#	utilities/Globals.cpp
2026-11-09 15:32:03 +01:00
jerrrrycho
7ccd2f0431 Merge remote-tracking branch 'origin/master' into fix/et42-fans-compressor-lamps-et22-louvre
# Conflicts:
#	McZapkie/MOVER.h
2026-11-09 15:31:09 +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
64d1b7f847 fix: the inspector takes a train below 1 km/h for standing and a bank run for a train (review of #282)
The AI inspects the train while it still creeps to a stop (W4, Shunt to Obey_train) and as it couples, so the 0.05 km/h threshold missed the §19.9 cut-out; it now uses EU07_AI_MOVEMENT. Bank counts as a train, as in the braking tables.
2026-11-08 21:38:16 +01:00