Add decals showing on models to the menu, and configuration presets. Also, only enabl...

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 3b1ff201f0556f1125981e30ceea64d49f194b46..fcaeb0411d7d47cf334cae424a1777a39ba00410 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1682,8 +1682,8 @@ set cl_lerpanim_maxdelta_framegroups 0.05 // must be faster than fastest weapon
 set cl_lerpanim_maxdelta_server 0.1 // must be slower than slowest server controlled anim (e.g. animinfo stuff)\r
 \r
 // sucks less than the old one\r
 set cl_lerpanim_maxdelta_server 0.1 // must be slower than slowest server controlled anim (e.g. animinfo stuff)\r
 \r
 // sucks less than the old one\r

-cl_decals_newsystem 1\r
-cl_decals_models 1\r
+seta cl_decals_newsystem 1\r
+seta cl_decals_models 0\r

 \r
 // FIXME temporary\r
 set menu_font_size_snapping_fix 1\r
 \r
 // FIXME temporary\r
 set menu_font_size_snapping_fix 1\r

diff --git a/data/effects-high.cfg b/data/effects-high.cfg
index d662c8afc08ad73969fd04be7e49e0b6d16cf15e..03a32e74caf9bf44664f290f79265be5b11ea632 100644 (file)
--- a/data/effects-high.cfg
+++ b/data/effects-high.cfg
@@ -1,4 +1,5 @@
 cl_decals 1\r
 cl_decals 1\r

+cl_decals_models 1\r

 cl_decals_time 5\r
 cl_particles_quality 0.75\r
 cl_particles_rain 1\r
 cl_decals_time 5\r
 cl_particles_quality 0.75\r
 cl_particles_rain 1\r

diff --git a/data/effects-low.cfg b/data/effects-low.cfg
index 28d081f632b2e1adaf6ddf7188266ba851466860..112f6c19d205f42df4b19451b2a9dd3a99e18e02 100644 (file)
--- a/data/effects-low.cfg
+++ b/data/effects-low.cfg
@@ -1,4 +1,5 @@
 cl_decals 1\r
 cl_decals 1\r

+cl_decals_models 0\r

 cl_decals_time 2\r
 cl_particles_quality 0.2\r
 cl_particles_rain 0\r
 cl_decals_time 2\r
 cl_particles_quality 0.2\r
 cl_particles_rain 0\r

diff --git a/data/effects-med.cfg b/data/effects-med.cfg
index 16ca0b11e9527ebb6021253a0685a884476cc2cf..9de94c748c21539a8e17b7ac4c20933a85b86ae4 100644 (file)
--- a/data/effects-med.cfg
+++ b/data/effects-med.cfg
@@ -1,4 +1,5 @@
 cl_decals 1\r
 cl_decals 1\r

+cl_decals_models 0\r

 cl_decals_time 2\r
 cl_particles_quality 0.5\r
 cl_particles_rain 1\r
 cl_decals_time 2\r
 cl_particles_quality 0.5\r
 cl_particles_rain 1\r

diff --git a/data/effects-normal.cfg b/data/effects-normal.cfg
index a8261b99a4c82a6cd4fd1a5d1d6eaf9b5fbcbd90..f244dbfaf081bda54d7c04258e40db81f0270a3a 100644 (file)
--- a/data/effects-normal.cfg
+++ b/data/effects-normal.cfg
@@ -1,4 +1,5 @@
 cl_decals 1\r
 cl_decals 1\r

+cl_decals_models 0\r

 cl_decals_time 5\r
 cl_particles_quality 0.5\r
 cl_particles_rain 1\r
 cl_decals_time 5\r
 cl_particles_quality 0.5\r
 cl_particles_rain 1\r

diff --git a/data/effects-omg.cfg b/data/effects-omg.cfg
index 31ba56c48d4f43f5c2bc6b5ee52a963613018ed1..8b2b231bc2fa573c7bd79f3ff26ea6eab35fdaa0 100644 (file)
--- a/data/effects-omg.cfg
+++ b/data/effects-omg.cfg
@@ -1,4 +1,5 @@
 cl_decals 0\r
 cl_decals 0\r

+cl_decals_models 0\r

 cl_decals_time 2\r
 cl_particles_quality 0.2\r
 cl_particles_rain 0\r
 cl_decals_time 2\r
 cl_particles_quality 0.2\r
 cl_particles_rain 0\r

diff --git a/data/effects-ultimate.cfg b/data/effects-ultimate.cfg
index 2c1a05963b63be7f9955ba3fc532022d01043294..a1c64553b2c6bf89eab859b9590dccf689d64b96 100644 (file)
--- a/data/effects-ultimate.cfg
+++ b/data/effects-ultimate.cfg
@@ -1,4 +1,5 @@
 cl_decals 1\r
 cl_decals 1\r

+cl_decals_models 1\r

 cl_decals_time 10\r
 cl_particles_quality 1\r
 cl_particles_rain 1\r
 cl_decals_time 10\r
 cl_particles_quality 1\r
 cl_particles_rain 1\r

diff --git a/data/effects-ultra.cfg b/data/effects-ultra.cfg
index c501d6bc49ea4d32a06afb7ed0b7ec1f276652a8..156a2fd14ec4fb6114906143c8199ebbcf1424e1 100644 (file)
--- a/data/effects-ultra.cfg
+++ b/data/effects-ultra.cfg
@@ -1,4 +1,5 @@
 cl_decals 1\r
 cl_decals 1\r

+cl_decals_models 1\r

 cl_decals_time 10\r
 cl_particles_quality 1\r
 cl_particles_rain 1\r
 cl_decals_time 10\r
 cl_particles_quality 1\r
 cl_particles_rain 1\r

diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c
index 13ba2ff197ab122b56052e03db8caccc12e2f7ba..c04b8cfbca99cb6f86828f9d021576e1d94d9070 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings_effects.c
+++ b/data/qcsrc/menu/voret/dialog_settings_effects.c
@@ -101,7 +101,9 @@ void fillVoretEffectsSettingsTab(entity me)
                makeMulti(e, "cl_particles_snow");\r
        me.TR(me);\r
        me.TR(me);\r
                makeMulti(e, "cl_particles_snow");\r
        me.TR(me);\r
        me.TR(me);\r

-               me.TD(me, 1, 3, e = makeVoretCheckBox(0, "cl_decals", "Decals"));\r
+               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "cl_decals", "Decals"));\r
+               me.TD(me, 1, 3, e = makeVoretCheckBox(0, "cl_decals_models", "On models"));\r
+                       setDependent(e, "cl_decals", 1, 1);\r

        me.TR(me);\r
                me.TDempty(me, 0.2);\r
                me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Distance:"));\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
                me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Distance:"));\r