From: Thomas Debesse <dev@illwieckz.net>
Date: Tue, 21 Jun 2022 04:33:07 +0000 (+0200)
Subject: Merge commit 'e36a9e0f374477a0a4c778d06454a979cd53fc47' into master-merge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e0b3b7ba55d4039f2d4d9dc359c0c81068bf1eb4;p=xonotic%2Fnetradiant.git

Merge commit 'e36a9e0f374477a0a4c778d06454a979cd53fc47' into master-merge
---

e0b3b7ba55d4039f2d4d9dc359c0c81068bf1eb4
diff --cc radiant/camwindow.cpp
index 987383ed,a6134f5f..c9f71329
--- a/radiant/camwindow.cpp
+++ b/radiant/camwindow.cpp
@@@ -529,10 -539,9 +541,12 @@@ typedef ReferenceCaller<camera_t, void(
  typedef ReferenceCaller<camera_t, void(), &Camera_MoveDown_KeyDown> FreeMoveCameraMoveDownKeyDownCaller;
  typedef ReferenceCaller<camera_t, void(), &Camera_MoveDown_KeyUp> FreeMoveCameraMoveDownKeyUpCaller;
  
+ typedef ReferenceCaller<camera_t, void(), &Camera_Focus_KeyDown> FreeMoveCameraFocusKeyDownCaller;
+ typedef ReferenceCaller<camera_t, void(), &Camera_Focus_KeyUp> FreeMoveCameraFocusKeyUpCaller;
  
 +const float MIN_FOV = 60;
 +const float MAX_FOV = 179;
 +const float FOV_STEP = 10;
  const float SPEED_MOVE = 32;
  const float SPEED_TURN = 22.5;
  const float MIN_CAM_SPEED = 10;