[nexuiz-commits] r7015 - in trunk/data: . qcsrc/menu/nexuiz qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Jun 12 15:22:33 EDT 2009
Author: div0
Date: 2009-06-12 15:22:33 -0400 (Fri, 12 Jun 2009)
New Revision: 7015
Modified:
trunk/data/defaultNexuiz.cfg
trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c
trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_advanced.c
trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c
trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c
trunk/data/qcsrc/server/constants.qh
trunk/data/weapons.cfg
trunk/data/weaponsHavoc.cfg
Log:
menu cleanups
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2009-06-12 19:17:24 UTC (rev 7014)
+++ trunk/data/defaultNexuiz.cfg 2009-06-12 19:22:33 UTC (rev 7015)
@@ -406,7 +406,8 @@
locs_enable 0
pausable 0
-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)"
+seta g_spawnshieldtime 0 "number of seconds you are invincible after you spawned, this shield is lost after you fire"
+seta 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_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_shootfromeye 0 "shots are fired from your eye/crosshair"
set g_shootfromcenter 0 "weapon gets moved to the center, shots still come from the barrel of your weapon"
@@ -430,7 +431,6 @@
set g_laserguided_missile 0 "if set to 1 the rockets of the rocket launcher can be steered using a laserpointer"
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_spawnshieldtime 0 "number of seconds you are invincible after you spawned, this shield is lost after you fire"
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"
@@ -1411,7 +1411,7 @@
set g_maplist_allow_hidden 0 "allow hidden maps to be, e.g., voted for and in the maplist"
-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"
+seta 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
alias ons_map "cl_cmd radar" // legacy alias
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c 2009-06-12 19:17:24 UTC (rev 7014)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c 2009-06-12 19:22:33 UTC (rev 7015)
@@ -102,7 +102,7 @@
me.TD(me, 1, 2, makeNexuizSlider(1, 32, 1, "menu_maxplayers"));
me.TR(me);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Number of bots:"));
- me.TD(me, 1, 2, makeNexuizSlider(0, 7, 1, "bot_number"));
+ me.TD(me, 1, 2, makeNexuizSlider(0, 9, 1, "bot_number"));
me.TR(me);
me.TDempty(me, 0.2);
me.TD(me, 1, 0.8, e = makeNexuizTextLabel(0, "Bot skill:"));
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_advanced.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_advanced.c 2009-06-12 19:17:24 UTC (rev 7014)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_advanced.c 2009-06-12 19:22:33 UTC (rev 7015)
@@ -29,16 +29,16 @@
me.TR(me);
me.TDempty(me, 0.2);
me.TD(me, 1, 1.2, e = makeNexuizTextLabel(0, "Spawn shield:"));
- me.TD(me, 1, 1.6, e = makeNexuizSlider(0, 15, 0.5, "g_spawnshieldtime"));
+ me.TD(me, 1, 1.7, e = makeNexuizSlider(0, 15, 0.5, "g_spawnshieldtime"));
me.TR(me);
me.TDempty(me, 0.2);
me.TD(me, 1, 1.2, e = makeNexuizTextLabel(0, "Start delay:"));
- me.TD(me, 1, 1.6, e = makeNexuizSlider(0, 30, 0.5, "g_start_delay"));
+ me.TD(me, 1, 1.7, e = makeNexuizSlider(0, 30, 0.5, "g_start_delay"));
me.TR(me);
me.TR(me);
me.TDempty(me, 0.2);
me.TD(me, 1, 1.2, e = makeNexuizTextLabel(0, "Game speed:"));
- me.TD(me, 1, 1.6, e = makeNexuizSlider(0.5, 2.0, 0.1, "slowmo"));
+ me.TD(me, 1, 1.7, e = makeNexuizSlider(0.5, 2.0, 0.1, "slowmo"));
me.TR(me);
me.TDempty(me, 0.2);
me.TD(me, 1, 1.2, e = makeNexuizCheckBoxEx(2, 0, "g_antilag", "AntiLag"));
@@ -48,11 +48,11 @@
me.TR(me);
me.TDempty(me, 0.2);
me.TD(me, 1, 1.2, e = makeNexuizTextLabel(0, "Friendly fire scale:"));
- me.TD(me, 1, 1.6, e = makeNexuizSlider(0, 1.0, 0.05, "g_friendlyfire"));
+ me.TD(me, 1, 1.7, e = makeNexuizSlider(0, 1.0, 0.05, "g_friendlyfire"));
me.TR(me);
me.TDempty(me, 0.2);
me.TD(me, 1, 1.2, e = makeNexuizTextLabel(0, "Mirror damage:"));
- me.TD(me, 1, 1.6, e = makeNexuizSlider(0, 1.0, 0.05, "g_mirrordamage"));
+ me.TD(me, 1, 1.7, e = makeNexuizSlider(0, 1.0, 0.05, "g_mirrordamage"));
me.gotoRC(me, me.rows - 1, 0);
me.TD(me, 1, me.columns, e = makeNexuizButton("OK", '0 0 0'));
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c 2009-06-12 19:17:24 UTC (rev 7014)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c 2009-06-12 19:22:33 UTC (rev 7015)
@@ -6,7 +6,7 @@
METHOD(NexuizMutatorsDialog, close, void(entity))
ATTRIB(NexuizMutatorsDialog, title, string, "Mutators")
ATTRIB(NexuizMutatorsDialog, color, vector, SKINCOLOR_DIALOG_MUTATORS)
- ATTRIB(NexuizMutatorsDialog, intendedWidth, float, 0.8)
+ ATTRIB(NexuizMutatorsDialog, intendedWidth, float, 0.9)
ATTRIB(NexuizMutatorsDialog, rows, float, 17)
ATTRIB(NexuizMutatorsDialog, columns, float, 6)
ATTRIB(NexuizMutatorsDialog, refilterEntity, entity, NULL)
@@ -161,47 +161,59 @@
me.TR(me);
me.TD(me, 1, 2, makeNexuizTextLabel(0, "Gameplay mutators:"));
me.TR(me);
+ me.TDempty(me, 0.2);
me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_cloaked", "Cloaked"));
me.TR(me);
+ me.TDempty(me, 0.2);
me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_footsteps", "Footsteps"));
me.TR(me);
+ me.TDempty(me, 0.2);
me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_midair", "Midair"));
me.TR(me);
+ me.TDempty(me, 0.2);
me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_vampire", "Vampire"));
me.TR(me);
+ me.TDempty(me, 0.2);
s = makeNexuizSlider(10, 50, 1, "g_bloodloss");
me.TD(me, 1, 2, e = makeNexuizSliderCheckBox(0, 1, s, "Blood loss"));
me.TR(me);
- me.TDempty(me, 0.2);
+ me.TDempty(me, 0.4);
me.TD(me, 1, 1.8, s);
me.TR(me);
+ me.TDempty(me, 0.2);
s = makeNexuizSlider(80, 400, 8, "sv_gravity");
s.valueDigits = 0;
s.valueDisplayMultiplier = 0.125; // show gravity in percent
me.TD(me, 1, 2, e = makeNexuizSliderCheckBox(800, 1, s, "Low gravity"));
e.savedValue = 200; // good on silvercity
me.TR(me);
- me.TDempty(me, 0.2);
+ me.TDempty(me, 0.4);
me.TD(me, 1, 1.8, s);
me.TR(me);
me.TR(me);
me.TD(me, 1, 2, makeNexuizTextLabel(0, "Weapon & item mutators:"));
me.TR(me);
+ me.TDempty(me, 0.2);
me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_grappling_hook", "Grappling hook"));
me.TR(me);
+ me.TDempty(me, 0.2);
me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_jetpack", "Jet pack"));
me.TR(me);
+ me.TDempty(me, 0.2);
me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_laserguided_missile", "Laser guided missiles"));
me.TR(me);
+ me.TDempty(me, 0.2);
me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_pinata", "Pinata"));
me.TR(me);
+ me.TDempty(me, 0.2);
me.TD(me, 1, 2, e = makeNexuizCheckBoxEx(2, 0, "g_weapon_stay", "Weapons stay"));
me.TR(me);
me.gotoRC(me, 0, 2); me.setFirstColumn(me, me.currentColumn);
me.TD(me, 1, 4, makeNexuizTextLabel(0, "Weapon arenas:"));
me.TR(me);
- me.TD(me, 1, 4, e = makeNexuizRadioButton(1, string_null, string_null, "Regular (no arena)"));
+ me.TDempty(me, 0.2);
+ me.TD(me, 1, 2, e = makeNexuizRadioButton(1, string_null, string_null, "Regular (no arena)"));
for(i = WEP_FIRST, j = 0; i <= WEP_LAST; ++i)
{
w = get_weaponinfo(i);
@@ -211,6 +223,7 @@
me.TR(me);
str = w.netname;
hstr = w.message;
+ me.TDempty(me, 0.2);
me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "g_weaponarena", strzone(str), strzone(hstr)));
e.cvarOffValue = "0";
// custom load/save logic that ignores a " laser" suffix, or adds it
@@ -221,7 +234,7 @@
}
me.TR(me);
me.TDempty(me, 0.2);
- me.TD(me, 1, 3.8, e = makeNexuizCheckBox(0, "menu_weaponarena_with_laser", "with laser"));
+ me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "menu_weaponarena_with_laser", "with laser"));
// hook the draw function to gray it out
e.draw_weaponarena = e.draw;
e.draw = preDrawLaserWeaponArenaLaserButton;
@@ -231,15 +244,18 @@
me.TR(me);
me.TD(me, 1, 4, makeNexuizTextLabel(0, "Special arenas:"));
me.TR(me);
- me.TD(me, 1, 4, e = makeNexuizRadioButton(1, "g_minstagib", string_null, "MinstaGib"));
+ me.TDempty(me, 0.2);
+ me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "g_minstagib", string_null, "MinstaGib"));
me.TR(me);
- me.TD(me, 1, 4, e = makeNexuizRadioButton(1, "g_nixnex", string_null, "NixNex"));
+ me.TDempty(me, 0.2);
+ me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "g_nixnex", string_null, "NixNex"));
me.TR(me);
- me.TDempty(me, 0.2);
- me.TD(me, 1, 3.8, e = makeNexuizCheckBox(0, "g_nixnex_with_laser", "with laser"));
+ me.TDempty(me, 0.4);
+ me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "g_nixnex_with_laser", "with laser"));
setDependent(e, "g_nixnex", 1, 1);
me.TR(me);
- me.TD(me, 1, 4, e = makeNexuizRadioButton(1, "g_weaponarena", "most", "Most weapons"));
+ me.TDempty(me, 0.2);
+ me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "g_weaponarena", "most", "Most weapons"));
e.cvarOffValue = "0";
me.gotoRC(me, me.rows - 1, 0);
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c 2009-06-12 19:17:24 UTC (rev 7014)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c 2009-06-12 19:22:33 UTC (rev 7015)
@@ -105,9 +105,8 @@
e0.allowCut = 1;
me.TR(me);
me.TR(me);
- me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "crosshair_per_weapon", "Per weapon crosshairs"));
- me.TR(me);
- me.TD(me, 1, 3, e = makeNexuizCheckBox(1, "crosshair_color_override", "Per weapon crosshair colors"));
+ me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "crosshair_per_weapon", "Per weapon crosshairs"));
+ me.TD(me, 1, 1.3, e = makeNexuizCheckBox(1, "crosshair_color_override", "& crosshair colors"));
setDependent(e, "crosshair_per_weapon", 1, 1);
me.TR(me);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Crosshair:"));
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c 2009-06-12 19:17:24 UTC (rev 7014)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c 2009-06-12 19:22:33 UTC (rev 7015)
@@ -160,7 +160,8 @@
me.TR(me);
me.TR(me);
- me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "r_coronas", "Coronas"));
+ me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_coronas", "Coronas"));
+ me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "r_coronas_occlusionquery", "Use occlusion queries"));
me.TR(me);
me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_bloom", "Bloom"));
setDependent(e, "r_hdr", 0, 0);
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c 2009-06-12 19:17:24 UTC (rev 7014)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c 2009-06-12 19:22:33 UTC (rev 7015)
@@ -36,9 +36,7 @@
me.TR(me);
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "r_glsl", "Use OpenGL 2.0 shaders (GLSL)"));
me.TR(me);
- me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "r_coronas_occlusionquery", "Use occlusion queries"));
me.TR(me);
- me.TR(me);
me.TD(me, 1, 3, e = makeNexuizTextLabel(0, "Vertex Buffer Objects (VBOs)"));
me.TR(me);
me.TDempty(me, 0.2);
@@ -82,7 +80,7 @@
me.TR(me);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Saturation:"));
setDependent(e, "r_glsl", 1, 1);
- me.TD(me, 1, 2, e = makeNexuizSlider(0.0, 2.0, 0.1, "r_glsl_saturation"));
+ me.TD(me, 1, 2, e = makeNexuizSlider(0.0, 2.0, 0.05, "r_glsl_saturation"));
setDependent(e, "r_glsl", 1, 1);
me.TR(me);
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "v_glslgamma", "Use GLSL to handle color control"));
Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh 2009-06-12 19:17:24 UTC (rev 7014)
+++ trunk/data/qcsrc/server/constants.qh 2009-06-12 19:22:33 UTC (rev 7015)
@@ -1,5 +1,5 @@
string CVAR_CHECK_DEFAULT = "b502bb22b04d637eb4ea0d00cb934ff0";
-string CVAR_CHECK_WEAPONS = "b0200324f7019e035dc04342c43d9628";
+string CVAR_CHECK_WEAPONS = "a365178279d07e089bc8908a51cdd9e6";
float FALSE = 0;
float TRUE = 1;
Modified: trunk/data/weapons.cfg
===================================================================
--- trunk/data/weapons.cfg 2009-06-12 19:17:24 UTC (rev 7014)
+++ trunk/data/weapons.cfg 2009-06-12 19:22:33 UTC (rev 7015)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit weaponsHavoc.cfg too.
-set cvar_check_weapons b0200324f7019e035dc04342c43d9628
+set cvar_check_weapons a365178279d07e089bc8908a51cdd9e6
// NOTE: this only replaces weapons on the map
// use g_start_weapon_* to also replace the on-startup weapons!
Modified: trunk/data/weaponsHavoc.cfg
===================================================================
--- trunk/data/weaponsHavoc.cfg 2009-06-12 19:17:24 UTC (rev 7014)
+++ trunk/data/weaponsHavoc.cfg 2009-06-12 19:22:33 UTC (rev 7015)
@@ -1,4 +1,4 @@
-set cvar_check_weapons b0200324f7019e035dc04342c43d9628
+set cvar_check_weapons a365178279d07e089bc8908a51cdd9e6
// NOTE: this only replaces weapons on the map
// use g_start_weapon_* to also replace the on-startup weapons!
More information about the nexuiz-commits
mailing list