Allow r_shadows 2 to be enabled (ambient shadows), and remove soft shadows from the...

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 5e5580c67acc54eed349319635d16a31da9e5210..0aeb2bce523fc8a181ce889d7c0ae5e48a5c3b6a 100644 (file)
--- 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
 r_mipskins 1\r
 r_shadow_realtime_world_lightmaps 1\r
+r_shadow_shadowmapping 1\r
 seta r_ambient 4\r
 cl_decals_fadetime 1\r
 cl_decals_time 2\r

diff --git a/data/effects-high.cfg b/data/effects-high.cfg
index 0ff8022469d6fcfa14ebfc2cae90928da7f229da..6c3504867ee03168c319e8bd1bb62c605cdb0144 100644 (file)
--- 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
 r_shadow_realtime_world 0\r
 r_shadow_realtime_world_shadows 0\r
-r_shadow_shadowmapping 0\r
 r_shadow_usenormalmap 1\r
+r_shadows 0\r
 r_showsurfaces 0\r
 r_subdivisions_tolerance 3\r
 r_water 1\r

diff --git a/data/effects-low.cfg b/data/effects-low.cfg
index 8462e43255a77b44ea2c099dbb177f8876238a80..cc490865503b0fccf546376b6e0a5c93f3aefcab 100644 (file)
--- 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
 r_shadow_realtime_world 0\r
 r_shadow_realtime_world_shadows 0\r
-r_shadow_shadowmapping 0\r
 r_shadow_usenormalmap 0\r
+r_shadows 0\r
 r_showsurfaces 0\r
 r_subdivisions_tolerance 8\r
 r_water 0\r

diff --git a/data/effects-med.cfg b/data/effects-med.cfg
index 2ce167655b01695998dd043f0e88d449ea62f734..f7209c57332738bdb9457fec950fe2f6e442be5f 100644 (file)
--- 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
 r_shadow_realtime_world 0\r
 r_shadow_realtime_world_shadows 0\r
-r_shadow_shadowmapping 0\r
 r_shadow_usenormalmap 0\r
+r_shadows 0\r
 r_showsurfaces 0\r
 r_subdivisions_tolerance 4\r
 r_water 0\r

diff --git a/data/effects-normal.cfg b/data/effects-normal.cfg
index 210405365737e6491fcb495e09f61bd57eaaf0d7..887f0e3576d9fa080774e07ddd788139d995ca5a 100644 (file)
--- 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
 r_shadow_realtime_world 0\r
 r_shadow_realtime_world_shadows 0\r
-r_shadow_shadowmapping 0\r
 r_shadow_usenormalmap 1\r
+r_shadows 0\r
 r_showsurfaces 0\r
 r_subdivisions_tolerance 3\r
 r_water 0\r

diff --git a/data/effects-omg.cfg b/data/effects-omg.cfg
index 119102e9637d3c6bf1d2d7d24aa58226fe6fae05..c256e722ed68954f084124ff339900b9e0502e07 100644 (file)
--- 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
 r_shadow_realtime_world 0\r
 r_shadow_realtime_world_shadows 0\r
-r_shadow_shadowmapping 0\r
 r_shadow_usenormalmap 0\r
+r_shadows 0\r
 r_showsurfaces 3\r
 r_subdivisions_tolerance 16\r
 r_water 0\r

diff --git a/data/effects-ultimate.cfg b/data/effects-ultimate.cfg
index d87f341e6cb4e90418f186a19a3ed4aec1b4b6f2..1fe14a833f6fa7fb177ff53c5cccf1515a2ad6ec 100644 (file)
--- 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
 r_shadow_realtime_world 1\r
 r_shadow_realtime_world_shadows 1\r
-r_shadow_shadowmapping 1\r
 r_shadow_usenormalmap 1\r
+r_shadows 2\r
 r_showsurfaces 0\r
 r_subdivisions_tolerance 1\r
 r_water 1\r

diff --git a/data/effects-ultra.cfg b/data/effects-ultra.cfg
index 9e06bd9d25b46e78b0b9f94cdb1440be84399845..c487920089e43483783da9f66de152ff1a447496 100644 (file)
--- 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
 r_shadow_realtime_world 1\r
 r_shadow_realtime_world_shadows 1\r
-r_shadow_shadowmapping 1\r
 r_shadow_usenormalmap 1\r
+r_shadows 2\r
 r_showsurfaces 0\r
 r_subdivisions_tolerance 2\r
 r_water 1\r

diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c
index 80d93ce5bee39322fd04a58f511f2e91fdf84596..38a0466ee4aef4a54aef9e8b02440f1e247541d9 100644 (file)
--- 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);\r
                me.TD(me, 1, 1.8, e = makeVoretCheckBox(0, "r_shadow_usenormalmap", "Use normal maps"));\r
                        setDependentOR(e, "r_shadow_realtime_dlight", 1, 1, "r_shadow_realtime_world", 1, 1);\r
-               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_shadow_shadowmapping", "Soft shadows"));\r
-                       setDependentWeird(e, someShadowCvarIsEnabled);\r
+               me.TD(me, 1, 1, e = makeVoretCheckBoxEx(2, 0, "r_shadows", "Ambient shadows"));\r
+                       //setDependentWeird(e, someShadowCvarIsEnabled);\r
        me.TR(me);\r
                me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_coronas", "Coronas"));\r
        me.TDempty(me, 0.2);\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index 08f19a6933bc928911652bd20672ec69386398a3..ad4bc6b2aac171ccc153527274d1efd6dc3006c6 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -96,8 +96,6 @@
 \r
 - +0.8: Fix flying spectators not going through teleporters and warpzones. Very hard, since they're FLY_WORLDONLY and can't touch triggers\r
 \r
-- 0.7 | 0.8: Enable r_shadows in some way?\r
-\r
 - 0.7 | 0.8: HUD icon when stunned.\r
 \r
 - 0.7 | 0.8: Better portrait images.\r
@@ -130,15 +128,15 @@
 \r
 - 0.7: Make the insides of the color vixen character glow more\r
 \r
-- 0.7 | 0.8: Always play the eating animations when the fire button is down?\r
+- 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"\r
 \r
-- 0.8: Distributed digestion: Account the health of each item when distributing, not only the count\r
+- 0.8: Distributed digestion: Also account the health of each item / player when distributing, not only the count\r
 \r
-- 0.7 | 0.8: Rename fire keybinds to difference between weapon attach and vore attack?\r
+- 0.7: Rename fire keybinds to difference between weapon attach and vore attack?\r
 \r
 - 0.8 BUG: When you get stomach kicked, weapon reloading resets. Is this a bug, or does it actually work better?\r
 \r
-- 0.7: Move source branch to mediasource like Xonotic\r
+- 0.7 | 0.8: Move source branch to mediasource like Xonotic\r
 \r
 - 0.8 BUG: Bots can still senect no weapon when they have the grabber\r
 \r
@@ -146,6 +144,6 @@
 \r
 - +0.8: Maybe turn health items into creatures that run around?\r
 \r
-- 0.8: Maybe give a swallow progress to items as well, but by standing on them.\r
+- 0.8: Maybe give a swallow progress to items as well, but by standing on them\r
 \r
-- 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