X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=defaultXonotic.cfg;h=6ec248453f27756272bfd0e4682b05772edde2b3;hp=1f977fc67e0aae71f08e9547ebf339ac37c6e15a;hb=ac46eb66c927d1d4c0c61f1ada5efe7fc847ac63;hpb=7293ca2c6ff5de6233e2cb07f2c37f2486120c29

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 1f977fc67e..6ec248453f 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -264,6 +264,14 @@ gl_polyblend 0 // whether to use screen tints, this has now been replaced by a b
 r_motionblur 0 // motion blur value, default is 0
 r_damageblur 0 // motion blur when damaged, default is 0
 
+r_bloom_blur 8
+r_bloom_brighten 3
+r_bloom_colorexponent 1
+r_bloom_colorscale 1
+r_bloom_colorsubtract 0.25
+r_bloom_resolution 320
+r_hdr_range 4
+
 seta vid_x11_display ""	"xonotic-linux-*.sh will use this to start xonotic on an other/new X display"
 // This can have three possible settings:
 //	""		run as usual
@@ -629,7 +637,7 @@ seta timelimit_suddendeath 5 "number of minutes suddendeath mode lasts after all
 // common team values
 set g_tdm 0 "Team Deathmatch: the team who kills their opponents most often wins"
 
-seta teamplay_default 4 "default teamplay setting in team games. 1 = no friendly fire, self damage. 2 = friendly fire and self damage enabled. 3 = no friendly fire, but self damage enabled. 4 = obey the following four cvars"
+seta teamplay_mode 4 "default teamplay setting in team games. 1 = no friendly fire, self damage. 2 = friendly fire and self damage enabled. 3 = no friendly fire, but self damage enabled. 4 = obey the following four cvars"
 seta g_mirrordamage 0.300000	"for teamplay 4: mirror damage factor"
 seta g_friendlyfire 0.100000	"for teamplay 4: fiendly fire factor"
 seta g_teamdamage_threshold 50	"for teamplay 4: threshold over which to apply mirror damage"
@@ -2042,9 +2050,21 @@ set g_forced_team_yellow "" "list of player IDs for yellow team"
 set g_forced_team_pink "" "list of player IDs for pink team"
 set g_forced_team_otherwise "default" "action if a non listed player joins (can be default for default action, spectate for forcing to spectate, or red, blue, yellow, pink)"
 
+// random charge stuff :P
+set g_weapon_charge_colormod_hdrmultiplier 4 "how much to multiply the colors by in the colormod vector"
+set g_weapon_charge_colormod_red_half 0
+set g_weapon_charge_colormod_green_half 0.5
+set g_weapon_charge_colormod_blue_half 1
+set g_weapon_charge_colormod_red_full 1
+set g_weapon_charge_colormod_green_full -0.5
+set g_weapon_charge_colormod_blue_full -1
+
 // player statistics server URI
 set g_playerstats_uri ""
 
+// create this cvar in case the engine did not
+set snd_soundradius 1200
+
 // other config files
 exec balanceXonotic.cfg
 exec ctfscoring-ai.cfg