From: terencehill Date: Sun, 4 Jul 2010 23:08:29 +0000 (+0200) Subject: Merge branch 'master' into terencehill/misc_bugfixes X-Git-Tag: xonotic-v0.1.0preview~465^2 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=84f2a6cddce774e25f31050e71992c00a755e171;hp=-c Merge branch 'master' into terencehill/misc_bugfixes --- 84f2a6cddce774e25f31050e71992c00a755e171 diff --combined defaultXonotic.cfg index f5e2b3ed29,307f58fa78..b42917ba07 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@@ -206,6 -206,9 +206,9 @@@ seta crosshair_fireball_color_green 1. seta crosshair_fireball_color_blue 0.2 "crosshair color blue component to display when wielding the fireball" seta crosshair_fireball_color_alpha 1 "crosshair alpha value to display when wielding the fireball" seta crosshair_fireball_size 1 "crosshair size when wielding the fireball" + seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (brakes image proportions)" + seta cl_reticle_item_nex 1 "draw aiming recticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha" + seta cl_reticle_item_normal 1 "draw recticle when zooming with the zoom button, 0 disables and values between 0 and 1 change alpha" fov 90 seta cl_velocityzoom 0 "velocity based zooming of fov, negative values zoom out" seta cl_velocityzoomtime 0.3 "time value for averaging speed values" @@@ -501,7 -504,6 +504,6 @@@ set g_laserguided_missile 0 "if set to set g_midair 0 "if set to 1 you can only apply damage to your opponent while he is airborne" set g_midair_shieldtime 0.3 "number of seconds you are still invincible since you lost contact to the ground" set g_spawnsound 1 "set to 0 if you don't want to hear the spawn sound when a player spawns" - set g_spawnpoints_autodrop 0 "if set to 1, automatically drop spawn point locations if they were placed too high" set g_spawnpoints_auto_move_out_of_solid 0 "if set to 1 you will see a warning if a spawn point was placed inside a solid" set g_forced_respawn 0 "if set to 1 and a player died, that player gets automatically respawned once seconds are over" set g_fullbrightplayers 0 "brightens up player models (note that the color, skin or model of the players does not change!)" @@@ -547,6 -549,7 +549,7 @@@ set sv_dodging_wall_distance_threshold set sv_dodging_sound 1 "if 1 dodging makes a sound. if 0 dodging is silent" set leadlimit 0 + set leadlimit_and_fraglimit 0 "if set, leadlimit is ANDed with fraglimit (otherwise ORed)" // this means that timelimit can be overidden globally and fraglimit can be overidden for each game mode: DM/TDM, Domination, CTF, and Runematch. seta timelimit_override -1 "Time limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" @@@ -910,8 -913,12 +913,12 @@@ 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 +attack2 +button3 - alias -attack2 -button3 + alias +fire +attack + alias -fire -attack + alias +fire2 +button3 + alias -fire2 -button3 + alias +attack2 +button3 // old alias from Nexuiz + alias -attack2 -button3 // old alias name from Nexuiz alias +zoom +button4 alias -zoom -button4 alias +crouch +button5 @@@ -954,8 -961,8 +961,8 @@@ bind 8 "impulse 8 bind 9 "impulse 9" bind 0 "impulse 14" // cycles the superweapons bind q weaplast - bind MOUSE1 +attack - bind MOUSE2 +attack2 + bind MOUSE1 +fire + bind MOUSE2 +fire2 bind MOUSE3 +zoom bind MOUSE4 weaplast bind MOUSE5 +hook @@@ -989,8 -996,8 +996,8 @@@ bind JOY1 "+crouch bind JOY2 "+jump" bind JOY3 "weapprev" bind JOY4 "weapnext" - bind JOY5 "+attack2" - bind JOY6 "+attack" + bind JOY5 "+fire2" + bind JOY6 "+fire" bind JOY7 "+zoom" bind JOY8 "dropweapon" bind JOY9 "menu_showteamselect" @@@ -1368,7 -1375,7 +1375,7 @@@ set timelimit_increment set timelimit_decrement 5 set timelimit_min 5 set timelimit_max 60 -alias extendmatchtime "sv_cmd rpn /timelimit timelimit timelimit_max timelimit timelimit_increment add bound def" +alias extendmatchtime "sv_cmd rpn /timelimit timelimit timelimit_max 0 timelimit when timelimit timelimit_increment add bound def" alias reducematchtime "sv_cmd rpn /timelimit timelimit timelimit_decrement sub timelimit_min timelimit bound def" alias endmatch "timelimit -1" @@@ -1690,6 -1697,7 +1697,7 @@@ alias cl_hook_gamestart_r alias cl_hook_gamestart_nexball alias cl_hook_gamestart_cts alias cl_hook_gameend + alias cl_hook_activeweapon alias _sv_hook_gamestart "set _sv_hook_gametype $1; _sv_hook_gamestart_stage2" alias _sv_hook_gamestart_stage2 "sv_hook_gamestart_all; sv_hook_gamestart_${_sv_hook_gametype}"