X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=defaultXonotic.cfg;h=c9b5cd7df79c91123bc9b5a1ed9d7b90cf417f37;hp=8e4d45d364413adbf0c88777f28a36b996d5526f;hb=eb9fdf8082d6bae222a64376a4a1bb55bcb1b3a3;hpb=1216175333a1129260067a4f3ef26e9b43336ded diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 8e4d45d364..c9b5cd7df7 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1,18 +1,3 @@ -set g_xonoticversion 2.5svn "Xonotic version (formatted for humans)" - -// changes a cvar and reports it to the server (for the menu to notify the -// server about changes) -alias setreport "set \"$1\" \"$2\" ; sendcvar \"$1\"" - -// detect dedicated server or client -alias "_detect_dedicated_$qport" "$*" -alias "_detect_dedicated_0" "" -alias if_dedicated "_detect_dedicated_$qport ${* asis}" -alias if_client "${* asis}" -if_dedicated alias if_client "" - -seta g_configversion 0 "Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1 Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg" - // Xonotic version (formatted for machines) // used to determine if a client version is compatible // this doesn't have to be bumped with every release @@ -23,23 +8,31 @@ seta g_configversion 0 "Configuration file version (used to upgrade settings) 0: // servers either // // e.g. Xonotic 1.5.1 RC1 will be 15101 -gameversion 20000 -gameversion_min 20000 // 2.5.2 still used this -gameversion_max 20699 // 2.5 version allows any 2.6 release, but no more +set g_xonoticversion git "Xonotic version (formatted for humans)" +gameversion 100 // 0.1.0 +gameversion_min 0 // git builds see all versions +gameversion_max 65535 // git builds see all versions // compatibility guideline: // version a.b.c = a0b0c // gameversion_min = a0(b-1)00 // show servers of the previous "line" // gameversion_max = a0(b+1)99 // show servers of the next "line" -// example: 2.6.3 -// gameversion 20603 -// gameversion_min 20500 -// gameversion_max 20799 -// however, in 2.5.x, we will: -// gameversion = 20000 // let other 2.5 clients connect -// gameversion_min = 20000 // 2.5.x still has this, we cannot block it within 2.5 -// however, in 2.6.x, we will just: -// gameversion_min = 20000 // show 2.5 servers +// so, for a given gameversion, _min and _max calculate as follows: +// gameversion_min = (gameversion / 100) * 100 - 100 +// gameversion_max = (gameversion / 100) * 100 + 199 + +// changes a cvar and reports it to the server (for the menu to notify the +// server about changes) +alias setreport "set \"$1\" \"$2\" ; sendcvar \"$1\"" + +// detect dedicated server or client +alias "_detect_dedicated_$qport" "$*" +alias "_detect_dedicated_0" "" +alias if_dedicated "_detect_dedicated_$qport ${* asis}" +alias if_client "${* asis}" +if_dedicated alias if_client "" + +seta g_configversion 0 "Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1 Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg" // say aliases alias asay_ctf_flagcarrier "say_team flag carrier at %y" @@ -338,14 +331,14 @@ set g_respawn_ghosts_speed 5 "the speed with which respawn ghosts float and rota set g_respawn_ghosts_maxtime 6 "maximum amount of time a respawn ghost can last, minimum time is half this value. 0 disables and ghosts fade when the body would" // fragmessage: This allows extra information to be displayed with the frag centerprints. -set sv_fragmessage_information_ping 0 "Enable ping display information, 0 = Never display; 1 = Always display (If the player is a bot, it will say bot instead of the ping.)" +set sv_fragmessage_information_ping 1 "Enable ping display information, 0 = Never display; 1 = Always display (If the player is a bot, it will say bot instead of the ping.)" set sv_fragmessage_information_handicap 1 "Enable handicap display information, 0 = Never display; 1 = Only when the player has handicap on; 2 = Always display (Displays Off if off)" -set sv_fragmessage_information_stats 0 "Enable statistics (health/armor) display information, 0 = Never display; 1 = Always display (Only available for the person who was killed)" +set sv_fragmessage_information_stats 1 "Enable statistics (health/armor) display information, 0 = Never display; 1 = Always display (Only available for the person who was killed)" set sv_fragmessage_information_typefrag 1 "Enable typefrag display information, 0 = Never display; 1 = Always display" // use default physics set sv_friction_on_land 0 -exec physicsNoQWBunny.cfg +exec physicsNoQWBunny-nexbased.cfg set sv_player_viewoffset "0 0 35" "view offset of the player model" set sv_player_mins "-16 -16 -24" "playermodel mins" @@ -845,16 +838,24 @@ set g_nexball_radar_showallplayers 1 "1: show every player and the ball on the // server game balance settings // powerup balance settings // weapon balance settings follow -exec balance.cfg +exec balanceXonotic.cfg set g_bloodloss 0 "amount of health below which blood loss occurs" -set g_footsteps 0 "serverside footstep sounds" +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 @@ -1338,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) @@ -1350,11 +1352,13 @@ seta hud_panel_weapons_accuracy_color1 "1 1 0" seta hud_panel_weapons_accuracy_color2 "0 1 0" seta hud_panel_weapons_accuracy_color_levels "0 20 100" "accuracy values at which a specified color (hud_panel_weapons_accuracy_color) will be used. If your accuracy is between 2 of these values then a mix of the Xth and X+1th colors will be used. You can specify up to 10 values, in increasing order" seta hud_panel_weapons_ammo 1 "show ammo as a status bar" -seta hud_panel_weapons_ammo_full_shells 40 "show 100% of the status bar at this ammo count" -seta hud_panel_weapons_ammo_full_nails 100 "show 100% of the status bar at this ammo count" -seta hud_panel_weapons_ammo_full_cells 60 "show 100% of the status bar at this ammo count" -seta hud_panel_weapons_ammo_full_rockets 60 "show 100% of the status bar at this ammo count" +seta hud_panel_weapons_ammo_full_shells 50 "show 100% of the status bar at this ammo count" +seta hud_panel_weapons_ammo_full_nails 200 "show 100% of the status bar at this ammo count" +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" @@ -1391,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" @@ -1503,8 +1509,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 @@ -1517,7 +1523,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 \"${*}\"" @@ -1898,3 +1904,19 @@ set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (f set g_movement_highspeed 1 "movement speed modification factor (only changes movement when above maxspeed)" set g_maxspeed 0 "player speed limit, faster players are killed (0 for unlimited speed)" + +scr_conalpha 1 +scr_conalpha2factor 0.3 +scr_conalpha3factor 1 +scr_conalphafactor 0.8 +scr_conbrightness 0.35 +scr_conforcewhiledisconnected 1 +scr_conscroll2_x 0.11 +scr_conscroll2_y 0.2 +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