16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 04:19:19 +02:00

Merge branch 'gfx-work' into udpnetwork

This commit is contained in:
milek7
2019-01-01 00:26:19 +01:00
61 changed files with 1783 additions and 1135 deletions

View File

@@ -317,6 +317,7 @@ drivermouse_input::button( int const Button, int const Action ) {
m_pickwaiting = false;
if( Button == GLFW_MOUSE_BUTTON_LEFT ) {
if( m_slider.command() != user_command::none ) {
m_relay.post( m_slider.command(), 0, 0, Action, 0 );
m_slider.release();
}
}
@@ -485,6 +486,9 @@ drivermouse_input::default_bindings() {
{ "brakeprofiler_sw:", {
user_command::brakeactingspeedsetrapid,
user_command::brakeactingspeedsetpassenger } },
{ "brakeopmode_sw:", {
user_command::trainbrakeoperationmodeincrease,
user_command::trainbrakeoperationmodedecrease } },
{ "maxcurrent_sw:", {
user_command::motoroverloadrelaythresholdtoggle,
user_command::none } },