Merge remote-tracking branch 'manul-public/master' into manul-staging

This commit is contained in:
WLs50
2025-04-05 14:24:53 +02:00
45 changed files with 875 additions and 477 deletions

View File

@@ -281,8 +281,8 @@ drivermouse_input::move( double Mousex, double Mousey ) {
void
drivermouse_input::scroll( double const Xoffset, double const Yoffset ) {
if( Global.ctrlState || m_buttons[1] == GLFW_PRESS ) {
// ctrl + scroll wheel or holding right mouse button + scroll wheel adjusts fov
if( Global.ctrlState ) {
// ctrl + scroll wheel adjusts fov
Global.FieldOfView = clamp( static_cast<float>( Global.FieldOfView - Yoffset * 20.0 / Timer::subsystem.mainloop_total.average() ), 15.0f, 75.0f );
}
else {
@@ -638,6 +638,12 @@ drivermouse_input::default_bindings() {
{ "epbrake_bt:",{
user_command::epbrakecontroltoggle,
user_command::none } },
{ "epbrakeon_bt:",{
user_command::epbrakecontrolenable,
user_command::none } },
{ "epbrakeoff_bt:",{
user_command::epbrakecontroldisable,
user_command::none } },
{ "sand_bt:", {
user_command::sandboxactivate,
user_command::none } },