X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=defaultXonotic.cfg;h=d351eb55d5f939247df70d005be31af4a704cf92;hb=7703881b139faa05ed3104ca83fff82b201c446d;hp=c40da7257f021d8b5deacef3af5ca009d2515a39;hpb=02750768ae3f40646d17d5cc84cd73e1c7dbabd2;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index c40da7257..d351eb55d 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -79,9 +79,8 @@ alias movetoteam_pink "sv_cmd movetoteam $1 pink" alias movetoteam_yellow "sv_cmd movetoteam $1 yellow" alias movetoteam_auto "sv_cmd movetoteam $1 auto" -// merge lightmaps up to 1024x1024 textures -// the default of 2048x2048 is too heavy for my rig (SavageX) -mod_q3bsp_lightmapmergepower 3 +// merge lightmaps up to 2048x2048 textures +mod_q3bsp_lightmapmergepower 4 // player defaults _cl_color 102 @@ -322,8 +321,9 @@ set g_allow_oldnexbeam 0 "If enabled, clients are allowed to use old v2.3 Nexgun seta cl_particles_oldnexbeam 0 "Uses the old v2.3 Nexgun beam instead of the new beam, only works if server allows it (g_allow_oldnexbeam 1)" set sv_qcweaponanimation 0 -set g_telefrags 1 -set g_telefrags_avoid 0 +set g_telefrags 1 "telefragging, i.e. killing someone who stands in the way of someone who is teleporting" +set g_telefrags_teamplay 1 "never telefrag team mates" +set g_telefrags_avoid 1 "when teleporters have a random destination, avoid teleporting to locations where a telefrag would happen" set g_teleport_maxspeed 0 "maximum speed that a player can keep when going through a teleporter (if a misc_teleporter_dest also has a cap the smallest one of these will be used), 0 = don't limit, -1 = keep no speed" set g_respawn_ghosts 0 "if 1 dead bodies become ghosts and float away when the player respawns" @@ -338,7 +338,7 @@ set sv_fragmessage_information_typefrag 1 "Enable typefrag display information, // use default physics set sv_friction_on_land 0 -exec physicsNoQWBunny-nexbased.cfg +exec physicsNoQWBunny-xpmbased.cfg set sv_player_viewoffset "0 0 35" "view offset of the player model" set sv_player_mins "-16 -16 -24" "playermodel mins" @@ -846,8 +846,16 @@ set g_footsteps 1 "serverside footstep sounds" set g_deathglow 1.25 "when enabled, players stop glowing after they die (the value specifies glow fading speed)" +set g_multijump 0 "Number of multiple jumps to allow (jumping again in the air), -1 allows for infinite jumps" +set g_multijump_add 0 "0 = make the current z velocity equal to jumpvelocity, 1 = add jumpvelocity to the current z velocity" +set g_multijump_speed -999999 "Minimum vertical speed a player must have in order to jump again" + // effects r_picmipsprites 0 // Xonotic uses sprites that should never be picmipped (team mate, typing, waypoints) +r_picmipworld 1 +gl_picmip_world 0 +gl_picmip_sprites 0 +gl_picmip_other 2 // so, picmip -2 is best possible quality r_mipsprites 1 r_mipskins 1 r_shadow_realtime_world_lightmaps 1 @@ -1331,6 +1339,7 @@ seta sbar_info_pos 0 "Y-axis distance from lower right corner for engine info pr // hud cvar descriptions exec _hud_descriptions.cfg // exec the default skin config. remember, NO menu_restart in the deafault cfg (dp segfaults at startup otherwise) +// please add any new cvars into the hud_save script in qcsrc/client/hud.qc for consistency exec hud_default.cfg // user preference cvars (i.e. shouldn't be adjusted by a skin config) @@ -1348,6 +1357,8 @@ seta hud_panel_weapons_ammo_full_nails 200 "show 100% of the status bar at this seta hud_panel_weapons_ammo_full_cells 80 "show 100% of the status bar at this ammo count" seta hud_panel_weapons_ammo_full_rockets 80 "show 100% of the status bar at this ammo count" seta hud_panel_weapons_ammo_full_fuel 100 "show 100% of the status bar at this ammo count" +seta hud_panel_weapons_timeout "3" "panel disappears if you don't switch weapon for this amount of seconds" +seta hud_panel_weapons_timeout_effect "1" "disappearance effect: 0) no effect; 1) panel moves out of screen; 2) panel fades out" seta hud_panel_notify_time 10 "time that a new entry stays until it fades out" seta hud_panel_notify_fadetime 3 "fade out time" @@ -1384,6 +1395,8 @@ seta scoreboard_fadeoutspeed 5 "speed at which scoreboard fades out, higher is f seta scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard" seta scoreboard_highlight_alpha 0.10 "highlight alpha value (depends on hud_scoreboard_highlight 1)" seta scoreboard_highlight_alpha_self 0.25 "self highlight alpha value" +seta scoreboard_offset_left 0.04 "how many pixels the scoreboard is offset from the left screen edge" +seta scoreboard_offset_right 0.148 "how many pixels the scoreboard is offset from the right screen edge" // for menu server list (eventually make them have engine support?) seta menu_slist_showfull 1 "show servers even if they are full and have no slots to join" @@ -1458,6 +1471,7 @@ sys_ticrate 0.0166667 cl_netfps 60 // should match sv_gameplayfix_delayprojectiles 0 sv_gameplayfix_q2airaccelerate 1 +sv_gameplayfix_stepmultipletimes 1 // delay for "kill" to prevent abuse set g_balance_kill_delay 5 @@ -1496,8 +1510,8 @@ unalias _cdtrack cd remap $g_cdtracks_remaplist set sv_intermission_cdtrack "" -set g_cdtracks_dontusebydefault "" -set menu_cdtrack "ninesix" +set g_cdtracks_dontusebydefault "rising-of-the-phoenix" +set menu_cdtrack "rising-of-the-phoenix" // maxidle (in seconds): kick players idle for more than that amount of time set sv_maxidle 0 @@ -1510,7 +1524,7 @@ set capturelimit 0 // hud: font size seta hud_fontsize 11 seta hud_fontsize_spec 16 -seta scr_centersize 11 +seta scr_centersize 12 seta hud_width 560 // alias hud_font "loadfont user1 ${1},gfx/fallback ${2-}; loadfont user2 ${1}-big ${2-}; scoreboard_columns_set" alias sbar_font "set _requested_sbar_font \"${*}\"" @@ -1904,3 +1918,6 @@ scr_conscroll3_x 0 scr_conscroll3_y 0 scr_conscroll_x -0.1 scr_conscroll_y -0.3 + +// DP cannot properly detect this, so rather turn off the detection +r_texture_dds_load_dxt1_noalpha 1