[nexuiz-commits] r7302 - in trunk/data: . qcsrc/menu/nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Aug 3 12:44:52 EDT 2009
Author: div0
Date: 2009-08-03 12:44:52 -0400 (Mon, 03 Aug 2009)
New Revision: 7302
Added:
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
Removed:
trunk/data/high.cfg
trunk/data/low.cfg
trunk/data/med.cfg
trunk/data/normal.cfg
trunk/data/omg.cfg
trunk/data/ultimate.cfg
trunk/data/ultra.cfg
Modified:
trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c
Log:
effects configs synced to menu again
Added: trunk/data/effects-high.cfg
===================================================================
--- trunk/data/effects-high.cfg (rev 0)
+++ trunk/data/effects-high.cfg 2009-08-03 16:44:52 UTC (rev 7302)
@@ -0,0 +1,32 @@
+cl_decals 1
+cl_decals_time 4
+cl_nogibs 0
+cl_particles_quality 1
+gl_flashblend 0
+gl_picmip 0
+gl_texture_anisotropy 16
+mod_q3bsp_nolightmaps 0
+r_bloom 1
+r_coronas 1
+r_damageblur 0
+r_drawdecals_drawdistance 500
+r_drawparticles_drawdistance 2000
+r_glsl_deluxemapping 1
+r_glsl_offsetmapping 0
+r_glsl_offsetmapping_reliefmapping 0
+r_hdr 0
+r_motionblur 0
+r_picmipworld 0
+r_shadow_gloss 1
+r_shadow_realtime_dlight 1
+r_shadow_realtime_dlight_shadows 1
+r_shadow_realtime_world 0
+r_shadow_realtime_world_shadows 0
+r_shadow_usenormalmap 1
+r_showsurfaces 0
+r_subdivisions_tolerance 4
+r_water 1
+r_water_resolutionmultiplier 0.5
+vid_samples 1
+
+menu_sync
Added: trunk/data/effects-low.cfg
===================================================================
--- trunk/data/effects-low.cfg (rev 0)
+++ trunk/data/effects-low.cfg 2009-08-03 16:44:52 UTC (rev 7302)
@@ -0,0 +1,32 @@
+cl_decals 1
+cl_decals_time 2
+cl_nogibs 0
+cl_particles_quality 0.20
+gl_flashblend 1
+gl_picmip 2
+gl_texture_anisotropy 1
+mod_q3bsp_nolightmaps 1
+r_bloom 0
+r_coronas 1
+r_damageblur 0
+r_drawdecals_drawdistance 200
+r_drawparticles_drawdistance 500
+r_glsl_deluxemapping 0
+r_glsl_offsetmapping 0
+r_glsl_offsetmapping_reliefmapping 0
+r_hdr 0
+r_motionblur 0
+r_picmipworld 1
+r_shadow_gloss 0
+r_shadow_realtime_dlight 0
+r_shadow_realtime_dlight_shadows 0
+r_shadow_realtime_world 0
+r_shadow_realtime_world_shadows 0
+r_shadow_usenormalmap 0
+r_showsurfaces 0
+r_subdivisions_tolerance 8
+r_water 0
+r_water_resolutionmultiplier 0.5
+vid_samples 1
+
+menu_sync
Added: trunk/data/effects-med.cfg
===================================================================
--- trunk/data/effects-med.cfg (rev 0)
+++ trunk/data/effects-med.cfg 2009-08-03 16:44:52 UTC (rev 7302)
@@ -0,0 +1,32 @@
+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
+mod_q3bsp_nolightmaps 0
+r_bloom 0
+r_coronas 1
+r_damageblur 0
+r_drawdecals_drawdistance 300
+r_drawparticles_drawdistance 1000
+r_glsl_deluxemapping 0
+r_glsl_offsetmapping 0
+r_glsl_offsetmapping_reliefmapping 0
+r_hdr 0
+r_motionblur 0
+r_picmipworld 0
+r_shadow_gloss 0
+r_shadow_realtime_dlight 1
+r_shadow_realtime_dlight_shadows 0
+r_shadow_realtime_world 0
+r_shadow_realtime_world_shadows 0
+r_shadow_usenormalmap 0
+r_showsurfaces 0
+r_subdivisions_tolerance 4
+r_water 0
+r_water_resolutionmultiplier 0.5
+vid_samples 1
+
+menu_sync
Added: trunk/data/effects-normal.cfg
===================================================================
--- trunk/data/effects-normal.cfg (rev 0)
+++ trunk/data/effects-normal.cfg 2009-08-03 16:44:52 UTC (rev 7302)
@@ -0,0 +1,32 @@
+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
+mod_q3bsp_nolightmaps 0
+r_bloom 0
+r_coronas 1
+r_damageblur 0
+r_drawdecals_drawdistance 300
+r_drawparticles_drawdistance 1000
+r_glsl_deluxemapping 1
+r_glsl_offsetmapping 0
+r_glsl_offsetmapping_reliefmapping 0
+r_hdr 0
+r_motionblur 0
+r_picmipworld 0
+r_shadow_gloss 1
+r_shadow_realtime_dlight 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_water 0
+r_water_resolutionmultiplier 0.5
+vid_samples 1
+
+menu_sync
Added: trunk/data/effects-omg.cfg
===================================================================
--- trunk/data/effects-omg.cfg (rev 0)
+++ trunk/data/effects-omg.cfg 2009-08-03 16:44:52 UTC (rev 7302)
@@ -0,0 +1,32 @@
+cl_decals 0
+cl_decals_time 2
+cl_nogibs 0
+cl_particles_quality 0.20
+gl_flashblend 1
+gl_picmip 1337
+gl_texture_anisotropy 1
+mod_q3bsp_nolightmaps 1
+r_bloom 0
+r_coronas 1
+r_damageblur 0
+r_drawdecals_drawdistance 100
+r_drawparticles_drawdistance 250
+r_glsl_deluxemapping 0
+r_glsl_offsetmapping 0
+r_glsl_offsetmapping_reliefmapping 0
+r_hdr 0
+r_motionblur 0
+r_picmipworld 1
+r_shadow_gloss 0
+r_shadow_realtime_dlight 0
+r_shadow_realtime_dlight_shadows 0
+r_shadow_realtime_world 0
+r_shadow_realtime_world_shadows 0
+r_shadow_usenormalmap 0
+r_showsurfaces 3
+r_subdivisions_tolerance 16
+r_water 0
+r_water_resolutionmultiplier 0.5
+vid_samples 1
+
+menu_sync
Added: trunk/data/effects-ultimate.cfg
===================================================================
--- trunk/data/effects-ultimate.cfg (rev 0)
+++ trunk/data/effects-ultimate.cfg 2009-08-03 16:44:52 UTC (rev 7302)
@@ -0,0 +1,32 @@
+cl_decals 1
+cl_decals_time 10
+cl_nogibs 0
+cl_particles_quality 1
+gl_flashblend 0
+gl_picmip 0
+gl_texture_anisotropy 16
+mod_q3bsp_nolightmaps 0
+r_bloom 1
+r_coronas 1
+r_damageblur 0.4
+r_drawdecals_drawdistance 500
+r_drawparticles_drawdistance 2000
+r_glsl_deluxemapping 1
+r_glsl_offsetmapping 1
+r_glsl_offsetmapping_reliefmapping 1
+r_hdr 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_world 1
+r_shadow_realtime_world_shadows 1
+r_shadow_usenormalmap 1
+r_showsurfaces 0
+r_subdivisions_tolerance 2
+r_water 1
+r_water_resolutionmultiplier 1
+vid_samples 4
+
+menu_sync
Added: trunk/data/effects-ultra.cfg
===================================================================
--- trunk/data/effects-ultra.cfg (rev 0)
+++ trunk/data/effects-ultra.cfg 2009-08-03 16:44:52 UTC (rev 7302)
@@ -0,0 +1,32 @@
+cl_decals 1
+cl_decals_time 10
+cl_nogibs 0
+cl_particles_quality 1
+gl_flashblend 0
+gl_picmip 0
+gl_texture_anisotropy 16
+mod_q3bsp_nolightmaps 0
+r_bloom 1
+r_coronas 1
+r_damageblur 0
+r_drawdecals_drawdistance 500
+r_drawparticles_drawdistance 2000
+r_glsl_deluxemapping 1
+r_glsl_offsetmapping 0
+r_glsl_offsetmapping_reliefmapping 0
+r_hdr 0
+r_motionblur 0
+r_picmipworld 0
+r_shadow_gloss 1
+r_shadow_realtime_dlight 1
+r_shadow_realtime_dlight_shadows 1
+r_shadow_realtime_world 1
+r_shadow_realtime_world_shadows 1
+r_shadow_usenormalmap 1
+r_showsurfaces 0
+r_subdivisions_tolerance 3
+r_water 1
+r_water_resolutionmultiplier 0.5
+vid_samples 4
+
+menu_sync
Deleted: trunk/data/high.cfg
===================================================================
--- trunk/data/high.cfg 2009-08-03 16:26:28 UTC (rev 7301)
+++ trunk/data/high.cfg 2009-08-03 16:44:52 UTC (rev 7302)
@@ -1,31 +0,0 @@
-cl_decals 1
-cl_decals_time 4
-cl_nogibs 0
-cl_particles_quality 1
-gl_picmip 0
-gl_flashblend 0
-r_picmipworld 0
-gl_texture_anisotropy 16
-mod_q3bsp_nolightmaps 0
-r_bloom 1
-r_coronas 1
-r_glsl_deluxemapping 1
-r_glsl_offsetmapping 0
-r_glsl_offsetmapping_reliefmapping 0
-r_hdr 0
-r_shadow_usenormalmap 1
-r_shadow_gloss 1
-r_shadow_realtime_dlight 1
-r_shadow_realtime_dlight_shadows 1
-r_shadow_realtime_world 0
-r_shadow_realtime_world_shadows 0
-r_depthfirst 1
-r_showsurfaces 0
-r_water 1
-r_water_resolutionmultiplier 0.5
-r_drawparticles_drawdistance 2000
-r_drawdecals_drawdistance 500
-r_subdivisions_tolerance 4
-vid_samples 1
-
-menu_sync
Deleted: trunk/data/low.cfg
===================================================================
--- trunk/data/low.cfg 2009-08-03 16:26:28 UTC (rev 7301)
+++ trunk/data/low.cfg 2009-08-03 16:44:52 UTC (rev 7302)
@@ -1,31 +0,0 @@
-cl_decals 1
-cl_decals_time 2
-cl_nogibs 0
-cl_particles_quality 0.20
-gl_flashblend 1
-gl_picmip 2
-r_picmipworld 1
-gl_texture_anisotropy 1
-mod_q3bsp_nolightmaps 1
-r_bloom 0
-r_coronas 1
-r_glsl_deluxemapping 0
-r_glsl_offsetmapping 0
-r_glsl_offsetmapping_reliefmapping 0
-r_hdr 0
-r_shadow_usenormalmap 0
-r_shadow_gloss 0
-r_shadow_realtime_dlight 0
-r_shadow_realtime_dlight_shadows 0
-r_shadow_realtime_world 0
-r_shadow_realtime_world_shadows 0
-r_depthfirst 0
-r_showsurfaces 0
-r_water 0
-r_water_resolutionmultiplier 0.5
-r_drawparticles_drawdistance 500
-r_drawdecals_drawdistance 200
-r_subdivisions_tolerance 8
-vid_samples 1
-
-menu_sync
Deleted: trunk/data/med.cfg
===================================================================
--- trunk/data/med.cfg 2009-08-03 16:26:28 UTC (rev 7301)
+++ trunk/data/med.cfg 2009-08-03 16:44:52 UTC (rev 7302)
@@ -1,31 +0,0 @@
-cl_decals 1
-cl_decals_time 2
-cl_nogibs 0
-cl_particles_quality 0.5
-gl_picmip 2
-gl_flashblend 0
-r_picmipworld 0
-gl_texture_anisotropy 1
-mod_q3bsp_nolightmaps 0
-r_bloom 0
-r_coronas 1
-r_glsl_deluxemapping 0
-r_glsl_offsetmapping 0
-r_glsl_offsetmapping_reliefmapping 0
-r_hdr 0
-r_shadow_usenormalmap 0
-r_shadow_gloss 0
-r_shadow_realtime_dlight 1
-r_shadow_realtime_dlight_shadows 0
-r_shadow_realtime_world 0
-r_shadow_realtime_world_shadows 0
-r_depthfirst 0
-r_showsurfaces 0
-r_water 0
-r_water_resolutionmultiplier 0.5
-r_drawparticles_drawdistance 1000
-r_drawdecals_drawdistance 300
-r_subdivisions_tolerance 4
-vid_samples 1
-
-menu_sync
Deleted: trunk/data/normal.cfg
===================================================================
--- trunk/data/normal.cfg 2009-08-03 16:26:28 UTC (rev 7301)
+++ trunk/data/normal.cfg 2009-08-03 16:44:52 UTC (rev 7302)
@@ -1,31 +0,0 @@
-cl_decals 1
-cl_decals_time 2
-cl_nogibs 0
-cl_particles_quality 0.5
-gl_picmip 1
-gl_flashblend 0
-r_picmipworld 0
-gl_texture_anisotropy 1
-mod_q3bsp_nolightmaps 0
-r_bloom 0
-r_coronas 1
-r_glsl_deluxemapping 1
-r_glsl_offsetmapping 0
-r_glsl_offsetmapping_reliefmapping 0
-r_hdr 0
-r_shadow_usenormalmap 1
-r_shadow_gloss 1
-r_shadow_realtime_dlight 1
-r_shadow_realtime_dlight_shadows 0
-r_shadow_realtime_world 0
-r_shadow_realtime_world_shadows 0
-r_depthfirst 1
-r_showsurfaces 0
-r_water 0
-r_water_resolutionmultiplier 0.5
-r_drawparticles_drawdistance 1000
-r_drawdecals_drawdistance 300
-r_subdivisions_tolerance 4
-vid_samples 1
-
-menu_sync
Deleted: trunk/data/omg.cfg
===================================================================
--- trunk/data/omg.cfg 2009-08-03 16:26:28 UTC (rev 7301)
+++ trunk/data/omg.cfg 2009-08-03 16:44:52 UTC (rev 7302)
@@ -1,31 +0,0 @@
-cl_decals 0
-cl_decals_time 2
-cl_nogibs 0
-cl_particles_quality 0.20
-gl_flashblend 1
-gl_picmip 1337
-r_picmipworld 1
-gl_texture_anisotropy 1
-mod_q3bsp_nolightmaps 1
-r_bloom 0
-r_coronas 1
-r_glsl_deluxemapping 0
-r_glsl_offsetmapping 0
-r_glsl_offsetmapping_reliefmapping 0
-r_hdr 0
-r_shadow_usenormalmap 0
-r_shadow_gloss 0
-r_shadow_realtime_dlight 0
-r_shadow_realtime_dlight_shadows 0
-r_shadow_realtime_world 0
-r_shadow_realtime_world_shadows 0
-r_depthfirst 0
-r_showsurfaces 1
-r_water 0
-r_water_resolutionmultiplier 0.5
-r_drawparticles_drawdistance 250
-r_drawdecals_drawdistance 100
-r_subdivisions_tolerance 16
-vid_samples 1
-
-menu_sync
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c 2009-08-03 16:26:28 UTC (rev 7301)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c 2009-08-03 16:44:52 UTC (rev 7302)
@@ -46,6 +46,13 @@
e.addValue(e, "Insane", "1");
e.configureNexuizTextSliderValues(e);
me.TR(me);
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Antialiasing:"));
+ me.TD(me, 1, 2, e = makeNexuizTextSlider("vid_samples"));
+ e.addValue(e, "Disabled", "1");
+ e.addValue(e, "2x", "2");
+ e.addValue(e, "4x", "4");
+ e.configureNexuizTextSliderValues(e);
+ 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"))
@@ -61,10 +68,15 @@
me.TD(me, 1, 2.8, e = makeNexuizCheckBox(1, "r_picmipworld", "Reduce model texture quality only"));
setDependent(e, "gl_picmip", 0.5, -0.5);
me.TR(me);
- me.TD(me, 1, 3, e = makeNexuizCheckBox(1, "mod_q3bsp_nolightmaps", "Use lightmaps"));
-
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Anisotropy:"));
+ me.TD(me, 1, 2, e = makeNexuizTextSlider("gl_texture_anisotropy"));
+ e.addValue(e, "Disabled", "1");
+ e.addValue(e, "2x", "2");
+ e.addValue(e, "4x", "4");
+ e.addValue(e, "8x", "8");
+ e.addValue(e, "16x", "16");
+ e.configureNexuizTextSliderValues(e);
me.TR(me);
-
me.TR(me);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Particle quality:"));
me.TD(me, 1, 2, e = makeNexuizSlider(0.1, 1.0, 0.05, "cl_particles_quality"));
@@ -85,10 +97,8 @@
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.TR(me);
- me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_gentle", "Disable gore effects"));
+ 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:"));
@@ -101,26 +111,32 @@
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.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, 1, e = makeNexuizTextLabel(0, "Anisotropy:"));
- me.TD(me, 1, 2, e = makeNexuizTextSlider("gl_texture_anisotropy"));
- e.addValue(e, "1x", "1");
- e.addValue(e, "2x", "2");
- e.addValue(e, "4x", "4");
- e.addValue(e, "8x", "8");
- e.addValue(e, "16x", "16");
+ 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"));
+ setDependentAND(e, "r_glsl", 1, 1, "mod_q3bsp_nolightmaps", 0, 0);
+ me.TD(me, 1, 0.7, e = makeNexuizCheckBox(0, "r_shadow_gloss", "Gloss"));
+ setDependentAND3(e, "r_glsl", 1, 1, "r_glsl_deluxemapping", 1, 2, "mod_q3bsp_nolightmaps", 0, 0);
+ me.TR(me);
+ me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_glsl_offsetmapping", "Offset mapping"));
+ setDependent(e, "r_glsl", 1, 1);
+ me.TD(me, 1, 1.9, e = makeNexuizCheckBox(0, "r_glsl_offsetmapping_reliefmapping", "Relief mapping"));
+ setDependentAND(e, "r_glsl", 1, 1, "r_glsl_offsetmapping", 1, 1);
+ me.TR(me);
+ me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_water", "Reflections:"));
+ setDependent(e, "r_glsl", 1, 1);
+ me.TD(me, 1, 2, e = makeNexuizTextSlider("r_water_resolutionmultiplier"));
+ e.addValue(e, "Blurred", "0.25");
+ e.addValue(e, "Good", "0.5");
+ e.addValue(e, "Sharp", "1");
e.configureNexuizTextSliderValues(e);
+ setDependentAND(e, "r_glsl", 1, 1, "r_water", 1, 1);
me.TR(me);
- me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_glsl_deluxemapping", "Deluxe mapping"));
- setDependentAND(e, "r_glsl", 1, 1, "mod_q3bsp_nolightmaps", 0, 0);
- me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_shadow_gloss", "Gloss"));
- setDependentAND3(e, "r_glsl", 1, 1, "r_glsl_deluxemapping", 1, 2, "mod_q3bsp_nolightmaps", 0, 0);
-
+ if(cvar("developer"))
+ me.TD(me, 1, 3, e = makeNexuizCheckBoxEx(3, 0, "r_showsurfaces", "Show surfaces"));
me.TR(me);
-
- me.TR(me);
me.TD(me, 1, 3, e = makeNexuizRadioButton(1, string_null, string_null, "No dynamic lighting"));
me.TR(me);
me.TD(me, 1, 3, e = makeNexuizRadioButton(1, "gl_flashblend", string_null, "Flash blend approximation"));
@@ -136,38 +152,25 @@
me.TDempty(me, 0.2);
me.TD(me, 1, 2.8, e = makeNexuizCheckBox(0, "r_shadow_usenormalmap", "Use normal maps"));
setDependentOR(e, "r_shadow_realtime_dlight", 1, 1, "r_shadow_realtime_world", 1, 1);
-
me.TR(me);
- if(cvar("developer"))
- me.TD(me, 1, 3, e = makeNexuizCheckBoxEx(3, 0, "r_showsurfaces", "Show surfaces"));
-
+ 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.5, e = makeNexuizCheckBox(0, "r_glsl_offsetmapping", "Offset mapping"));
- setDependent(e, "r_glsl", 1, 1);
- me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_glsl_offsetmapping_reliefmapping", "Relief mapping"));
- setDependentAND(e, "r_glsl", 1, 1, "r_glsl_offsetmapping", 1, 1);
-
+ me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_bloom", "Bloom"));
+ setDependent(e, "r_hdr", 0, 0);
+ me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "r_hdr", "High Dynamic Range (HDR)"));
me.TR(me);
- me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_water", "Reflections:"));
- setDependent(e, "r_glsl", 1, 1);
- me.TD(me, 1, 2, e = makeNexuizTextSlider("r_water_resolutionmultiplier"));
- e.addValue(e, "Blurred", "0.25");
- e.addValue(e, "Good", "0.5");
- e.addValue(e, "Sharp", "1");
- e.configureNexuizTextSliderValues(e);
- setDependentAND(e, "r_glsl", 1, 1, "r_water", 1, 1);
me.TR(me);
-
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Motion blur:"));
+ me.TD(me, 1, 2, e = makeNexuizSlider(0, 1, 0.1, "r_motionblur"));
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"));
- me.TR(me);
- me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_bloom", "Bloom"));
- setDependent(e, "r_hdr", 0, 0);
- me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "r_hdr", "High Dynamic Range (HDR)"));
-
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Damage blur:"));
+ setDependent(e, "r_motionblur", 0, 1);
+ me.TD(me, 1, 2, e = makeNexuizSlider(0, 1, 0.1, "r_damageblur"));
+ setDependent(e, "r_motionblur", 0, 1);
+
me.gotoRC(me, me.rows - 1, 0);
- me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "r_restart", COMMANDBUTTON_APPLY));
+ me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "vid_restart", COMMANDBUTTON_APPLY));
}
#endif
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c 2009-08-03 16:26:28 UTC (rev 7301)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c 2009-08-03 16:44:52 UTC (rev 7302)
@@ -94,9 +94,6 @@
me.TD(me, 1, 2, e = makeNexuizSlider(0.5, 2.0, 0.05, "r_hdr_scenebrightness"));
me.TR(me);
me.TR(me);
- me.TD(me, 1, 3, e = makeNexuizCheckBoxEx(4, 1, "vid_samples", "Use 4x multisampling"));
- me.TR(me);
- me.TR(me);
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "v_flipped", "Left handed mode"));
me.TR(me);
Deleted: trunk/data/ultimate.cfg
===================================================================
--- trunk/data/ultimate.cfg 2009-08-03 16:26:28 UTC (rev 7301)
+++ trunk/data/ultimate.cfg 2009-08-03 16:44:52 UTC (rev 7302)
@@ -1,31 +0,0 @@
-cl_decals 1
-cl_decals_time 10
-cl_nogibs 0
-cl_particles_quality 1
-gl_picmip 0
-gl_flashblend 0
-r_picmipworld 0
-gl_texture_anisotropy 16
-mod_q3bsp_nolightmaps 0
-r_bloom 1
-r_coronas 1
-r_glsl_deluxemapping 1
-r_glsl_offsetmapping 1
-r_glsl_offsetmapping_reliefmapping 1
-r_hdr 0
-r_shadow_usenormalmap 1
-r_shadow_gloss 1
-r_shadow_realtime_dlight 1
-r_shadow_realtime_dlight_shadows 1
-r_shadow_realtime_world 1
-r_shadow_realtime_world_shadows 1
-r_depthfirst 2
-r_showsurfaces 0
-r_water 1
-r_water_resolutionmultiplier 1
-r_drawparticles_drawdistance 2000
-r_drawdecals_drawdistance 500
-r_subdivisions_tolerance 2
-vid_samples 4
-
-menu_sync
Deleted: trunk/data/ultra.cfg
===================================================================
--- trunk/data/ultra.cfg 2009-08-03 16:26:28 UTC (rev 7301)
+++ trunk/data/ultra.cfg 2009-08-03 16:44:52 UTC (rev 7302)
@@ -1,31 +0,0 @@
-cl_decals 1
-cl_decals_time 10
-cl_nogibs 0
-cl_particles_quality 1
-gl_picmip 0
-gl_flashblend 0
-r_picmipworld 0
-gl_texture_anisotropy 16
-mod_q3bsp_nolightmaps 0
-r_bloom 1
-r_coronas 1
-r_glsl_deluxemapping 1
-r_glsl_offsetmapping 0
-r_glsl_offsetmapping_reliefmapping 0
-r_hdr 0
-r_shadow_usenormalmap 1
-r_shadow_gloss 1
-r_shadow_realtime_dlight 1
-r_shadow_realtime_dlight_shadows 1
-r_shadow_realtime_world 1
-r_shadow_realtime_world_shadows 1
-r_depthfirst 1
-r_showsurfaces 0
-r_water 1
-r_water_resolutionmultiplier 0.5
-r_drawparticles_drawdistance 2000
-r_drawdecals_drawdistance 500
-r_subdivisions_tolerance 3
-vid_samples 4
-
-menu_sync
More information about the nexuiz-commits
mailing list