Merge branch 'master' into Mario/rifle_arena

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 09e3d18527611439296e59692cc4058203f5e857..9dce045c36bd248748939b343ce808b5f4ec0a5c 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -10,7 +10,7 @@
 // e.g. Xonotic 1.5.1 RC1 will be 15101
 set g_xonoticversion git "Xonotic version (formatted for humans)"
 
-gameversion 600 // 0.6.0
+gameversion 700 // 0.7.0
 gameversion_min 0 // git builds see all versions
 gameversion_max 65535 // git builds see all versions
 
@@ -77,7 +77,7 @@ seta cl_unpress_attack_on_weapon_switch 1 "automatically unpress fire and fire1
 seta cl_spawn_event_particles 1 "pointparticles effect whenever a player spawns"
 seta cl_spawn_event_sound 1 "sound effect whenever a player spawns"
 //seta cl_spawn_point_model 0 "place a model at all spawn points" // still needs a model
-seta cl_spawn_point_particles 1 "pointparticles effect at all spawn points"
+seta cl_spawn_point_particles 1 "pointparticles effect at all spawn points" // managed by effects-.cfg files
 
 freelook 1
 sensitivity 6
@@ -467,6 +467,7 @@ set sv_dodging_ramp_time 0.1 "a ramp so that the horizontal part of the dodge is
 set sv_dodging_height_threshold 10 "the maximum height above ground where to allow dodging"
 set sv_dodging_wall_distance_threshold 10 "the maximum distance from a wall that still allows dodging"
 set sv_dodging_sound 1 "if 1 dodging makes a sound. if 0 dodging is silent"
+set sv_dodging_frozen 0 "allow dodging while frozen"
 
 set g_spawn_alloweffects 1 "allow clients to enable spawn point and event effects such as particles and sounds, see cl_spawn_ cvars for more info"
 set g_spawn_furthest 1 "this amount of the spawns shall be far away from any players"
@@ -566,6 +567,7 @@ cl_particles_smoke 1
 vid_gl20 1
 r_glsl_deluxemapping 1
 r_glsl_offsetmapping 0
+r_glsl_offsetmapping_lod 1
 r_glsl_offsetmapping_reliefmapping 0
 r_glsl_offsetmapping_scale 0.02
 // execute effects-normal.cfg to make sure that all effect settings are reset
@@ -1550,7 +1552,7 @@ snd_identicalsoundrandomization_tics    1
 scr_loadingscreen_background 0
 scr_loadingscreen_barcolor "0 0.5 1"
 scr_loadingscreen_barheight 12
-scr_loadingscreen_count 14
+scr_loadingscreen_count 1
 scr_loadingscreen_firstforstartup 1
 scr_loadingscreen_scale 999
 scr_loadingscreen_scale_base 1