mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-09 11:22:25 +01:00
Merge master into fix/ai-braking-split
Resolve the conflicts with the merged nested ifs (#194) in control_tractive_force() and control_braking_force(): the conditions keep the new flattened form, with this branch's changes carried into them.
This commit is contained in:
1790
vehicle/Driver.cpp
1790
vehicle/Driver.cpp
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user