Merge branch 'Mario/config_updates'

diff --git a/.gitignore b/.gitignore
index a305108b3a2a7b85823098b7c60d5cf480f50003..6b5cef68e6ae6881cd0fc23abc2340230d73614e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ weapons.qc.tmp
 *.lno
 qcsrc/qccversion*
 qcsrc/server/precache-for-csqc.inc
+.DS_Store

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 0feec0c0d9df1200448e5086539bade456b9f80c..18af3e8951af7491b789083dc8c097f249327cc2 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -544,12 +544,12 @@ r_mipsprites 1
 r_mipskins 1
 r_shadow_realtime_world_lightmaps 1
 cl_decals_fadetime 5
-cl_decals_time 2
+cl_decals_time 1
 seta cl_gunalign 3 "Gun alignment; 1 = center (if allowed by g_shootfromclient) or right, 2 = center (if allowed by g_shootfromclient) or left, 3 = right only, 4 = left only"
 seta cl_nogibs 0 "reduce number of violence effects, or remove them totally"
 seta cl_particlegibs 0 "simpler gibs"
 seta cl_gibs_damageforcescale 3.5 "force to push around gibs"
-seta cl_gibs_lifetime 5 "average lifetime of gibs"
+seta cl_gibs_lifetime 2.5 "average lifetime of gibs"
 seta cl_gibs_velocity_scale 1 "gib throw velocity force scale"
 seta cl_gibs_velocity_random 1 "gib throw velocity randomness scale"
 seta cl_gibs_velocity_up 1 "extra z velocity for gibs"
@@ -561,7 +561,7 @@ seta cl_casings_shell_time 30 "shell casing lifetime"
 seta cl_casings_bronze_time 10 "bullet casings lifetime"
 seta cl_casings_ticrate 0.1 "ticrate for casings"
 seta cl_casings_sloppy 1 "sloppy casings, may temporarily penetrate walls"
-seta cl_projectiles_sloppy 0 "sloppy projectiles, may temporarily penetrate walls"
+seta cl_projectiles_sloppy 1 "sloppy projectiles, may temporarily penetrate walls"
 cl_stainmaps 0
 cl_particles_smoke 1
 vid_gl20 1
@@ -1062,7 +1062,7 @@ set con_completion_gotomap        map
 set con_completion_vmap                map
 set con_completion_vnextmap    map
 set con_completion_vdomap      map
-set con_completion_playermodel models/player/*.iqm
+set con_completion_playermodel "models/player/*.iqm"
 
 // helper
 // these non-saved engine cvars shall be saved
@@ -1264,7 +1264,7 @@ set bot_sound_monopoly 0 "when enabled, only bots can make any noise"
 
 set cl_loddistance1 1024
 set cl_loddistance2 3072
-seta cl_playerdetailreduction 1        "the higher, the less detailed player models are displayed (LOD)"
+seta cl_playerdetailreduction 4        "the higher, the less detailed player models are displayed (LOD)"
 seta cl_modeldetailreduction 1 "the higher, the less detailed certain map models are displayed (LOD)"
 
 set g_mapinfo_settemp_acl "+*" "ACL for mapinfo setting cvars"
@@ -1442,6 +1442,7 @@ r_shadow_glossintensity 1
 r_fakelight 1
 
 r_water_hideplayer 1 // hide your own feet/player model in refraction views, this way you don't see half of your body under water
+r_water_refractdistort 0.019
 
 // strength sound settings
 set sv_strengthsound_antispam_time 0.1 "minimum distance of strength sounds"

diff --git a/effects-high.cfg b/effects-high.cfg
index 979c8b17405a727ca64d57e04c21915ea75deb55..456061536d6986d9973275bfc62067906a81aa4d 100644 (file)
--- a/effects-high.cfg
+++ b/effects-high.cfg
@@ -1,10 +1,10 @@
 cl_decals 1
 cl_decals_models 0
-cl_decals_time 4
+cl_decals_fadetime 4
 cl_particles_quality 1
 cl_damageeffect 1
 cl_spawn_point_particles 1
-cl_playerdetailreduction 0.5
+cl_playerdetailreduction 4
 gl_flashblend 0
 gl_picmip -1
 mod_q3bsp_nolightmaps 0

diff --git a/effects-low.cfg b/effects-low.cfg
index 8d6e72a4d0b043a45531383ebe07b99b8828ec92..d98ba526d8e4f97f4a441def438be5bad3bc08f8 100644 (file)
--- a/effects-low.cfg
+++ b/effects-low.cfg
@@ -1,10 +1,10 @@
 cl_decals 1
 cl_decals_models 0
-cl_decals_time 2
+cl_decals_fadetime 2
 cl_particles_quality 0.4
 cl_damageeffect 0
 cl_spawn_point_particles 0
-cl_playerdetailreduction 2
+cl_playerdetailreduction 4
 gl_flashblend 1
 gl_picmip 1
 mod_q3bsp_nolightmaps 1

diff --git a/effects-med.cfg b/effects-med.cfg
index 1611943c64323588e9e53b057346194149423c82..58191f266e907d85f9adf26ccad59d440fc62b49 100644 (file)
--- a/effects-med.cfg
+++ b/effects-med.cfg
@@ -1,10 +1,10 @@
 cl_decals 1
 cl_decals_models 0
-cl_decals_time 2
+cl_decals_fadetime 2
 cl_particles_quality 1
 cl_damageeffect 0
 cl_spawn_point_particles 0
-cl_playerdetailreduction 1
+cl_playerdetailreduction 4
 gl_flashblend 0
 gl_picmip 0
 mod_q3bsp_nolightmaps 0

diff --git a/effects-normal.cfg b/effects-normal.cfg
index 064af655007dabaf85825570d73287d843eb917a..dd8cce9a787ed27958b26190c69b2ec86ce6519e 100644 (file)
--- a/effects-normal.cfg
+++ b/effects-normal.cfg
@@ -1,10 +1,10 @@
 cl_decals 1
 cl_decals_models 0
-cl_decals_time 2
+cl_decals_fadetime 2
 cl_particles_quality 1
 cl_damageeffect 1
 cl_spawn_point_particles 1
-cl_playerdetailreduction 1
+cl_playerdetailreduction 4
 gl_flashblend 0
 gl_picmip 0
 mod_q3bsp_nolightmaps 0

diff --git a/effects-omg.cfg b/effects-omg.cfg
index 9ede9c7d7236cbd8cb66ddf25d6dcc8900db39d4..7c39fbbef6335d8467d2747f119c9b96ab4421cd 100644 (file)
--- a/effects-omg.cfg
+++ b/effects-omg.cfg
@@ -1,6 +1,6 @@
 cl_decals 0
 cl_decals_models 0
-cl_decals_time 2
+cl_decals_fadetime 2
 cl_particles_quality 0.4
 cl_damageeffect 0
 cl_spawn_point_particles 0

diff --git a/effects-ultimate.cfg b/effects-ultimate.cfg
index 92539b9b76fb8e278a43375a685ccea517b0e2c6..6897ccc16fa9cfdd6e44e504e18b495570ba5054 100644 (file)
--- a/effects-ultimate.cfg
+++ b/effects-ultimate.cfg
@@ -1,6 +1,6 @@
 cl_decals 1
 cl_decals_models 1
-cl_decals_time 10
+cl_decals_fadetime 10
 cl_particles_quality 1
 cl_damageeffect 2
 cl_spawn_point_particles 1

diff --git a/effects-ultra.cfg b/effects-ultra.cfg
index 63cfc63ea9fedb7e82b692ab83477eb36c413484..d530f03b8b7ff004af587d317a6d2ae5f0c23b89 100644 (file)
--- a/effects-ultra.cfg
+++ b/effects-ultra.cfg
@@ -1,10 +1,10 @@
 cl_decals 1
 cl_decals_models 0
-cl_decals_time 10
+cl_decals_fadetime 10
 cl_particles_quality 1
 cl_damageeffect 1
 cl_spawn_point_particles 1
-cl_playerdetailreduction 0
+cl_playerdetailreduction 2
 gl_flashblend 0
 gl_picmip -1
 mod_q3bsp_nolightmaps 0

diff --git a/keybinds.txt b/keybinds.txt
index 22f021434183f8611ae0307dc1b2314874ef6292..95d24acdbd67f30279c8f2f18aa94134dd2838a4 100644 (file)
--- a/keybinds.txt
+++ b/keybinds.txt
@@ -58,6 +58,7 @@
 "dropweapon"                            "drop weapon"
 "+use"                                  "drop key / drop flag"
 "+button8"                              "drag object"
+"toggle chase_active"                   "3rd person view"
 ""                                      ""
 ""                                      "User defined"
 "+userbind 1"                           "$userbind1"

diff --git a/keybinds.txt.de b/keybinds.txt.de
index 2aac70080a7e53e8e051ad6d7b2f470a2a631e7b..a878a1a815630b195679d669a128e4ad55f4c56e 100644 (file)
--- a/keybinds.txt.de
+++ b/keybinds.txt.de
@@ -58,6 +58,7 @@
 "dropweapon"                            "Waffe wegwerfen"
 "+use"                                  "Schlüssel oder Flagge wegwerfen"
 "+button8"                              "Objekt ziehen"
+"toggle chase_active"                   "3rd person view (FIXME)"
 ""                                      ""
 ""                                      "Benutzerdefiniert"
 "+userbind 1"                           "$userbind1"

diff --git a/keybinds.txt.es b/keybinds.txt.es
index 55c82cd3f7405b9efb36a84c495402231125d33b..0c3b8364c203f1e130de8c9d092b96f311ad17fa 100644 (file)
--- a/keybinds.txt.es
+++ b/keybinds.txt.es
@@ -58,6 +58,7 @@
 "dropweapon"                            "soltar arma"
 "+use"                                  "soltar llave / soltar bandera"
 "+button8"                              "drag object (FIXME)"
+"toggle chase_active"                   "3rd person view (FIXME)"
 ""                                      ""
 ""                                      "Definido por el usuario"
 "+userbind 1"                           "$userbind1"

diff --git a/keybinds.txt.fr b/keybinds.txt.fr
index 4693e38686428f1a52a98f336d286383d5d1a88d..7d0999a1e464d04985fb4c500d528ee0ba547629 100644 (file)
--- a/keybinds.txt.fr
+++ b/keybinds.txt.fr
@@ -58,6 +58,7 @@
 "dropweapon"                            "lâcher l'arme"
 "+use"                                  "lâcher la clé / lâcher le drapeau"
 "+button8"                              "drag object (FIXME)"
+"toggle chase_active"                   "3rd person view (FIXME)"
 ""                                      ""
 ""                                      "Utilisateur"
 "+userbind 1"                           "$userbind1"

diff --git a/keybinds.txt.hu b/keybinds.txt.hu
index 74d96470be0b5161ace4cf64ad9b47e6234ddb74..c4e418d120fef0551819ecc39dfe180a79b1c2ff 100644 (file)
--- a/keybinds.txt.hu
+++ b/keybinds.txt.hu
@@ -58,6 +58,7 @@
 "dropweapon"                            "fegyver eldobás"
 "+use"                                  "zászló eldobás, kiszállás"
 "+button8"                              "drag object"
+"toggle chase_active"                   "3rd person view (FIXME)"
 ""                                      ""
 ""                                      "Felhasználói hozzárendelések"
 "+userbind 1"                           "$userbind1"

diff --git a/keybinds.txt.it b/keybinds.txt.it
index 87d7840295d1bd6db9f04778c6e8e390152ab58e..e46ef92440616e732199569bf175ba717b8042d6 100644 (file)
--- a/keybinds.txt.it
+++ b/keybinds.txt.it
@@ -58,6 +58,7 @@
 "dropweapon"                            "abbandona arma"
 "+use"                                  "abbandona chiave / bandiera"
 "+button8"                              "trascina oggetto"
+"toggle chase_active"                   "3rd person view (FIXME)"
 ""                                      ""
 ""                                      "Definiti dall'utente"
 "+userbind 1"                           "$userbind1"

diff --git a/keybinds.txt.ru b/keybinds.txt.ru
index 4d4221a205d648285049e6e6fd39ef97ff321071..3431c25f67e721fec122dfea5a8b5e37167b430d 100644 (file)
--- a/keybinds.txt.ru
+++ b/keybinds.txt.ru
@@ -58,6 +58,7 @@
 "dropweapon"                            "бросить оружие"
 "+use"                                  "бросить ключ или флаг"
 "+button8"                              "drag object"
+"toggle chase_active"                   "3rd person view (FIXME)"
 ""                                      ""
 ""                                      "Определенно пользователем"
 "+userbind 1"                           "$userbind1"

diff --git a/keybinds.txt.uk b/keybinds.txt.uk
index 02b4e579b24b0e95741eb86ffd2e2596433515eb..eae9049c1dddfe833b867b90d042eda509ae4c47 100644 (file)
--- a/keybinds.txt.uk
+++ b/keybinds.txt.uk
@@ -58,6 +58,7 @@
 "dropweapon"                            "викинути зброю"
 "+use"                                  "викинути ключ / прапор"
 "+button8"                              "drag object"
+"toggle chase_active"                   "3rd person view (FIXME)"
 ""                                      ""
 ""                                      "Визначені користувачем"
 "+userbind 1"                           "$userbind1"

diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c
index a963d1e3099862fb485fff19d842f5f5206522b8..e3b562ee3bb0459385968fa0a99e16f38bd63151 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@ -193,7 +193,7 @@ void XonoticEffectsSettingsTab_fill(entity me)
                me.TDempty(me, 0.2);
            me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Time:")));
                setDependent(e, "cl_decals", 1, 1);
-           me.TD(me, 1, 2, e = makeXonoticSlider(1, 20, 1, "cl_decals_time"));
+           me.TD(me, 1, 2, e = makeXonoticSlider(1, 20, 1, "cl_decals_fadetime"));
                setDependent(e, "cl_decals", 1, 1);
 
        me.gotoRC(me, me.rows - 1, 0);