Merge branch 'master' into fruitiex/newpanelhud

[xonotic/xonotic-data.pk3dir.git] / defaultXonotic.cfg

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 427e1a12694d889c6b98cb02e97457085c472542..4752f9100ea550ff61684be578d89da4e521e0eb 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1,17 +1,5 @@
 set g_xonoticversion 2.5svn    "Xonotic version (formatted for humans)"
 
-//!<showbrand
-showbrand 3
-echo
-echo A warning about this being a SVN development version was set up.
-echo This build shall be used for development and testing only!
-echo
-echo If you want to disable this warning, add the line
-echo   showbrand 0
-echo to your autoexec.cfg.
-echo
-//!>showbrand
-
 // changes a cvar and reports it to the server (for the menu to notify the
 // server about changes)
 alias setreport "set \"$1\" \"$2\" ; sendcvar \"$1\""
@@ -105,7 +93,7 @@ mod_q3bsp_lightmapmergepower 3
 // player defaults
 _cl_color 102
 _cl_name Player
-_cl_playermodel models/player/marine.zym
+_cl_playermodel models/player/umbra.iqm
 _cl_playerskin 0
 crosshair 1
 seta crosshair_per_weapon 0    "when 1, each gun will display a different crosshair"
@@ -1339,6 +1327,9 @@ seta hud_progressbar_alpha "0.5" "alpha of progressbars"
 
 seta hud_configure_checkcollisions 1 "check for collisions against other panels when in hud configure mode"
 seta hud_configure_bg_minalpha 0.5 "minimum panel background alpha when in hud configure mode"
+seta hud_configure_grid 0 "snap to grid when moving/resizing panels"
+seta hud_configure_grid_x 10 "snap each X pixels"
+seta hud_configure_grid_y 10 "snap each Y pixels"
 
 seta hud_dock 1 "enable/disable a fullscreen background for the hud, useful for creating artificial docks"
 seta hud_dock_color "0 0.6 0.9" "dock color"
@@ -1451,7 +1442,17 @@ seta hud_vote_bg_alpha 0 "if set to something else than 0 = override default alp
 seta hud_vote_bg_border 0 "if set to something else than 0 = override size of border around the background"
 seta hud_vote_bg_padding 0 "padding of contents from border"
 
-seta hud_pressedkeys 1 "enable/disable this panel"
+seta hud_modicons 1 "enable/disable this panel"
+seta hud_modicons_pos "-0.571569 -0.265625" "position of this base of the panel"
+seta hud_modicons_size "0.145098 0.114105" "size of this panel"
+seta hud_modicons_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background"
+seta hud_modicons_bg_color "" "optional R G B string of the background color, otherwise use hud default"
+seta hud_modicons_bg_alpha 0 "if set to something else than 0 = override default alpha"
+seta hud_modicons_bg_border 0 "if set to something else than 0 = override size of border around the background"
+seta hud_modicons_bg_padding 0 "padding of contents from border"
+seta hud_progressbar_nexball_color "0.7 0.1 0" "R G B vector of the progress bar background color"
+
+seta hud_pressedkeys 1 "enable/disable this panel, 1 = show only when spectating other players, 2 = show always"
 seta hud_pressedkeys_pos "-0.571569 -0.265625" "position of this base of the panel"
 seta hud_pressedkeys_size "0.145098 0.114105" "size of this panel"
 seta hud_pressedkeys_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background"