From: Mario <mario.mario@y7mail.com>
Date: Wed, 17 Jun 2020 00:27:49 +0000 (+0000)
Subject: Merge branch 'Cloudwalk/rename-find' into 'master'
X-Git-Tag: xonotic-v0.8.5~910
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=961266003085e9e031d4a760d6fe013e3d5e1055;hp=4f0d763354db6fe4dbcb69e4c4e63c31cfb3a4ab;p=xonotic%2Fxonotic-data.pk3dir.git

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 3046579ae..578aecd62 100644
--- 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 57faf5145..11196ab38 100644
--- 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);