From: Rudolf Polzer Date: Tue, 31 Jan 2012 19:48:23 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~74^2~12 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=39c5a2ddb560b76d6134ee27da5096eb784eac25;hp=-c Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 39c5a2ddb560b76d6134ee27da5096eb784eac25 diff --combined defaultXonotic.cfg index 66ec4a119,cb5be0877..e1c5cfc0d --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@@ -10,7 -10,7 +10,7 @@@ // e.g. Xonotic 1.5.1 RC1 will be 15101 set g_xonoticversion git "Xonotic version (formatted for humans)" -gameversion 500 // 0.5.0 +gameversion 600 // 0.6.0 gameversion_min 0 // git builds see all versions gameversion_max 65535 // git builds see all versions @@@ -29,25 -29,6 +29,6 @@@ alias setreport "set \"$1\" \"$2\" ; se seta cl_firststart "" "how many times the client has been run" seta cl_startcount 0 "how many times the client has been run" - // detect dedicated server or client - alias "_detect_dedicated_$qport" "${* asis}" - alias "_detect_dedicated_0" "" - alias _if_dedicated "_detect_dedicated_$qport ${* asis}" - alias if_client "${* asis}" - alias if_dedicated "${* asis}" - _if_dedicated alias if_client "" - if_client alias if_dedicated "" - - if_dedicated "alias" qc_cmd_svmenu "sv_cmd $$*" - if_client "alias" qc_cmd_svmenu "menu_cmd $$*" - if_dedicated "alias" qc_cmd_svcl "sv_cmd $$*" - if_client "alias" qc_cmd_svcl "cl_cmd $$*" - if_dedicated "alias" qc_cmd_svcmd "sv_cmd $$*" - if_client "alias" qc_cmd_svcmd "cmd $$*" - - // shorthand for the most usual case - alias qc_cmd "qc_cmd_svmenu $*" - 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 @@@ -63,39 -44,15 +44,15 @@@ alias asay_drop "say_team (%l) dropped alias +hook +button6 alias -hook -button6 alias use "impulse 21" - alias ready "cmd ready" - alias lockteams "sv_cmd lockteams" - alias unlockteams "sv_cmd unlockteams" - alias nospectators "sv_cmd nospectators" - alias cointoss "sv_cmd cointoss" - alias timeout "cmd timeout" //use this command to call a timeout - alias timein "cmd timein" //use this command to resume the game before timeout is finished - - alias bsp "ls maps/*.bsp" - alias chmap "changelevel $*" - alias gotomap "sv_cmd gotomap \"$1\"" - - alias rec "record demos/$1" - alias ply "playdemo $1" - alias tdem "timedemo $1" + + // for backwards compatibility alias dropweapon "impulse 17" alias +show_info +button7 alias -show_info -button7 - alias team_red "cmd selectteam red; cmd join" - alias team_blue "cmd selectteam blue; cmd join" - alias team_pink "cmd selectteam pink; cmd join" - alias team_yellow "cmd selectteam yellow; cmd join" - alias team_auto "cmd selectteam auto; cmd join" bind f6 team_auto - alias movetoteam_red "sv_cmd movetoteam $1 red" - alias movetoteam_blue "sv_cmd movetoteam $1 blue" - 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 2048x2048 textures mod_q3bsp_lightmapmergepower 4 @@@ -104,124 -61,6 +61,6 @@@ _cl_color 11 _cl_name Player _cl_playermodel models/player/erebus.iqm _cl_playerskin 0 - seta crosshair 16 - seta crosshair_color "0.6 0.8 1" - seta crosshair_alpha 0.300000 - seta crosshair_size 0.500000 - seta crosshair_dot 1 - seta crosshair_dot_alpha 1 - seta crosshair_dot_size 0.600000 - seta crosshair_dot_color "1 0 0" "when != 0, use custom color for the crosshair dot" - seta crosshair_pickup 0.25 - seta crosshair_pickup_speed 4 - seta crosshair_hitindication 0.5 - seta crosshair_hitindication_color "10 -10 -10" - seta crosshair_hitindication_speed 5 - seta crosshair_per_weapon 0 "when 1, each gun will display a different crosshair" - seta crosshair_color_per_weapon 1 "when 1, each gun will display the crosshair with a different color" - seta crosshair_effect_speed -1 "how fast (in seconds) some crosshair effects should take place, 0 = instant, -1 = 2x weapon switch time" - seta crosshair_effect_scalefade 1 "use scaling and fading for crosshair effects" - seta crosshair_hittest 1 "do a crosshair hit evaluation; also, the crosshair is scaled by the given number when aiming at an enemy, and blurred when aiming at a team mate" - seta crosshair_hittest_blur 1 "blur the crosshair if the shot is obstructed" - seta crosshair_hittest_showimpact 0 "move the crosshair to the actual impact location if obstructed" - seta crosshair_laser "" "crosshair to display when wielding the laser" - seta crosshair_laser_color "1 0.35 0.2" "crosshair color to display when wielding the laser" - seta crosshair_laser_alpha 0.75 "crosshair alpha value to display when wielding the laser" - seta crosshair_laser_size 0.4 "crosshair size when wielding the laser" - seta crosshair_shotgun "" "crosshair to display when wielding the shotgun" - seta crosshair_shotgun_color "0.7 0.7 0.7" "crosshair color to display when wielding the shotgun" - seta crosshair_shotgun_alpha 1.1 "crosshair alpha value to display when wielding the shotgun" - seta crosshair_shotgun_size 0.65 "crosshair size when wielding the shotgun" - seta crosshair_uzi "" "crosshair to display when wielding the machinegun" - seta crosshair_uzi_color "0.4 0.9 0.35" "crosshair color to display when wielding the machinegun" - seta crosshair_uzi_alpha 0.9 "crosshair alpha value to display when wielding the machinegun" - seta crosshair_uzi_size 0.6 "crosshair size when wielding the machinegun" - seta crosshair_grenadelauncher "" "crosshair to display when wielding the mortar" - seta crosshair_grenadelauncher_color "1 0.15 0" "crosshair color to display when wielding the mortar" - seta crosshair_grenadelauncher_alpha 1.15 "crosshair alpha value to display when wielding the mortar" - seta crosshair_grenadelauncher_size 0.7 "crosshair size when wielding the mortar" - seta crosshair_minelayer "" "crosshair to display when wielding the mortar" - seta crosshair_minelayer_color "0.75 0.75 0" "crosshair color to display when wielding the mortar" - seta crosshair_minelayer_alpha 1.15 "crosshair alpha value to display when wielding the mortar" - seta crosshair_minelayer_size 0.9 "crosshair size when wielding the mortar" - seta crosshair_electro "" "crosshair to display when wielding the electro" - seta crosshair_electro_color "0.35 0.5 1" "crosshair color to display when wielding the electro" - seta crosshair_electro_alpha 1 "crosshair alpha value to display when wielding the electro" - seta crosshair_electro_size 0.5 "crosshair size when wielding the electro" - seta crosshair_crylink "" "crosshair to display when wielding the crylink" - seta crosshair_crylink_color "0.85 0.25 1" "crosshair color to display when wielding the crylink" - seta crosshair_crylink_alpha 0.85 "crosshair alpha value to display when wielding the crylink" - seta crosshair_crylink_size 0.4 "crosshair size when wielding the crylink" - seta crosshair_nex "" "crosshair to display when wielding the nex gun" - seta crosshair_nex_color "0 0.9 1" "crosshair color to display when wielding the nex gun" - seta crosshair_nex_alpha 0.85 "crosshair alpha value to display when wielding the nex gun" - seta crosshair_nex_size 0.65 "crosshair size when wielding the nex gun" - seta crosshair_hagar "" "crosshair to display when wielding the hagar" - seta crosshair_hagar_color "0.85 0.5 0.35" "crosshair color to display when wielding the hagar" - seta crosshair_hagar_alpha 1 "crosshair alpha value to display when wielding the hagar" - seta crosshair_hagar_size 0.8 "crosshair size when wielding the hagar" - seta crosshair_rocketlauncher "" "crosshair to display when wielding the rocketlauncher" - seta crosshair_rocketlauncher_color "1 0.75 0.2" "crosshair color to display when wielding the rocketlauncher" - seta crosshair_rocketlauncher_alpha 1 "crosshair alpha value to display when wielding the rocketlauncher" - seta crosshair_rocketlauncher_size 0.5875 "crosshair size when wielding the rocketlauncher" - seta crosshair_porto "" "crosshair to display when wielding the porto" - seta crosshair_porto_color "0.5 1 0.5" "crosshair color to display when wielding the porto" - seta crosshair_porto_alpha 0.85 "crosshair alpha value to display when wielding the porto" - seta crosshair_porto_size 0.6 "crosshair size when wielding the porto" - seta crosshair_minstanex "" "crosshair to display when wielding the minstanex gun" - seta crosshair_minstanex_color "0.65 0.65 1" "crosshair color to display when wielding the minstanex gun" - seta crosshair_minstanex_alpha 1 "crosshair alpha value to display when wielding the minstanex gun" - seta crosshair_minstanex_size 0.4 "crosshair size when wielding the minstanex gun" - seta crosshair_hook "" "crosshair to display when wielding the hook" - seta crosshair_hook_color "0.65 1 0.85" "crosshair color to display when wielding the hook" - seta crosshair_hook_alpha 0.85 "crosshair alpha value to display when wielding the hook" - seta crosshair_hook_size 0.5 "crosshair size when wielding the hook" - seta crosshair_hlac "" "crosshair to display when wielding the H.L.A.C" - seta crosshair_hlac_color "1 0.65 0.2" "crosshair color to display when wielding the H.L.A.C." - seta crosshair_hlac_alpha 1 "crosshair alpha value to display when wielding the H.L.A.C." - seta crosshair_hlac_size 0.6 "crosshair size when wielding the H.L.A.C." - seta crosshair_seeker "" "crosshair to display when wielding the TAG Seeker" - seta crosshair_seeker_color "1 0.35 0.35" "crosshair color to display when wielding the TAG seeker" - seta crosshair_seeker_alpha 0.9 "crosshair alpha value to display when wielding the TAG seeker" - seta crosshair_seeker_size 0.8 "crosshair size when wielding the TAG seeker" - seta crosshair_rifle "" "crosshair to display when wielding the rifle" - seta crosshair_rifle_color "0.85 0.5 0.25" "crosshair color to display when wielding the rifle" - seta crosshair_rifle_alpha 1 "crosshair alpha value to display when wielding the rifle" - seta crosshair_rifle_size 0.5 "crosshair size when wielding the rifle" - seta crosshair_tuba "" "crosshair to display when wielding the tuba" - seta crosshair_tuba_color "0.85 0.5 0.25" "crosshair color to display when wielding the tuba" - seta crosshair_tuba_alpha 1 "crosshair alpha value to display when wielding the tuba" - seta crosshair_tuba_size 1 "crosshair size when wielding the tuba" - seta crosshair_fireball "" "crosshair to display when wielding the fireball" - seta crosshair_fireball_color "0.2 1.0 0.2" "crosshair color to display when wielding the fireball" - seta crosshair_fireball_alpha 1 "crosshair alpha value to display when wielding the fireball" - seta crosshair_fireball_size 1 "crosshair size when wielding the fireball" - seta crosshair_color_by_health 0 "if enabled, crosshair color will depend on current health" - - // ring around crosshair, used for various purposes (such as indicating bullets left in clip, nex charge) - seta crosshair_ring 1 "main cvar to enable or disable normal crosshair rings" - seta crosshair_ring_inner 0 "allow inner rings to be drawn too" - seta crosshair_ring_size 2 "ring size" - seta crosshair_ring_alpha 0.2 "ring alpha" - - seta crosshair_ring_nex 1 "draw a ring showing the current charge of the nexgun" - seta crosshair_ring_nex_alpha 0.15 - seta crosshair_ring_nex_inner_alpha 0.15 - seta crosshair_ring_nex_inner_color_red 0.8 - seta crosshair_ring_nex_inner_color_green 0 - seta crosshair_ring_nex_inner_color_blue 0 - seta crosshair_ring_nex_currentcharge_scale 30 - seta crosshair_ring_nex_currentcharge_movingavg_rate 0.05 - - seta crosshair_ring_minelayer 1 - seta crosshair_ring_minelayer_alpha 0.15 - - seta crosshair_ring_hagar 1 - seta crosshair_ring_hagar_alpha 0.15 - - seta crosshair_ring_reload 1 "main cvar to enable or disable ammo crosshair rings" - seta crosshair_ring_reload_size 2.5 "reload ring size" - seta crosshair_ring_reload_alpha 0.2 "reload ring alpha" seta cl_reticle 1 "control for toggling whether ANY zoom reticles are shown" seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (brakes image proportions)" @@@ -247,9 -86,10 +86,10 @@@ vid_fullscreen vid_width 1024 vid_height 768 vid_pixelheight 1 - seta menu_vid_width 1024 - seta menu_vid_height 768 - seta menu_vid_pixelheight 1 + set _menu_prvm_language "" + set _menu_vid_width "$vid_width" + set _menu_vid_height "$vid_height" + set _menu_vid_pixelheight "$vid_pixelheight" seta menu_vid_scale 0 // 2D resolution 800x600 vid_conwidth 800 @@@ -340,11 -180,12 +180,12 @@@ set teamplay_lockonrestart 0 "it set t set g_maxplayers 0 "maximum number of players allowed to play at the same time, set to 0 to allow all players to join the game" set g_maxplayers_spectator_blocktime 5 "if the players voted for the \"nospectators\" command, this setting defines the number of seconds a observer/spectator has time to join the game before he gets kicked" - //tournament mod + // tournament mod set g_warmup 0 "split the game into a warmup- and match-stage when set to 1" set g_warmup_limit 0 "if set to -1 the warmup-stage is not affected by any timelimit, if set to 0 the usual timelimit also affects warmup-stage, otherwise warmup will be limited to this time in SECONDS (useful for public matches)" set g_warmup_allow_timeout 0 "if set to 1 timeouts can also be called in the warmup-stage, when sv_timeout is set to 1" set g_warmup_allguns 1 "if set players start with all guns in warmup mode" + set g_warmup_majority_factor 0.8 "minimum percentage of players ready needed for warmup to end" set g_chat_nospectators 0 "if 0 spec/observer chat is always visible to the player, if 1 it is never visible to players, if 2 it is only visible to players during warmup stage" set sv_vote_nospectators 0 "if set only players can call a vote (thus spectators and observers can't call a vote)" @@@ -367,17 -208,26 +208,26 @@@ set g_telefrags_teamplay 1 "never telef 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" + seta cl_damageeffect 1 "enable weapon damage effects. 1 enables the feature on skeletal models, 2 on any model" + seta cl_damageeffect_ticrate 0.1 "particle spawn rate" + seta cl_damageeffect_bones 5 "how many damages to allow on a rigged mesh at once (non-skeletal objects are limited to one)" + seta cl_damageeffect_distribute 1 "divide particle intensity if multiple damages are present" + seta cl_damageeffect_lifetime 0.1 "how much a damage effect lasts, based on damage amount" + seta cl_damageeffect_lifetime_min 3 "minimum lifetime a damage effect may have" + seta cl_damageeffect_lifetime_max 6 "maximum lifetime a damage effect may have" + set g_respawn_ghosts 1 "if 1 dead bodies become ghosts and float away when the player respawns" set g_respawn_ghosts_speed 5 "the speed with which respawn ghosts float and rotate" 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" + set cl_deathglow 0.8 "number of seconds during which dead bodies glow out" set sv_gibhealth 100 "Minus health a dead body must have in order to get gibbed" // fragmessage: This allows extra information to be displayed with the frag centerprints. - set sv_fraginfo_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_fraginfo_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_fraginfo_stats 1 "Enable statistics (health/armor) display information, 0 = Never display; 1 = Always display (Only available for the person who was killed)" - set sv_fraginfo_typefrag 1 "Enable typefrag display information, 0 = Never display; 1 = Always display" + set sv_fraginfo 1 "Enable extra frag message information, 0 = Never display, 1 = Display only in warmup mode; 2 = Always display" + set sv_fraginfo_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_fraginfo_handicap 1 "Enable handicap display information, 0 = Never display, 1 = Only when the player has handicap on, 2 = Always display (Displays Off if disabled)" + set sv_fraginfo_stats 1 "Enable statistics (health/armor) display information, 0 = Never display, 1 = Always display (Only available for the person who was killed)" // use default physics set sv_friction_on_land 0 @@@ -425,9 -275,6 +275,6 @@@ cl_movement cl_movement_track_canjump 0 cl_stairsmoothspeed 200 - seta cl_autoswitch 1 "automatically switch to newly picked up weapons if they are better than what you are carrying" - alias autoswitch "set cl_autoswitch $1 ; cmd autoswitch $1" - set bot_config_file bots.txt "Name and path of the bot configuration file" set bot_number 0 "Minimum number of bots" seta bot_usemodelnames 0 "Use player model names for bot names" @@@ -486,6 -333,7 +333,7 @@@ set bot_ai_aimskill_order_filter_5th 0. // waypoint editor enable set g_waypointeditor 0 + set g_waypointeditor_auto 0 "Automatically create waypoints for bots while playing; BEWARE, this currently creates too many of them" set bot_ignore_bots 0 "When set, bots don't shoot at other bots" set bot_join_empty 0 "When set, bots also play if no player has joined the server" set bot_vs_human 0 "Bots and humans play in different teams when set. positive values to make an all-bot blue team, set to negative values to make an all-bot red team, the absolute value is the ratio bots vs humans (1 for equal count). Changes will be correctly applied only from the next game" @@@ -500,7 -348,6 +348,6 @@@ locs_enable pausable 0 set g_spawnshieldtime 1 "number of seconds you are invincible after you spawned, this shield is lost after you fire" set g_antilag 2 "AntiLag (0 = no AntiLag, 1 = verified client side hit scan, 2 = server side hit scan in the past, 3 = unverified client side hit scan)" - set g_trueaim_minrange 44 "TrueAim minimum range (TrueAim adjusts shots so they hit the crosshair point even though the gun is not at the screen center)" set g_antilag_nudge 0 "don't touch" set g_antilag_bullets 1 "Bullets AntiLag (0 = no AntiLag, 1 = server side hit scan in the past) - DO NOT TOUCH (severely changes weapon balance)" set g_shootfromclient 2 "let client decide if it has the gun left or right; if set to 2, center handedness is allowed; see also cl_gunalign" @@@ -580,7 -427,6 +427,6 @@@ seta menu_sandbox_edit_physics seta menu_sandbox_edit_force 1 seta menu_sandbox_edit_material "" - alias menu_showsandboxtools "menu_cmd directmenu SandboxTools" bind f7 menu_showsandboxtools set g_playerclip_collisions 1 "0 = disable collision testing against playerclips, might be useful on some defrag maps" @@@ -588,8 -434,6 +434,6 @@@ set g_botclip_collisions 1 "0 = disabl set welcome_message_time 8 - alias clearmap "disconnect" - set g_grappling_hook 0 "let players spawn with the grappling hook which allows them to pull themselves up" set g_invincible_projectiles 0 "set to 1 to disable any damage to projectiles in all balance configs, regardless of g_projectiles_damage" @@@ -697,9 -541,9 +541,9 @@@ set g_cts_weapon_stay set g_freezetag_respawn_waves 0 set g_freezetag_respawn_delay 0 set g_freezetag_weapon_stay 0 - set g_ka_respawn_delay 0 - set g_ka_respawn_waves 0 - set g_ka_weapon_stay 0 + set g_keepaway_respawn_delay 0 + set g_keepaway_respawn_waves 0 + set g_keepaway_weapon_stay 0 // overtime seta timelimit_overtime 2 "duration in minutes of one added overtime, added to the timelimit" @@@ -1004,8 -848,6 +848,6 @@@ seta cl_notify_carried_items "3" "notif set serverconfig server.cfg set _sv_init 0 alias startmap_dm "set _sv_init 0; map _init/_init; exec $serverconfig; set _sv_init 1" - alias sv_loadconfig "exec $serverconfig" - alias sv_restart "say \"Server will restart at the end of the match, you will all be reconnected automatically. $* \"; quit_and_redirect self" // aliases: alias +fire +attack @@@ -1035,8 -877,6 +877,6 @@@ alias togglezoom "${_togglezoom}zoom alias reload "impulse 20" - alias sandbox "cmd g_sandbox $*" - // movement bind w +forward bind a +moveleft @@@ -1099,7 -939,7 +939,7 @@@ bind u "+con_chat_maximize bind m +hud_panel_radar_maximized bind i +show_info bind PAUSE pause - bind F10 quit + bind F10 menu_showquitdialog bind F11 disconnect bind F12 screenshot bind F4 ready @@@ -1153,51 -993,10 +993,10 @@@ bind kp_enter "+userbind 16 bind kp_plus "+userbind 17" bind kp_minus "+userbind 18" - set sv_vote_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoteam_auto" "these commands can be voted" - set sv_vote_only_commands "" - set sv_vote_master_commands "movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink" "maybe add kickban here (but then sv_vote_master 0)" - set rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban *\" status \"sv_cmd teamstatus\" movetoteam_auto movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink" - set sv_vote_call 1 "users can call a vote for the above commands" - set sv_vote_master 1 "users can call a vote to become master" - set sv_vote_master_password "" "when set, users can use \"vlogin PASSWORD\" to log in as master" - set sv_vote_change 1 "set to 1 to allow to change you vote/mind" - set sv_vote_singlecount 0 "set to 1 to count votes once after timeout or to 0 to count with every vote" - set sv_vote_timeout 30 "a vote will timeout after this many seconds" - set sv_vote_wait 120 "a player can not call a vote again for this many seconds when his vote was not accepted" - set sv_vote_stop 15 "a player can not call a vote again for this many seconds when he stopped this vote (e.g. to correct it)" - set sv_vote_majority_factor 0.5 "which quotient of the PLAYERS constitute a majority? (try: 0.666, 0.75 when using the above)" - set sv_vote_simple_majority_factor 0.666 "which quotient of the VOTERS constitute a majority too? (0 = off, otherwise it must be higher than or equal to sv_vote_majority_factor)" - // when disabled, don't allow game type changes "note: set these two equal to JUST support simple majorities" - set sv_vote_override_mostrecent 0 - alias vhelp "cmd vote help" - alias vstatus "cmd vote status" - alias vcall "cmd vote call $*" - alias vstop "cmd vote stop" - alias vmaster "cmd vote master" - alias vlogin "cmd vote login $*" - alias vdo "cmd vote do $*" - alias vyes "cl_cmd vyes" - alias vno "cl_cmd vno" - alias vdontcare "cmd vote dontcare" - alias vabstain "cmd vote abstain" - - alias vmap "vcall gotomap $1" - alias vnextmap "vcall nextmap $1" - alias vkick "vcall kick $1" - alias vkickban "vcall kickban $1" - alias vend "vcall endmatch" - alias vdomap "vdo gotomap $1" - alias vdokick "vdo kick $*" - alias vdokickban "vdo kickban $*" - alias vdoend "vdo endmatch" - - alias lsmaps "cmd lsmaps" // lists all maps on server (for vmap, suggestmap, vnextmap) - alias lsnewmaps "cmd lsnewmaps" // lists all maps on server that do not yet have a record set (race/cts) bind F1 vyes bind F2 vno //used for spectate/observer mode - alias spec "cmd spectate" bind F3 spec // NIX (No Items Xonotic) - at each time, everyone uses the same weapon, @@@ -1231,27 -1030,28 +1030,28 @@@ set quit_and_redirect "" "set to an IP set g_campaign 0 set g_campaign_forceteam 0 "Forces the player to a given team in campaign mode, 1 = red, 2 = blue, 3 = yellow, 4 = pink" seta g_campaign_name "xonoticbeta" - set g_campaign_skill 0 - alias warp "sv_cmd warp $*" + seta g_campaign_skill -1 // -2 easy -1 medium 0 hard alias singleplayer_start "g_campaign_index 0; set scmenu_campaign_goto 0" alias singleplayer_continue "set scmenu_campaign_goto -1" alias singleplayer_levellist "set scmenu_campaign_dump 1; togglemenu; wait; togglemenu" - // Green's fullbright skins - alias cl_fbskin_green "playermodel models/player/erebus.iqm; playerskin 1; color 3 3" - alias cl_fbskin_red "playermodel models/player/erebus.iqm; playerskin 1; color 4 4" - alias cl_fbskin_orange "playermodel models/player/erebus.iqm; playerskin 1; color 14 14" - alias cl_fbskin_off "playermodel models/player/erebus.iqm; playerskin 0" + // Green's fullbright skins, updated by Samual + alias sv_fbskin_unique "sv_defaultcharacter 1; sv_defaultplayermodel models/player/megaerebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors \"\"" alias sv_fbskin_green "sv_defaultcharacter 1; sv_defaultplayermodel models/player/megaerebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 51" alias sv_fbskin_red "sv_defaultcharacter 1; sv_defaultplayermodel models/player/megaerebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 68" alias sv_fbskin_orange "sv_defaultcharacter 1; sv_defaultplayermodel models/player/megaerebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 238" + alias sv_fbskin_rainbow "sv_defaultcharacter 1; sv_defaultplayermodel models/player/megaerebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 95" + alias sv_fbskin_off "sv_defaultcharacter 0; sv_defaultplayerskin 0; sv_defaultplayercolors \"\"" seta sv_servermodelsonly 1 cl_curl_enabled 1 - cl_curl_maxspeed 400 + cl_curl_maxspeed 500 + cl_curl_useragent 1 + cl_curl_useragent_append "$g_xonoticversion" + sv_curl_defaulturl "http://www.xonotic.org/contentdownload/getmap.php?file=" set sv_curl_serverpackages_auto 1 "automatically add packs with *.serverpackage files to sv_curl_serverpackages" @@@ -1267,7 -1067,6 +1067,6 @@@ seta g_maplist_votable_suggestions_over seta g_maplist_votable_nodetail 1 "nodetail only shows total count instead of all vote counts per map, so votes don't influence others that much" seta g_maplist_votable_abstain 0 "when 1, you can abstain from your vote" seta g_maplist_votable_screenshot_dir "maps levelshots" "where to look for map screenshots" - alias suggestmap "cmd suggestmap $1" set g_chat_flood_spl 3 "normal chat: seconds between lines to not count as flooding" set g_chat_flood_lmax 2 "normal chat: maximum number of lines per chat message at once" @@@ -1332,20 -1131,6 +1131,6 @@@ seta cl_hidewaypoints 0 "disable stati seta g_waypointsprites_turrets 1 "disable turret waypoints" seta g_waypointsprites_turrets_maxdist 4000 "max distace for turret sprites" - // command extension - alias adminmsg "sv_cmd adminmsg $*" - alias teamstatus "cmd teamstatus; sv_cmd teamstatus" // yes, it is broken on listen servers that way, but well, who cares :P - alias printstats "sv_cmd printstats" // print status on demand - alias g_maplist_add "qc_cmd maplist add $*" - alias g_maplist_remove "qc_cmd maplist remove $*" - alias g_maplist_putfirst "qc_cmd maplist remove $* ; qc_cmd maplist add $*" - alias g_maplist_shufflenow "qc_cmd maplist shuffle" - alias g_maplist_cleanup "qc_cmd maplist cleanup" // removes maps that don't exist from the map list - alias gametype "sv_cmd gametype $*" - - alias addfav "qc_cmd addtolist net_slist_favorites $*" - alias addvote "qc_cmd addtolist sv_vote_commands $*" - // key hunt set g_keyhunt 0 "Key Hunt: collect all keys from the enemies and bring them together to score" set g_balance_keyhunt_delay_return 60 @@@ -1398,17 -1183,9 +1183,9 @@@ set g_ban_default_bantime 5400 "90 minu set g_ban_default_masksize 3 "masksize 0 means banning by UID only, 1 means banning by /8 (IPv6: /32) network, 2 means banning by /16 (IPv6: /48) network, 3 means banning by /24 (IPv6: /56) network, 4 means banning by single IP (IPv6: /64 network)" set g_banned_list "" "format: IP remainingtime IP remainingtime ..." set g_banned_list_idmode "1" "when set, the IP banning system always uses the ID over the IP address (so a user in a banned IP range can connect if they have a valid signed ID)" - alias bans "sv_cmd bans" - alias ban "sv_cmd ban $*" // usage: ban address(maybe incomplete, like 1.2.3) bantime(seconds) - alias kickban "sv_cmd kickban $*" // usage: kickban # playerno bantime(seconds) masksize(bytes) - alias unban "sv_cmd unban $*" // usage: unban 3 (number from bans) r_labelsprites_scale 0.40625 // labels sprites get displayed at 0.5x from 640x480 to 1280x1024, and at 1x from 1600x1200 onwards - // settemp subsystem. Do not touch. Usage: settemp variable value, next map resets it. - alias settemp "qc_cmd_svcl settemp $$*" - alias settemp_restore "qc_cmd_svcl settemp_restore" - // usercommands. These can be edited and bound by the menu. seta "userbind1_press" "say_team quad soon"; seta "userbind1_release" ""; seta "userbind1_description" "team: quad soon" seta "userbind2_press" "say_team free item %x^7 (l:%y^7); g_waypointsprite_team_here_p"; seta "userbind2_release" ""; seta "userbind2_description" "team: free item, icon" @@@ -1455,6 -1232,7 +1232,7 @@@ set menu_slowmo seta menu_sounds 0 "enables menu sound effects. 1 enables click sounds, 2 also enables hover sounds" seta menu_tooltips 1 "menu tooltips: 0 disabled, 1 enabled, 2 also shows cvar or console command (when available) changed or executed by the item" set menu_picmip_bypass 0 "bypass texture quality enforcement based on system resources, not recommended and may cause crashes!" + set menu_showboxes 0 "show item bounding boxes (debug)" r_textbrightness 0.2 r_textcontrast 0.8 @@@ -1511,19 -1289,11 +1289,11 @@@ set menu_weaponarena_with_laser 0 "als seta menu_maxplayers 16 "maxplayers value when the menu starts a game" - // command executed before loading a map by the menu - // makes sure maxplayers is at least minplayers or bot_number + 1 - alias _menu_loadmap_prepare_maxpl "maxplayers $_menu_loadmap_maxplayers" - alias menu_loadmap_prepare "disconnect; wait; g_campaign 0; menu_cmd rpn /_menu_loadmap_maxplayers menu_maxplayers minplayers bot_number 1 add max max def; _menu_loadmap_prepare_maxpl; g_maplist_shufflenow" - // useful vote aliases set timelimit_increment 5 set timelimit_decrement 5 set timelimit_min 5 set timelimit_max 60 - alias extendmatchtime "sv_cmd extendmatchtime" - alias reducematchtime "sv_cmd reducematchtime" - alias endmatch "timelimit -1" // useful keybind to maximize the chat area temporarily // HUD code takes care of many of these now... @@@ -1571,6 -1341,8 +1341,8 @@@ seta v_kicktime $v_kicktim seta r_subdivisions_tolerance $r_subdivisions_tolerance seta vid_gl20 $vid_gl20 seta vid_gl13 $vid_gl13 + seta r_drawviewmodel $r_drawviewmodel + seta v_idlescale $v_idlescale // ticrate //sys_ticrate 0.0166667 @@@ -1638,8 -1410,6 +1410,6 @@@ sv_allowdownloads 0 // download protoco set g_jump_grunt 0 "Do you make a grunting noise every time you jump? Is it the same grunting noise every time?" - alias allready "sv_cmd allready" - seta cl_weaponpriority "minstanex nex fireball grenadelauncher uzi hagar rifle electro rocketlauncher crylink minelayer shotgun hlac tuba laser porto seeker hook" "weapon priority list" seta cl_weaponpriority_useforcycling 0 "when set, weapon cycling by the mouse wheel makes use of the weapon priority list (the special value 2 uses the weapon ID list for cycling)" seta cl_weaponpriority0 "rocketlauncher grenadelauncher hagar seeker fireball" "use impulse 200 for prev gun from this list, 210 for best gun, 220 for next gun. Default value: explosives" @@@ -1654,18 -1424,9 +1424,9 @@@ seta cl_weaponpriority8 "" "use impuls seta cl_weaponpriority9 "" "use impulse 209 for prev gun from this list, 219 for best gun, 229 for next gun" seta cl_weaponimpulsemode 0 "0: only cycle between currently usable weapons in weapon priority order; 1: cycle between all possible weapons on a key in weapon priority order" - seta sv_status_privacy 1 "hide IP addresses from \"status\" replies shown to clients" - set g_maplist_allow_hidden 0 "allow hidden maps to be, e.g., voted for and in the maplist" set g_maplist_allow_frustrating 0 "allow impossible maps to be, e.g., voted for and in the maplist (if set to 2, ONLY impossible maps are allowed)" - if_client set g_start_delay 0 "delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server" - if_dedicated set g_start_delay 15 "delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server" - - alias radar "cl_cmd hud_panel_radar_maximized" - alias scoreboard_columns_set "" // aliased later - alias scoreboard_columns_help "cl_cmd scoreboard_columns_help $*" - alias _gl_flashblend_update_00 "gl_flashblend 1" alias _gl_flashblend_update_10 "gl_flashblend 0" alias _gl_flashblend_update_01 "gl_flashblend 0" @@@ -1678,13 -1439,10 +1439,10 @@@ set cl_handicap 1 "the higher, the mor seta cl_clippedspectating 1 "movement collision for spectators so that you can't pass through walls and such. (client setting) NOTE: reconnect or use sendcvar command to update the choice." - seta cl_autoscreenshot 0 "client option to automatically take a screenshot once the map has ended (see also sv_autoscreenshot)" + seta cl_autoscreenshot 1 "Take a screenshot upon the end of a match... 0 = Disable completely, 1 = Allow sv_autoscreenshot to take a screenshot when requested, 2 = Always take an autoscreenshot anyway." // must be at the bottom of this file: // alias for switching the teamselect menu - alias menu_showteamselect "menu_cmd directmenu TeamSelect" - alias menu_showhudexit "menu_cmd directmenu HUDExit" - alias menu_showhudoptions "menu_cmd directpanelhudmenu $*" bind f5 menu_showteamselect set g_bugrigs 0 @@@ -1717,10 -1475,6 +1475,6 @@@ set g_ban_sync_trusted_servers_verify set g_showweaponspawns 1 "display sprites for weapon spawns found on the map when a weapon key is pressed and the weapon is not available" - alias records "cmd records" - alias rankings "cmd rankings" - alias ladder "cmd ladder" - // ballistics use physical units, but qu based // Quake-Newton: 1 qN = 1 qu * 1 g / 1 s^2 // Quake-Joule: 1 qJ = 1 qN * 1 qu @@@ -1797,13 -1551,6 +1551,6 @@@ set cl_effects_lightningarc_branchfacto set g_hitplots 0 "when set to 1, hitplots are stored by the server to provide a means of proving that a triggerbot was used" seta g_hitplots_individuals "" "the individuals, by IP, that should have their hitplots recorded" - alias g_hitplots_add "qc_cmd rpn /g_hitplots_individuals g_hitplots_individuals $1 union def" - alias g_hitplots_remove "qc_cmd rpn /g_hitplots_individuals g_hitplots_individuals $1 difference def" - - alias mute "prvm_edictset server $1 muted 1" // I am lazy and not making an actual command of this - alias unmute "prvm_edictset server $1 muted 0" // dito - - rcon_secure 1 set menu_updatecheck 1 @@@ -1920,8 -1667,13 +1667,13 @@@ set waypoint_benchmark 0 "quit after wa set g_debug_bot_commands 0 "print scripted bot commands before executing" set g_debug_defaultsounds 0 "always use default sounds" set sv_use_csqc_players 1 "set to 0 to disable CSQC players for better Xonotic 0.5 compat" - set cl_forceplayermodels 0 "set to 1 to make everyone look like yourself (requires server to have sv_use_csqc_players 1)" set cl_precacheplayermodels 0 "TODO please check if this needs to be 1 or if precaching a model the server already requested is fast enough to do it at runtime" + seta cl_forceplayermodels 0 "make everyone look like your own model (requires server to have sv_use_csqc_players 1 and sv_defaultcharacter 0)" + seta cl_forceplayercolors 0 "make everyone look like your own color (requires server to have sv_use_csqc_players 1 and sv_defaultcharacter 0, and is ignored in teamplay)" + seta cl_forcemyplayermodel "" "set to the model file name you want to show yourself as (requires server to have sv_use_csqc_players 1; does not affect how enemies look with cl_forceplayermodels)" + seta cl_forcemyplayerskin 0 "set to the skin number you want to show yourself as (requires server to have sv_use_csqc_players 1; does not affect how enemies look with cl_forceplayermodels)" + seta cl_forcemyplayercolors 0 "set to the color value (encoding is same as _cl_color) for your own player model (requires server to have sv_use_csqc_players 1, and is ignored in teamplay; does not affect how enemies look with cl_forceplayermodels)" + seta cl_movement_errorcompensation 1 "try to compensate for prediction errors and reduce preceived lag (requires server to have sv_use_csqc_players 1)" // debug cvars for keyhunt attaching set _angles "0 0 0" @@@ -2101,6 -1853,9 +1853,9 @@@ set g_weapon_charge_colormod_blue_full set g_playerstats_uri "" set g_playerstats_debug 0 "when 1, player stats are dumped to the console too" + // autoscreenshots + set g_max_info_autoscreenshot 3 "how many info_autoscreenshot entities are allowed" + // session locking locksession 1 @@@ -2139,6 -1894,10 +1894,10 @@@ exec effects-normal.cf exec physicsX.cfg exec turrets.cfg exec vehicles.cfg + exec crosshairs.cfg + + // load console command aliases and settings + exec commands.cfg // hud cvar descriptions and common settings exec _hud_common.cfg @@@ -2147,6 -1906,12 +1906,12 @@@ exec _hud_descriptions.cf // please add any new cvars into the hud_save script in qcsrc/client/hud_config.qc for consistency exec hud_luminos.cfg + + // ... and now that everything is configured/aliased, we can do some things: + + // Change g_start_delay based upon if the server is local or not. + if_client set g_start_delay 0 "delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server" + if_dedicated set g_start_delay 15 "delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server" + // enable menu syncing alias menu_sync "menu_cmd sync" - alias scoreboard_columns_set "cl_cmd scoreboard_columns_set $*"