From da1d07a9111b2921aa8f2ad88560a3fb7984db7f Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Thu, 15 Mar 2012 12:59:53 +0200 Subject: [PATCH] Allow r_shadows 2 to be enabled (ambient shadows), and remove soft shadows from the menu since it both looks better and works faster (always enabled now) --- data/defaultVT.cfg | 1 + data/effects-high.cfg | 2 +- data/effects-low.cfg | 2 +- data/effects-med.cfg | 2 +- data/effects-normal.cfg | 2 +- data/effects-omg.cfg | 2 +- data/effects-ultimate.cfg | 2 +- data/effects-ultra.cfg | 2 +- data/qcsrc/menu/voret/dialog_settings_effects.c | 4 ++-- docs/TODO.txt | 14 ++++++-------- 10 files changed, 16 insertions(+), 17 deletions(-) diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg index 5e5580c6..0aeb2bce 100644 --- a/data/defaultVT.cfg +++ b/data/defaultVT.cfg @@ -659,6 +659,7 @@ r_picmipsprites 0 // Voretournament uses sprites that should never be picmipped r_mipsprites 1 r_mipskins 1 r_shadow_realtime_world_lightmaps 1 +r_shadow_shadowmapping 1 seta r_ambient 4 cl_decals_fadetime 1 cl_decals_time 2 diff --git a/data/effects-high.cfg b/data/effects-high.cfg index 0ff80224..6c350486 100644 --- a/data/effects-high.cfg +++ b/data/effects-high.cfg @@ -25,8 +25,8 @@ r_shadow_realtime_dlight 1 r_shadow_realtime_dlight_shadows 0 r_shadow_realtime_world 0 r_shadow_realtime_world_shadows 0 -r_shadow_shadowmapping 0 r_shadow_usenormalmap 1 +r_shadows 0 r_showsurfaces 0 r_subdivisions_tolerance 3 r_water 1 diff --git a/data/effects-low.cfg b/data/effects-low.cfg index 8462e432..cc490865 100644 --- a/data/effects-low.cfg +++ b/data/effects-low.cfg @@ -25,8 +25,8 @@ r_shadow_realtime_dlight 0 r_shadow_realtime_dlight_shadows 0 r_shadow_realtime_world 0 r_shadow_realtime_world_shadows 0 -r_shadow_shadowmapping 0 r_shadow_usenormalmap 0 +r_shadows 0 r_showsurfaces 0 r_subdivisions_tolerance 8 r_water 0 diff --git a/data/effects-med.cfg b/data/effects-med.cfg index 2ce16765..f7209c57 100644 --- a/data/effects-med.cfg +++ b/data/effects-med.cfg @@ -25,8 +25,8 @@ r_shadow_realtime_dlight 1 r_shadow_realtime_dlight_shadows 0 r_shadow_realtime_world 0 r_shadow_realtime_world_shadows 0 -r_shadow_shadowmapping 0 r_shadow_usenormalmap 0 +r_shadows 0 r_showsurfaces 0 r_subdivisions_tolerance 4 r_water 0 diff --git a/data/effects-normal.cfg b/data/effects-normal.cfg index 21040536..887f0e35 100644 --- a/data/effects-normal.cfg +++ b/data/effects-normal.cfg @@ -25,8 +25,8 @@ r_shadow_realtime_dlight 1 r_shadow_realtime_dlight_shadows 0 r_shadow_realtime_world 0 r_shadow_realtime_world_shadows 0 -r_shadow_shadowmapping 0 r_shadow_usenormalmap 1 +r_shadows 0 r_showsurfaces 0 r_subdivisions_tolerance 3 r_water 0 diff --git a/data/effects-omg.cfg b/data/effects-omg.cfg index 119102e9..c256e722 100644 --- a/data/effects-omg.cfg +++ b/data/effects-omg.cfg @@ -25,8 +25,8 @@ r_shadow_realtime_dlight 0 r_shadow_realtime_dlight_shadows 0 r_shadow_realtime_world 0 r_shadow_realtime_world_shadows 0 -r_shadow_shadowmapping 0 r_shadow_usenormalmap 0 +r_shadows 0 r_showsurfaces 3 r_subdivisions_tolerance 16 r_water 0 diff --git a/data/effects-ultimate.cfg b/data/effects-ultimate.cfg index d87f341e..1fe14a83 100644 --- a/data/effects-ultimate.cfg +++ b/data/effects-ultimate.cfg @@ -25,8 +25,8 @@ r_shadow_realtime_dlight 1 r_shadow_realtime_dlight_shadows 1 r_shadow_realtime_world 1 r_shadow_realtime_world_shadows 1 -r_shadow_shadowmapping 1 r_shadow_usenormalmap 1 +r_shadows 2 r_showsurfaces 0 r_subdivisions_tolerance 1 r_water 1 diff --git a/data/effects-ultra.cfg b/data/effects-ultra.cfg index 9e06bd9d..c4879200 100644 --- a/data/effects-ultra.cfg +++ b/data/effects-ultra.cfg @@ -25,8 +25,8 @@ r_shadow_realtime_dlight 1 r_shadow_realtime_dlight_shadows 1 r_shadow_realtime_world 1 r_shadow_realtime_world_shadows 1 -r_shadow_shadowmapping 1 r_shadow_usenormalmap 1 +r_shadows 2 r_showsurfaces 0 r_subdivisions_tolerance 2 r_water 1 diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c index 80d93ce5..38a0466e 100644 --- a/data/qcsrc/menu/voret/dialog_settings_effects.c +++ b/data/qcsrc/menu/voret/dialog_settings_effects.c @@ -138,8 +138,8 @@ void fillVoretEffectsSettingsTab(entity me) me.TDempty(me, 0.2); me.TD(me, 1, 1.8, e = makeVoretCheckBox(0, "r_shadow_usenormalmap", "Use normal maps")); setDependentOR(e, "r_shadow_realtime_dlight", 1, 1, "r_shadow_realtime_world", 1, 1); - me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_shadow_shadowmapping", "Soft shadows")); - setDependentWeird(e, someShadowCvarIsEnabled); + me.TD(me, 1, 1, e = makeVoretCheckBoxEx(2, 0, "r_shadows", "Ambient shadows")); + //setDependentWeird(e, someShadowCvarIsEnabled); me.TR(me); me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_coronas", "Coronas")); me.TDempty(me, 0.2); diff --git a/docs/TODO.txt b/docs/TODO.txt index 08f19a69..ad4bc6b2 100644 --- a/docs/TODO.txt +++ b/docs/TODO.txt @@ -96,8 +96,6 @@ - +0.8: Fix flying spectators not going through teleporters and warpzones. Very hard, since they're FLY_WORLDONLY and can't touch triggers -- 0.7 | 0.8: Enable r_shadows in some way? - - 0.7 | 0.8: HUD icon when stunned. - 0.7 | 0.8: Better portrait images. @@ -130,15 +128,15 @@ - 0.7: Make the insides of the color vixen character glow more -- 0.7 | 0.8: Always play the eating animations when the fire button is down? +- 0.7 | 0.8: Always play the eating animations when the fire button is down? OR play an error sound saying "there is nothing to vore" -- 0.8: Distributed digestion: Account the health of each item when distributing, not only the count +- 0.8: Distributed digestion: Also account the health of each item / player when distributing, not only the count -- 0.7 | 0.8: Rename fire keybinds to difference between weapon attach and vore attack? +- 0.7: Rename fire keybinds to difference between weapon attach and vore attack? - 0.8 BUG: When you get stomach kicked, weapon reloading resets. Is this a bug, or does it actually work better? -- 0.7: Move source branch to mediasource like Xonotic +- 0.7 | 0.8: Move source branch to mediasource like Xonotic - 0.8 BUG: Bots can still senect no weapon when they have the grabber @@ -146,6 +144,6 @@ - +0.8: Maybe turn health items into creatures that run around? -- 0.8: Maybe give a swallow progress to items as well, but by standing on them. +- 0.8: Maybe give a swallow progress to items as well, but by standing on them -- 0.7 | 0.8: Swallow animation when eating items (goes together with the above feature) \ No newline at end of file +- 0.8: Swallow animation when eating items (goes together with the above feature) \ No newline at end of file -- 2.39.2