Merge branch 'Cloudwalk/rename-find' into 'master'

Rename the 'find' command to 'findent'

See merge request xonotic/xonotic-data.pk3dir!832

diff --git a/binds-xonotic.cfg b/binds-xonotic.cfg
index 3046579ae4788b2524c51474aaf8b86590d10ead..578aecd62c1e484d549c1fdbda4383e3947ba9d9 100644 (file)
--- a/binds-xonotic.cfg
+++ b/binds-xonotic.cfg
@@ -1,11 +1,11 @@
 // alias for switching the teamselect menu
-bind f5 menu_showteamselect
+bind F5 menu_showteamselect
 
-bind f6 team_auto
+bind F6 team_auto
 
-bind f7 menu_showsandboxtools
-bind f8 "quickmenu"
-bind f9 "cl_cmd hud minigame"
+bind F7 menu_showsandboxtools
+bind F8 "quickmenu"
+bind F9 "cl_cmd hud minigame"
 
 // movement
 bind w +forward

diff --git a/qcsrc/common/mapobjects/func/door.qc b/qcsrc/common/mapobjects/func/door.qc
index 57faf51455f18f0c47b5732dbf199045d73ed27d..11196ab38d7f2bbcce2418a3bfd3f201be84bed4 100644 (file)
--- a/qcsrc/common/mapobjects/func/door.qc
+++ b/qcsrc/common/mapobjects/func/door.qc
@@ -737,7 +737,10 @@ spawnfunc(func_door)
         }
         else if (!this.speed)
         {
-                this.speed = 100;
+               if (autocvar_sv_q3defragcompat)
+                       this.speed = 400;
+               else
+                       this.speed = 100;
         }
 
        settouch(this, door_touch);