Merge branch 'milek-dev' into gfx-work

This commit is contained in:
milek7
2019-09-15 21:34:21 +02:00
20 changed files with 1059 additions and 128 deletions

View File

@@ -231,7 +231,13 @@ driverkeyboard_input::default_bindings() {
{ user_command::motorblowersdisableall, GLFW_KEY_M | keymodifier::control },
// coolingfanstoggle
// tempomattoggle
// springbraketoggle
// springbrakeenable
// springbrakedisable
// springbrakeshutofftoggle
// springbrakeshutoffenable
// springbrakeshutoffdisable
// springbrakerelease
// admin_timejump,
{ user_command::timejumplarge, GLFW_KEY_F1 | keymodifier::control },
{ user_command::timejumpsmall, GLFW_KEY_F1 | keymodifier::shift },