Merge branch 'master' into mirceakitsune/universal_reload_system

[xonotic/xonotic-data.pk3dir.git] / quake.rc

diff --git a/quake.rc b/quake.rc
index 2dec76c772bcf12ee1e6e6d2fcbb03bb9f7bae6c..2c0f409ea23841e6dc4d41c39eda608da611b9cf 100644 (file)
--- a/quake.rc
+++ b/quake.rc
@@ -1,12 +1,12 @@
 exec default.cfg
 exec config.cfg
+maxplayers $menu_maxplayers
 exec data/campaign.cfg
 exec config_update.cfg
+exec font-xolonium.cfg
 exec autoexec.cfg
 stuffcmds
-exec loadfonts.cfg
 //startdemos demos/demo1 demos/demo2 demos/demo3
 //startdemos
 //play announcer/male/welcome.ogg
-
-//exec font-dejavu.cfg
+crypto_keygen 0 http://ca.xonotic.org/?ca=0&key=