[nexuiz-commits] r7318 - in trunk/data: . qcsrc/menu/nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Aug 4 05:23:31 EDT 2009
Author: div0
Date: 2009-08-04 05:23:31 -0400 (Tue, 04 Aug 2009)
New Revision: 7318
Modified:
trunk/data/defaultNexuiz.cfg
trunk/data/effects-high.cfg
trunk/data/effects-low.cfg
trunk/data/effects-med.cfg
trunk/data/effects-normal.cfg
trunk/data/effects-omg.cfg
trunk/data/effects-ultimate.cfg
trunk/data/effects-ultra.cfg
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/tooltips.db
Log:
menu cleanup; new effects configs by FruitieX, tooltips
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2009-08-04 09:14:58 UTC (rev 7317)
+++ trunk/data/defaultNexuiz.cfg 2009-08-04 09:23:31 UTC (rev 7318)
@@ -234,8 +234,10 @@
cl_bob 0.01 // how much view moves up/down when moving (does not move if cl_bobcycle is 0, but still enables cl_bobmodel), default is 0.02
cl_bobmodel 1 // whether to have gun model move around on screen when moving (only works if cl_bob is not 0), default is 1
cl_rollangle 0 // amount of view tilt when strafing, default is 2.0
-v_kicktime 0 // how long damage kicks of the view last, default is 0.5 seconds
+v_kicktime 0.5 // how long damage kicks of the view last, default is 0.5 seconds
gl_polyblend 1 // whether to use screen tints, default is 1
+r_motionblur 0 // motion blur value, default is 0
+r_damageblur 0 // motion blur when damaged, default is 0
seta vid_x11_display "" "nexuiz-linux-*.sh will use this to start nexuiz on an other/new X display"
// This can have three possible settings:
Modified: trunk/data/effects-high.cfg
===================================================================
--- trunk/data/effects-high.cfg 2009-08-04 09:14:58 UTC (rev 7317)
+++ trunk/data/effects-high.cfg 2009-08-04 09:23:31 UTC (rev 7318)
@@ -1,32 +1,31 @@
cl_decals 1
cl_decals_time 4
-cl_nogibs 0
-cl_particles_quality 1
+cl_particles_quality 0.75
gl_flashblend 0
gl_picmip 0
gl_texture_anisotropy 16
mod_q3bsp_nolightmaps 0
r_bloom 1
r_coronas 1
-r_damageblur 0
+r_damageblur 0.4
r_drawdecals_drawdistance 500
r_drawparticles_drawdistance 2000
r_glsl_deluxemapping 1
-r_glsl_offsetmapping 0
+r_glsl_offsetmapping 1
r_glsl_offsetmapping_reliefmapping 0
r_hdr 0
-r_motionblur 0
+r_motionblur 0.7
r_picmipworld 0
r_shadow_gloss 1
r_shadow_realtime_dlight 1
-r_shadow_realtime_dlight_shadows 1
+r_shadow_realtime_dlight_shadows 0
r_shadow_realtime_world 0
r_shadow_realtime_world_shadows 0
r_shadow_usenormalmap 1
r_showsurfaces 0
-r_subdivisions_tolerance 4
+r_subdivisions_tolerance 3
r_water 1
r_water_resolutionmultiplier 0.5
-vid_samples 1
+vid_samples 2
menu_sync
Modified: trunk/data/effects-low.cfg
===================================================================
--- trunk/data/effects-low.cfg 2009-08-04 09:14:58 UTC (rev 7317)
+++ trunk/data/effects-low.cfg 2009-08-04 09:23:31 UTC (rev 7318)
@@ -1,7 +1,6 @@
cl_decals 1
cl_decals_time 2
-cl_nogibs 0
-cl_particles_quality 0.20
+cl_particles_quality 0.2
gl_flashblend 1
gl_picmip 2
gl_texture_anisotropy 1
Modified: trunk/data/effects-med.cfg
===================================================================
--- trunk/data/effects-med.cfg 2009-08-04 09:14:58 UTC (rev 7317)
+++ trunk/data/effects-med.cfg 2009-08-04 09:23:31 UTC (rev 7318)
@@ -1,10 +1,9 @@
cl_decals 1
cl_decals_time 2
-cl_nogibs 0
cl_particles_quality 0.5
gl_flashblend 0
-gl_picmip 2
-gl_texture_anisotropy 1
+gl_picmip 1
+gl_texture_anisotropy 4
mod_q3bsp_nolightmaps 0
r_bloom 0
r_coronas 1
Modified: trunk/data/effects-normal.cfg
===================================================================
--- trunk/data/effects-normal.cfg 2009-08-04 09:14:58 UTC (rev 7317)
+++ trunk/data/effects-normal.cfg 2009-08-04 09:23:31 UTC (rev 7318)
@@ -1,10 +1,9 @@
cl_decals 1
cl_decals_time 2
-cl_nogibs 0
cl_particles_quality 0.5
gl_flashblend 0
gl_picmip 1
-gl_texture_anisotropy 1
+gl_texture_anisotropy 8
mod_q3bsp_nolightmaps 0
r_bloom 0
r_coronas 1
@@ -24,7 +23,7 @@
r_shadow_realtime_world_shadows 0
r_shadow_usenormalmap 1
r_showsurfaces 0
-r_subdivisions_tolerance 4
+r_subdivisions_tolerance 3
r_water 0
r_water_resolutionmultiplier 0.5
vid_samples 1
Modified: trunk/data/effects-omg.cfg
===================================================================
--- trunk/data/effects-omg.cfg 2009-08-04 09:14:58 UTC (rev 7317)
+++ trunk/data/effects-omg.cfg 2009-08-04 09:23:31 UTC (rev 7318)
@@ -1,7 +1,6 @@
cl_decals 0
cl_decals_time 2
-cl_nogibs 0
-cl_particles_quality 0.20
+cl_particles_quality 0.2
gl_flashblend 1
gl_picmip 1337
gl_texture_anisotropy 1
Modified: trunk/data/effects-ultimate.cfg
===================================================================
--- trunk/data/effects-ultimate.cfg 2009-08-04 09:14:58 UTC (rev 7317)
+++ trunk/data/effects-ultimate.cfg 2009-08-04 09:23:31 UTC (rev 7318)
@@ -1,6 +1,5 @@
cl_decals 1
cl_decals_time 10
-cl_nogibs 0
cl_particles_quality 1
gl_flashblend 0
gl_picmip 0
@@ -14,7 +13,7 @@
r_glsl_deluxemapping 1
r_glsl_offsetmapping 1
r_glsl_offsetmapping_reliefmapping 1
-r_hdr 0
+r_hdr 1
r_motionblur 0.7
r_picmipworld 0
r_shadow_gloss 1
@@ -24,7 +23,7 @@
r_shadow_realtime_world_shadows 1
r_shadow_usenormalmap 1
r_showsurfaces 0
-r_subdivisions_tolerance 2
+r_subdivisions_tolerance 1
r_water 1
r_water_resolutionmultiplier 1
vid_samples 4
Modified: trunk/data/effects-ultra.cfg
===================================================================
--- trunk/data/effects-ultra.cfg 2009-08-04 09:14:58 UTC (rev 7317)
+++ trunk/data/effects-ultra.cfg 2009-08-04 09:23:31 UTC (rev 7318)
@@ -1,6 +1,5 @@
cl_decals 1
cl_decals_time 10
-cl_nogibs 0
cl_particles_quality 1
gl_flashblend 0
gl_picmip 0
@@ -8,14 +7,14 @@
mod_q3bsp_nolightmaps 0
r_bloom 1
r_coronas 1
-r_damageblur 0
+r_damageblur 0.4
r_drawdecals_drawdistance 500
r_drawparticles_drawdistance 2000
r_glsl_deluxemapping 1
-r_glsl_offsetmapping 0
+r_glsl_offsetmapping 1
r_glsl_offsetmapping_reliefmapping 0
r_hdr 0
-r_motionblur 0
+r_motionblur 0.7
r_picmipworld 0
r_shadow_gloss 1
r_shadow_realtime_dlight 1
@@ -24,7 +23,7 @@
r_shadow_realtime_world_shadows 1
r_shadow_usenormalmap 1
r_showsurfaces 0
-r_subdivisions_tolerance 3
+r_subdivisions_tolerance 2
r_water 1
r_water_resolutionmultiplier 0.5
vid_samples 4
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c 2009-08-04 09:14:58 UTC (rev 7317)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c 2009-08-04 09:23:31 UTC (rev 7318)
@@ -84,9 +84,13 @@
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Field of View:"));
me.TD(me, 1, 2, e = makeNexuizSlider(60, 130, 1, "fov"));
me.TR(me);
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Damage kick:"));
+ me.TD(me, 1, 2, e = makeNexuizSlider(0, 0.5, 0.05, "v_kicktime"));
+ me.TR(me);
sl = makeNexuizSlider(0.45, 0.75, 0.01, "cl_bobcycle");
me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(0, 1, sl, "View bobbing:"));
me.TD(me, 1, 2, sl);
+
me.TR(me);
me.TR(me);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Zoom Factor:"));
@@ -96,7 +100,6 @@
me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(-1, 1, sl, "Zoom speed:"));
me.TD(me, 1, 2, sl);
me.TR(me);
- me.TR(me);
me.TD(me, 1, 1.5, e = makeNexuizButton("Weapon settings...", '0 0 0'));
e.onClick = DialogOpenButton_Click;
e.onClickEntity = main.weaponsDialog;
@@ -144,20 +147,30 @@
me.TD(me, 1, 2/3, e = makeNexuizRadioButton(1, "crosshair_hittest", "1", "TrueAim"));
me.TD(me, 1, 2/3, e = makeNexuizRadioButton(1, "crosshair_hittest", "1.25", "Enemies"));
me.TR(me);
- me.TR(me);
me.TDempty(me, 0.4);
me.TD(me, 1, 2.2, e = makeNexuizButton("Radar, HUD & Waypoints...", '0 0 0'));
e.onClick = DialogOpenButton_Click;
e.onClickEntity = main.radarDialog;
me.TDempty(me, 0.5);
me.TR(me);
- me.TR(me);
-#ifdef ALLOW_FORCEMODELS
+ #ifdef ALLOW_FORCEMODELS
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Force Models:"));
me.TD(me, 1, 2/3, e = makeNexuizRadioButton(2, string_null, string_null, "None"));
me.TD(me, 1, 2/3, e = makeNexuizRadioButton(2, "cl_forceplayermodelsfromnexuiz", string_null, "Custom"));
me.TD(me, 1, 2/3, e = makeNexuizRadioButton(2, "cl_forceplayermodels", string_null, "All"));
-#endif
+ #endif
+ me.TR(me);
+ me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_gentle", "Disable gore effects"));
+ me.TR(me);
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Gibs:"));
+ me.TD(me, 1, 2, e = makeNexuizTextSlider("cl_nogibs"));
+ e.addValue(e, "None", "1");
+ e.addValue(e, "Few", "0.75");
+ e.addValue(e, "Many", "0.5");
+ e.addValue(e, "Lots", "0");
+ e.configureNexuizTextSliderValues(e);
+ setDependent(e, "cl_gentle", 0, 0);
+ me.TR(me);
me.gotoRC(me, me.rows - 1, 0);
me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "color -1 -1;name \"$_cl_name\";sendcvar cl_weaponpriority;sendcvar cl_zoomfactor;sendcvar cl_zoomspeed;sendcvar cl_autoswitch;sendcvar cl_shownames;sendcvar cl_forceplayermodelsfromnexuiz;sendcvar cl_forceplayermodels", COMMANDBUTTON_APPLY));
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c 2009-08-04 09:14:58 UTC (rev 7317)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c 2009-08-04 09:23:31 UTC (rev 7318)
@@ -53,6 +53,7 @@
e.addValue(e, "4x", "4");
e.configureNexuizTextSliderValues(e);
me.TR(me);
+ me.TR(me);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Texture quality:"));
me.TD(me, 1, 2, e = makeNexuizTextSlider("gl_picmip"));
if(cvar("developer"))
@@ -84,6 +85,7 @@
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Particle dist.:"));
me.TD(me, 1, 2, e = makeNexuizSlider(500, 2000, 100, "r_drawparticles_drawdistance"));
me.TR(me);
+ me.TR(me);
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_decals", "Decals"));
me.TR(me);
me.TDempty(me, 0.2);
@@ -97,22 +99,7 @@
setDependent(e, "cl_decals", 1, 1);
me.TD(me, 1, 2, e = makeNexuizSlider(1, 20, 1, "cl_decals_time"));
setDependent(e, "cl_decals", 1, 1);
- me.TR(me);
- me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_gentle", "Disable gore effects")); // TODO move this away, this is user preference, and preset .cfg files do not change this
- me.TR(me);
- me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Gibs:"));
- me.TD(me, 1, 2, e = makeNexuizTextSlider("cl_nogibs"));
- e.addValue(e, "None", "1");
- e.addValue(e, "Few", "0.75");
- e.addValue(e, "Many", "0.5");
- e.addValue(e, "Lots", "0");
- e.configureNexuizTextSliderValues(e);
-
- me.TR(me);
- me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Damage kick:"));
- me.TD(me, 1, 2, e = makeNexuizSlider(0, 0.5, 0.05, "v_kicktime")); // TODO move this away, this is user preference, and preset .cfg files do not change this
-
me.gotoRC(me, 2, 3.5); me.setFirstColumn(me, me.currentColumn);
me.TD(me, 1, 2, e = makeNexuizCheckBox(1, "mod_q3bsp_nolightmaps", "Use lightmaps"));
me.TD(me, 1, 1.9, e = makeNexuizCheckBox(0, "r_glsl_deluxemapping", "Deluxe mapping"));
@@ -154,7 +141,6 @@
setDependentOR(e, "r_shadow_realtime_dlight", 1, 1, "r_shadow_realtime_world", 1, 1);
me.TR(me);
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")); // TODO move this away, this is user preference, and preset .cfg files do not change this
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-08-04 09:14:58 UTC (rev 7317)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c 2009-08-04 09:23:31 UTC (rev 7318)
@@ -28,24 +28,29 @@
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Color depth:"));
me.TD(me, 1, 2, e = makeNexuizSlider(16, 32, 16, "vid_bitsperpixel"));
me.TR(me);
+ me.TD(me, 1, 1.5, e = makeNexuizTextLabel(0, "Texture compression"));
+ me.TD(me, 1, 0.5, e = makeNexuizRadioButton(2, "gl_texturecompression", "0", "None"));
+ me.TD(me, 1, 0.5, e = makeNexuizRadioButton(2, "gl_texturecompression", "1", "Fast"));
+ me.TD(me, 1, 0.5, e = makeNexuizRadioButton(2, "gl_texturecompression", "2", "Good"));
+ me.TR(me);
me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "vid_fullscreen", "Full screen"));
- me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "vid_vsync", "Vertical synchronization"));
-
+ me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "vid_vsync", "Vertical Synchronization"));
me.TR(me);
-
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, 2, 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);
me.TD(me, 1, 0.9, e = makeNexuizRadioButton(1, "gl_vbo", "0", "Off"));
- me.TD(me, 1, 2.1, e = makeNexuizRadioButton(1, "gl_vbo", "1", "Vertex and Triangles"));
+ me.TD(me, 1, 2.1, e = makeNexuizRadioButton(1, "gl_vbo", "3", "Vertices, some Tris (compatible)"));
me.TR(me);
me.TDempty(me, 0.2);
- me.TD(me, 1, 0.9, e = makeNexuizRadioButton(1, "gl_vbo", "2", "Vertex only"));
- me.TD(me, 1, 2.1, e = makeNexuizRadioButton(1, "gl_vbo", "3", "Vertex, some Triangles (compatible)"));
+ me.TD(me, 1, 0.9, e = makeNexuizRadioButton(1, "gl_vbo", "2", "Vertices"));
+ me.TD(me, 1, 2.1, e = makeNexuizRadioButton(1, "gl_vbo", "1", "Vertices and Triangles"));
me.TR(me);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Depth first:"));
me.TD(me, 1, 2, e = makeNexuizTextSlider("r_depthfirst"));
@@ -54,12 +59,6 @@
e.addValue(e, "All", "2");
e.configureNexuizTextSliderValues(e);
me.TR(me);
- me.TR(me);
- me.TD(me, 1, 1.5, e = makeNexuizTextLabel(0, "Texture compression"));
- me.TD(me, 1, 0.5, e = makeNexuizRadioButton(2, "gl_texturecompression", "0", "None"));
- me.TD(me, 1, 0.5, e = makeNexuizRadioButton(2, "gl_texturecompression", "1", "Fast"));
- me.TD(me, 1, 0.5, e = makeNexuizRadioButton(2, "gl_texturecompression", "2", "Good"));
- me.TR(me);
if(cvar_type("apple_multithreadedgl") & CVAR_TYPEFLAG_ENGINE)
me.TD(me, 1, 3, e = makeNexuizCheckBox(1, "apple_multithreadedgl", "Disable multithreaded OpenGL"));
me.TR(me);
Modified: trunk/data/tooltips.db
===================================================================
--- trunk/data/tooltips.db 2009-08-04 09:14:58 UTC (rev 7317)
+++ trunk/data/tooltips.db 2009-08-04 09:23:31 UTC (rev 7318)
@@ -117,7 +117,7 @@
\v_glslgamma\Enable use of GLSL to apply gamma correction, note that it might decrease performance by a lot (default: disabled)
\r_ambient\Ambient lighting, if set too high it tends to make light on maps look dull and flat (default: 4)
\r_hdr_scenebrightness\Global rendering brightness (default: 1)
-\vid_samples\Enable 4x antialiasing, which smooths the edges of 3D geometry. Note that it might decrease performance by quite a lot (default: off)
+\vid_samples\Enable antialiasing, which smooths the edges of 3D geometry. Note that it might decrease performance by quite a lot (default: disabled)
\v_flipped\Poor man's left handed mode (default: off)
\NexuizSettingsDialog/Effects\Effect settings
More information about the nexuiz-commits
mailing list