X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=defaultXonotic.cfg;h=f591fe31f9684d86facd08f53bc8ce49a8afc195;hp=d3af957bbb9cc8c0b36d7b21a39d9f5387be7182;hb=dea2de58c3a611169038e13369a0d38321b7f64b;hpb=ee6e2d1de97777a4fdfdb750f412a12dce2178d7 diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index d3af957bb..f591fe31f 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -25,6 +25,9 @@ gameversion_max 65535 // git builds see all versions // server about changes) alias setreport "set \"$1\" \"$2\" ; sendcvar \"$1\"" +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" "" @@ -100,8 +103,7 @@ seta crosshair_dot_color "1 0 0" "when != 0, use custom color for the crosshair seta crosshair_pickup 0.25 seta crosshair_pickup_speed 4 seta crosshair_per_weapon 0 "when 1, each gun will display a different crosshair" -seta crosshair_color_override 0 "when 1, crosshair_color_* overrides the per-weapon color" -seta crosshair_color_per_weapon 1 "when 1, each gun will display a different colored 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" @@ -264,6 +266,14 @@ gl_polyblend 0 // whether to use screen tints, this has now been replaced by a b r_motionblur 0 // motion blur value, default is 0 r_damageblur 0 // motion blur when damaged, default is 0 +r_bloom_blur 8 +r_bloom_brighten 3 +r_bloom_colorexponent 1 +r_bloom_colorscale 1 +r_bloom_colorsubtract 0.25 +r_bloom_resolution 320 +r_hdr_range 4 + seta vid_x11_display "" "xonotic-linux-*.sh will use this to start xonotic on an other/new X display" // This can have three possible settings: // "" run as usual @@ -427,9 +437,9 @@ set bot_ai_keyboard_treshold 0.57 set bot_ai_aimskill_offset 0.3 "Amount of error induced to the bots aim" set bot_ai_aimskill_think 1 "Aiming velocity. Use values below 1 for slower aiming" set bot_ai_custom_weapon_priority_distances "300 850" "Define close and far distances in any order. Based on the distance to the enemy bots will choose different weapons" -set bot_ai_custom_weapon_priority_far "minstanex nex campingrifle rocketlauncher minelayer grenadelauncher electro hagar hlac crylink laser uzi fireball seeker shotgun tuba" "Desired weapons for far distances ordered by priority" -set bot_ai_custom_weapon_priority_mid "minstanex rocketlauncher nex fireball seeker minelayer grenadelauncher electro uzi campingrifle crylink hlac hagar shotgun laser tuba" "Desired weapons for middle distances ordered by priority" -set bot_ai_custom_weapon_priority_close "minstanex nex uzi hlac tuba seeker hagar crylink minelayer grenadelauncher shotgun electro campingrifle rocketlauncher laser fireball" "Desired weapons for close distances ordered by priority" +set bot_ai_custom_weapon_priority_far "minstanex nex campingrifle electro rocketlauncher grenadelauncher hagar hlac crylink laser uzi fireball seeker shotgun tuba minelayer" "Desired weapons for far distances ordered by priority" +set bot_ai_custom_weapon_priority_mid "minstanex rocketlauncher nex fireball seeker grenadelauncher electro uzi campingrifle crylink hlac hagar shotgun laser tuba minelayer" "Desired weapons for middle distances ordered by priority" +set bot_ai_custom_weapon_priority_close "minstanex shotgun nex uzi hlac tuba seeker hagar crylink grenadelauncher electro campingrifle rocketlauncher laser fireball minelayer" "Desired weapons for close distances ordered by priority" set bot_ai_weapon_combo 1 "Enable bots to do weapon combos" set bot_ai_weapon_combo_threshold 0.3 "Try to make a combo N seconds after the last attack" set bot_ai_friends_aware_pickup_radius "500" "Bots will not pickup items if a team mate is this distance near the item" @@ -629,7 +639,7 @@ seta timelimit_suddendeath 5 "number of minutes suddendeath mode lasts after all // common team values set g_tdm 0 "Team Deathmatch: the team who kills their opponents most often wins" -seta teamplay_default 4 "default teamplay setting in team games. 1 = no friendly fire, self damage. 2 = friendly fire and self damage enabled. 3 = no friendly fire, but self damage enabled. 4 = obey the following four cvars" +seta teamplay_mode 4 "default teamplay setting in team games. 1 = no friendly fire, self damage. 2 = friendly fire and self damage enabled. 3 = no friendly fire, but self damage enabled. 4 = obey the following four cvars" seta g_mirrordamage 0.300000 "for teamplay 4: mirror damage factor" seta g_friendlyfire 0.100000 "for teamplay 4: fiendly fire factor" seta g_teamdamage_threshold 50 "for teamplay 4: threshold over which to apply mirror damage" @@ -1904,9 +1914,6 @@ collision_endposnudge 1 set cl_lerpanim_maxdelta_framegroups 0.05 // must be faster than fastest weapon refire set cl_lerpanim_maxdelta_server 0.1 // must be slower than slowest server controlled anim (e.g. animinfo stuff) -// player ID -seta _cl_userid "" "player ID (e.g. for tournaments)" - // FIXME workaround for engine bug sv_gameplayfix_nudgeoutofsolid 0 // to div0: remove this once 5b7ac1706712977bbc0297d2d53294e73574c7cd (svn r9537) is in the stable branch of the engine again @@ -2042,9 +2049,21 @@ set g_forced_team_yellow "" "list of player IDs for yellow team" set g_forced_team_pink "" "list of player IDs for pink team" set g_forced_team_otherwise "default" "action if a non listed player joins (can be default for default action, spectate for forcing to spectate, or red, blue, yellow, pink)" +// random charge stuff :P +set g_weapon_charge_colormod_hdrmultiplier 4 "how much to multiply the colors by in the colormod vector" +set g_weapon_charge_colormod_red_half 0 +set g_weapon_charge_colormod_green_half 0.5 +set g_weapon_charge_colormod_blue_half 1 +set g_weapon_charge_colormod_red_full 1 +set g_weapon_charge_colormod_green_full -0.5 +set g_weapon_charge_colormod_blue_full -1 + // player statistics server URI set g_playerstats_uri "" +// create this cvar in case the engine did not +set snd_soundradius 1200 + // other config files exec balanceXonotic.cfg exec ctfscoring-ai.cfg @@ -2057,11 +2076,3 @@ exec _hud_descriptions.cfg // exec the default skin config // please add any new cvars into the hud_save script in qcsrc/client/hud.qc for consistency exec hud_luminos.cfg - -set g_weapon_charge_colormod_hdrmultiplier 4 "how much to multiply the colors by in the colormod vector" -set g_weapon_charge_colormod_red_half 0 -set g_weapon_charge_colormod_green_half 0.5 -set g_weapon_charge_colormod_blue_half 1 -set g_weapon_charge_colormod_red_full 1 -set g_weapon_charge_colormod_green_full -0.5 -set g_weapon_charge_colormod_blue_full -1