Merge branch 'master' into fruitiex/newpanelhud

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index b42917ba07a7534ed1bacdb84ee0d6316faa7405..6aeb7e9339c4ab4005803aebb935b7978d4f6fa6 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1327,8 +1327,8 @@ set _hud_configure 0 "1 = configure the HUD"
 seta hud_configure_checkcollisions 1 "check for collisions against other panels when in hud configure mode"
 seta hud_configure_bg_minalpha 0.25 "minimum panel background alpha when in hud configure mode"
 seta hud_configure_grid 1 "snap to grid when moving/resizing panels"
-seta hud_configure_grid_x 0.01 "snap to X * vid_conwidth"
-seta hud_configure_grid_y 0.01 "snap to Y * vid_conheight"
+seta hud_configure_grid_xsize 0.01 "snap to X * vid_conwidth"
+seta hud_configure_grid_ysize 0.01 "snap to Y * vid_conheight"
 seta hud_configure_grid_alpha 0.15 "alpha for visible grid when in configure mode"
 
 seta sbar_info_pos 0 "Y-axis distance from lower right corner for engine info prints"
@@ -1375,7 +1375,7 @@ set timelimit_increment 5
 set timelimit_decrement 5
 set timelimit_min 5
 set timelimit_max 60
-alias extendmatchtime "sv_cmd rpn /timelimit timelimit timelimit_max 0 timelimit when timelimit timelimit_increment add bound def"
+alias extendmatchtime "sv_cmd rpn /timelimit timelimit timelimit_max timelimit timelimit_increment add bound def"
 alias reducematchtime "sv_cmd rpn /timelimit timelimit timelimit_decrement sub timelimit_min timelimit bound def"
 alias endmatch "timelimit -1"