X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=defaultXonotic.cfg;h=36d6aecd59e9690a773665a545e90c423c4ad33e;hp=a616d1769264196d8b0a81b5a554d1c7efa13986;hb=9342fa27f9245d9dd57c524876e583475fe3c0f9;hpb=913838c9091f92e1a0dc431187ffcbfcd8927f5d

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index a616d17692..36d6aecd59 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -69,6 +69,11 @@ alias rec "record demos/$1"
 alias ply "playdemo $1"
 alias tdem "timedemo $1"
 
+// for backwards compatibility
+alias savedb "sv_cmd database save \"$1\""
+alias dumpdb "sv_cmd database dump \"$1\""
+alias loaddb "sv_cmd database load \"$1\""
+
 alias dropweapon "impulse 17"
 alias +show_info +button7
 alias -show_info -button7
@@ -702,7 +707,7 @@ set g_ctf_flagcarrier_selfforce 1
 set g_ctf_fullbrightflags 0
 set g_ctf_dynamiclights 0
 set g_ctf_allow_drop 1	"dropping allows circumventing carrierkill score, so enable this with care!"
-set g_ctf_reverse 0	"when 1, bases/flags are switched :P you have to capture your OWN flag by bringing it to the ENEMY's"
+set g_ctf_reverse 0	"if enabled, flags positions are switched: you have to capture the enemy's flag from your own base by bringing it to your own flag in the enemy base"
 set g_balance_ctf_delay_collect 1.0
 set g_balance_ctf_damageforcescale 1
 
@@ -899,6 +904,7 @@ set g_multijump_add 0	"0 = make the current z velocity equal to jumpvelocity, 1
 set g_multijump_speed -999999	"Minimum vertical speed a player must have in order to jump again"
 
 // effects
+r_glsl_vertextextureblend_usebothalphas 1 // allows to abuse texture blending as detail texture
 r_glsl_postprocess 1
 r_picmipsprites 0 // Xonotic uses sprites that should never be picmipped (team mate, typing, waypoints)
 r_picmipworld 1
@@ -1245,6 +1251,10 @@ seta g_waypointsprite_alpha 1 "This allows the client to control transparency of
 seta g_waypointsprite_edgefadealpha 0.5 "alpha multiplier near the edge"
 seta g_waypointsprite_edgefadescale 1 "scale multiplier near the edge"
 seta g_waypointsprite_edgefadedistance 50 "distance in virtual pixels from edge where to start fading"
+seta g_waypointsprite_edgeoffset_bottom 0 "offset of how close the waypoint can be to the bottom edge of the screen"
+seta g_waypointsprite_edgeoffset_left 0 "offset of how close the waypoint can be to the left edge of the screen"
+seta g_waypointsprite_edgeoffset_right 0 "offset of how close the waypoint can be to the right edge of the screen"
+seta g_waypointsprite_edgeoffset_top 0 "offset of how close the waypoint can be to the top edge of the screen"
 seta g_waypointsprite_crosshairfadealpha 0.25 "alpha multiplier near crosshair"
 seta g_waypointsprite_crosshairfadescale 1 "scale multiplier near the crosshair"
 seta g_waypointsprite_crosshairfadedistance 150 "distance in virtual pixels from crosshair where to start fading"
@@ -1263,7 +1273,7 @@ alias "g_waypointsprite_team_danger_p"	"impulse 38"
 alias "g_waypointsprite_team_danger_d"	"impulse 39"
 alias "g_waypointsprite_clear_personal"	"impulse 47"
 alias "g_waypointsprite_clear"	"impulse 48"
-alias "g_waypointsprite_toggle"	"impulse 49"
+alias "g_waypointsprite_toggle"	"toggle cl_hidewaypoints"
 // key for that?
 seta cl_hidewaypoints 0 "disable static waypoints, only show team waypoints"
 
@@ -2136,6 +2146,10 @@ set g_playerstats_debug 0 "when 1, player stats are dumped to the console too"
 // create this cvar in case the engine did not
 set snd_soundradius 1200
 
+// declare the channels we use
+seta snd_channel8volume 1 "QuakeC controlled background music volume"
+seta snd_channel9volume 1 "QuakeC controlled ambient sound volume"
+
 // loading screen
 scr_loadingscreen_background 0
 scr_loadingscreen_barcolor "0 0.5 1"