Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index f269a424ac37b7dccae8220b7a0191f5793f78bd..d1b82b67560fd6d5b7a9407f41aa494e4c602b04 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1949,6 +1949,9 @@ sv_gameplayfix_consistentplayerprethink 1
 // support Q1BSP maps
 mod_q1bsp_polygoncollisions 1
 
+// match q3map2
+mod_obj_orientation 0
+
 // improve some minor details
 sv_gameplayfix_gravityunaffectedbyticrate 1
 sv_gameplayfix_nogravityonground 1