Merge branch 'terencehill/hud_cvar_exporter' into 'master'

HUD: allow panels to define in their own files their own saved cvars

Closes #1883

See merge request xonotic/xonotic-data.pk3dir!812

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 40d5b0b4072e8ea4a690f6060d9cf528c703ca5c..99016ee90cb27bcb3013cd20d227dc41f60dc419 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ test_sv_game:
     - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
     - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
     - make
-    - EXPECT=62fd4d2a4124374b7e0cc1aff445cd88
+    - EXPECT=ee483d75c6507cb8ba0a21a5bf4d50fa
     - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg
       | tee /dev/stderr
       | grep '^:'

diff --git a/physics.cfg b/physics.cfg
index 823e85bce3c237bae128e9840a882762f4a6ab88..b74f68b3db4d1c3c341c70216e80765f7c28f8cc 100644 (file)
--- a/physics.cfg
+++ b/physics.cfg
@@ -7,7 +7,7 @@
 //  Main options
 // ==============
 set g_physics_clientselect 0 "allow clients to select their physics set"
-set g_physics_clientselect_options "xonotic nexuiz quake warsow defrag quake3 vecxis quake2 bones overkill"
+set g_physics_clientselect_options "xonotic nexuiz quake warsow defrag quake3 vecxis quake2 bones"
 set g_physics_clientselect_default "" "override default physics"
 
 // =========

diff --git a/physicsCPMA.cfg b/physicsCPMA.cfg
index ca688cd695136b13fb078f1d49325690ded5c2b9..7653219633599d30c41a59530ddcf616bbbc89d9 100644 (file)
--- a/physicsCPMA.cfg
+++ b/physicsCPMA.cfg
@@ -39,3 +39,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 400
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsFruit.cfg b/physicsFruit.cfg
index 8c034b8a9010faf99eab9bab51d2f1cd7a662bb5..4fcdcce0fcf66e0211058920a72629d317d58e76 100644 (file)
--- a/physicsFruit.cfg
+++ b/physicsFruit.cfg
@@ -37,3 +37,4 @@ sv_jumpspeedcap_max 0.35
 sv_jumpspeedcap_max_disable_on_ramps 1
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsHavoc.cfg b/physicsHavoc.cfg
index f45a73f14ca2eb09447feb72868eb1abd3861b91..a6598de9988b17d71596e22d2af8b1b544ca65c1 100644 (file)
--- a/physicsHavoc.cfg
+++ b/physicsHavoc.cfg
@@ -1,5 +1,5 @@
 g_mod_physics Havoc
-// Xonotic Havoc physics (work in progress)
+// Nexuiz Havoc physics (work in progress)
 
 sv_gravity 800
 sv_maxspeed 400
@@ -38,3 +38,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsLeeStricklin-ModdedFruit.cfg b/physicsLeeStricklin-ModdedFruit.cfg
index b2c35d086b6cd2241877cf61c879659f35e0a098..9bf0e03abfe9408216ae241d462ae19ccd264981 100644 (file)
--- a/physicsLeeStricklin-ModdedFruit.cfg
+++ b/physicsLeeStricklin-ModdedFruit.cfg
@@ -46,3 +46,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 1
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsLeeStricklin.cfg b/physicsLeeStricklin.cfg
index f529ed66dcc993101481bcca323b95948dc40d12..c6ecfd9274acaa863dbfcb02606c83ce24383ee6 100644 (file)
--- a/physicsLeeStricklin.cfg
+++ b/physicsLeeStricklin.cfg
@@ -46,3 +46,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 1
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsLeeStricklinOld.cfg b/physicsLeeStricklinOld.cfg
index 522c30197186f99c6fa06c6d3164f93e87ec3382..8b48b003c5f140a145d438d38069da626848e070 100644 (file)
--- a/physicsLeeStricklinOld.cfg
+++ b/physicsLeeStricklinOld.cfg
@@ -41,3 +41,4 @@ sv_jumpspeedcap_max 0.38
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsLzd.cfg b/physicsLzd.cfg
index 0c32adb2ef49436e331559d07bfb793b5a747c43..25a3b704e2b8996684209c333f9f1f18b457d466 100644 (file)
--- a/physicsLzd.cfg
+++ b/physicsLzd.cfg
@@ -39,3 +39,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsNexuiz10.cfg b/physicsNexuiz10.cfg
index 1f0b8bde150e79bab98a249c31669c6689a57af5..021ba773818d78edc64769d6742c9413e5b73142 100644 (file)
--- a/physicsNexuiz10.cfg
+++ b/physicsNexuiz10.cfg
@@ -39,3 +39,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsNexuiz11.cfg b/physicsNexuiz11.cfg
index 51ef497e7fcdc61d47f6041898805bca772c743f..7365d1840958052ec5fc7f04aafafc76e6d681dc 100644 (file)
--- a/physicsNexuiz11.cfg
+++ b/physicsNexuiz11.cfg
@@ -38,3 +38,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsNexuiz151.cfg b/physicsNexuiz151.cfg
index 0dd5b0da2948dcbc8ebb9b32d97c6d80c2b21818..c8503dbedd7ce9522d9a9ddd59e5723c68c20113 100644 (file)
--- a/physicsNexuiz151.cfg
+++ b/physicsNexuiz151.cfg
@@ -38,3 +38,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsNexuiz151b.cfg b/physicsNexuiz151b.cfg
index 5b9b21bf6717c88494704ddc4000065130da157d..656df926bbcf7a6695157b1399e740037fa8ab67 100644 (file)
--- a/physicsNexuiz151b.cfg
+++ b/physicsNexuiz151b.cfg
@@ -38,3 +38,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsNexuiz16rc1.cfg b/physicsNexuiz16rc1.cfg
index 4bad86850de9b29cab187f76d94296855f8995e5..9519444327291b3248ae13efe53c4a0e76781773 100644 (file)
--- a/physicsNexuiz16rc1.cfg
+++ b/physicsNexuiz16rc1.cfg
@@ -38,3 +38,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsNexuiz20.cfg b/physicsNexuiz20.cfg
index 531952a36533c992e390871454a511b7cafb0a96..a3aff85db63d0e8ddeef0ee45d0acf5fac6f8fce 100644 (file)
--- a/physicsNexuiz20.cfg
+++ b/physicsNexuiz20.cfg
@@ -38,3 +38,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsNexuiz25.cfg b/physicsNexuiz25.cfg
index 4de91d19a812122e2659726b1214597770626b38..51811f9c324500134a304399c376f78e22131b54 100644 (file)
--- a/physicsNexuiz25.cfg
+++ b/physicsNexuiz25.cfg
@@ -38,3 +38,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsNexuiz26.cfg b/physicsNexuiz26.cfg
index 151d360cb6179aac640729e144bfd9e1d9337406..f079f2825a00800fe0e831a94f96fcc65ba50a5e 100644 (file)
--- a/physicsNexuiz26.cfg
+++ b/physicsNexuiz26.cfg
@@ -38,3 +38,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsNoQWBunny-nexbased.cfg b/physicsNoQWBunny-nexbased.cfg
index 7acc35544a1c4211a6859383d45f37debfaa05a5..063d2e365fb5145bbbbb39d89e680ca2ece86f52 100644 (file)
--- a/physicsNoQWBunny-nexbased.cfg
+++ b/physicsNoQWBunny-nexbased.cfg
@@ -47,3 +47,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 1
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsOverkill.cfg b/physicsOverkill.cfg
index 67d02a776690aa79e608a8e0680ae32440878412..b40b5a54f7e93292cb2743c1febc55b110a21c06 100644 (file)
--- a/physicsOverkill.cfg
+++ b/physicsOverkill.cfg
@@ -52,3 +52,4 @@ sv_jumpspeedcap_min ""
 sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 1
 g_teleport_maxspeed 0
+sv_gameplayfix_stepdown_maxspeed 400

diff --git a/physicsQ.cfg b/physicsQ.cfg
index 4f880c90fc128acd897c7007fb9e60769c81ee31..d0adac13e71e2c94b7b08e6cc2b2c8ea8f90593d 100644 (file)
--- a/physicsQ.cfg
+++ b/physicsQ.cfg
@@ -39,3 +39,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsQ2.cfg b/physicsQ2.cfg
index 4507cc8c86be91d5301ddf55d058135cfc3da87b..7e6e2d6620e5173dc181b524e308002d77fd7c98 100644 (file)
--- a/physicsQ2.cfg
+++ b/physicsQ2.cfg
@@ -39,3 +39,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsQ2a.cfg b/physicsQ2a.cfg
index a515e9be773b5c6d8d21a2cc2a176c1a4c7688dc..55e31256419cfc2fc70322f4a5555143d92a88c1 100644 (file)
--- a/physicsQ2a.cfg
+++ b/physicsQ2a.cfg
@@ -40,3 +40,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsQ3.cfg b/physicsQ3.cfg
index 7b650da38e315d166977fc888f52a2937a1d7367..be6c7dd8c2b5ed67a0a71c85ab75a68b6248c1ee 100644 (file)
--- a/physicsQ3.cfg
+++ b/physicsQ3.cfg
@@ -39,3 +39,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 320
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsQBF.cfg b/physicsQBF.cfg
index 6b210f55b92e61f893298fc23c2dffb35acd79b1..4d7bdfeb5c88a51fb9d02fb40e9aa1433be73ad5 100644 (file)
--- a/physicsQBF.cfg
+++ b/physicsQBF.cfg
@@ -38,3 +38,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsQBFplus.cfg b/physicsQBFplus.cfg
index e8772b3f3f48037726fb5cfe2397f8a4d8561cff..5ae5720c70fc5e81a1d37ef8d88b23de9b0ab7e1 100644 (file)
--- a/physicsQBFplus.cfg
+++ b/physicsQBFplus.cfg
@@ -38,3 +38,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsSamual.cfg b/physicsSamual.cfg
index 4f22085f9a11d8c1829e2024b4f880f11ceb0347..8c85486045a59c0991aff5a661f97ce81550aa7f 100644 (file)
--- a/physicsSamual.cfg
+++ b/physicsSamual.cfg
@@ -38,3 +38,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsWarsow.cfg b/physicsWarsow.cfg
index c59b8e99e6e4dfc7a7c32fa850a9961368b7d3ff..a89ff6a80f16ae1cb806314306fa04bc7c8a8562 100644 (file)
--- a/physicsWarsow.cfg
+++ b/physicsWarsow.cfg
@@ -39,3 +39,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsWarsowClassicBunny.cfg b/physicsWarsowClassicBunny.cfg
index 05ece9bea6e97d557c8917a05d793aefe939c811..71506511527a73947c552dd867c036b97f3171d7 100644 (file)
--- a/physicsWarsowClassicBunny.cfg
+++ b/physicsWarsowClassicBunny.cfg
@@ -39,3 +39,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsWarsowDev.cfg b/physicsWarsowDev.cfg
index 4a272261fe173802e4880874a24975a214475208..bc75e8c6220b820a1d59f084d7247c0c5cbfbdb8 100644 (file)
--- a/physicsWarsowDev.cfg
+++ b/physicsWarsowDev.cfg
@@ -39,3 +39,4 @@ sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 0
 g_teleport_maxspeed 0
 sv_track_canjump 0
+sv_gameplayfix_stepdown_maxspeed 0

diff --git a/physicsX.cfg b/physicsX.cfg
index 6076dd73d19702226a4fe2efe3a842c4582a843f..dfe22345c5e4dc6d3157719b006d8256defe3cbd 100644 (file)
--- a/physicsX.cfg
+++ b/physicsX.cfg
@@ -53,3 +53,4 @@ sv_jumpspeedcap_min ""
 sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 1
 g_teleport_maxspeed 0
+sv_gameplayfix_stepdown_maxspeed 400

diff --git a/physicsX010.cfg b/physicsX010.cfg
index a5349c98fdfbd4212256335b808f8df22325e2c1..72285355326fb32d76efd5638fdd45adbeb3920d 100644 (file)
--- a/physicsX010.cfg
+++ b/physicsX010.cfg
@@ -46,3 +46,4 @@ sv_jumpspeedcap_min ""
 sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 1
 g_teleport_maxspeed 0
+sv_gameplayfix_stepdown_maxspeed 400

diff --git a/physicsX07.cfg b/physicsX07.cfg
index 61354633d517a6b9d04acc7a0ec66f0fc0ef199f..9fcdb9918bc4becd9bac351f9c8915a3ece8434f 100644 (file)
--- a/physicsX07.cfg
+++ b/physicsX07.cfg
@@ -52,3 +52,4 @@ sv_jumpspeedcap_min ""
 sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 1
 g_teleport_maxspeed 0
+sv_gameplayfix_stepdown_maxspeed 400

diff --git a/physicsXDF.cfg b/physicsXDF.cfg
index e0bea6a0ea560a17c0c442a280c7293417b84505..d7dd0a50e5f2eb5eeaea9481edb2eb86cf25caec 100644 (file)
--- a/physicsXDF.cfg
+++ b/physicsXDF.cfg
@@ -44,3 +44,4 @@ sv_jumpspeedcap_min 0
 sv_jumpspeedcap_max 0.5
 sv_jumpspeedcap_max_disable_on_ramps 1
 g_teleport_maxspeed 600
+sv_gameplayfix_stepdown_maxspeed 400

diff --git a/physicsXDFLight.cfg b/physicsXDFLight.cfg
index f9bed43f6e65096b7edcfa4309e7e969237b2168..3a80e0858eb204c736b4c8ade724a0be121653f9 100644 (file)
--- a/physicsXDFLight.cfg
+++ b/physicsXDFLight.cfg
@@ -44,3 +44,4 @@ sv_jumpspeedcap_min ""
 sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 1
 g_teleport_maxspeed 0
+sv_gameplayfix_stepdown_maxspeed 400

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 4c6696cde139325c341095c9f5a612aee0850d60..90bf6fb91ffa0cccbb9ef81320af6047ed59e7ba 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -446,6 +446,7 @@ int autocvar__cl_color;
 int autocvar__cl_playerskin;
 string autocvar__cl_playermodel;
 float autocvar_cl_deathglow;
+float autocvar_cl_deathglow_min = 0.5;
 bool autocvar_developer_csqcentities;
 float autocvar_cl_jetpack_attenuation = 2;
 bool autocvar_cl_showspectators;

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 1272758f76cee3de642322d9ce6ffb2419660e7a..624d997fecd7cc5bb5b51cc83fb106c72755a079 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -1,6 +1,5 @@
 #include "csqcmodel_hooks.qh"
 #include "autocvars.qh"
-#include "csqcmodel_hooks.qh"
 #include "miscfunctions.qh"
 #include <client/mutators/_mod.qh>
 #include "player_skeleton.qh"
@@ -109,7 +108,6 @@ string forceplayermodels_goodmodel;
 int forceplayermodels_goodmodelindex;
 
 .vector glowmod;
-.vector old_glowmod;
 
 void CSQCPlayer_ModelAppearance_PreUpdate(entity this)
 {
@@ -294,16 +292,14 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer)
        {
                if(this.csqcmodel_isdead)
                {
-                       // Fade out to black now...
-                       if(this.old_glowmod == '0 0 0') { this.old_glowmod = this.glowmod; }
-                       this.colormap = 0;
-
-                       this.glowmod = this.old_glowmod * bound(0, 1 - (time - this.death_time) / autocvar_cl_deathglow, 1);
-                       this.glowmod_x = max(this.glowmod.x, 0.0001);
-                       this.glowmod_y = max(this.glowmod.y, 0.0001);
-                       this.glowmod_z = max(this.glowmod.z, 0.0001);
+                       float min_factor = bound(0, autocvar_cl_deathglow_min, 1);
+                       if(this.colormap > 0)
+                               min_factor /= 2;
+                       float glow_fade = bound(0, 1 - (time - this.death_time) / autocvar_cl_deathglow, 1);
+                       this.glowmod *= (min_factor + glow_fade * (1 - min_factor));
+                       if (this.glowmod == '0 0 0')
+                               this.glowmod.x = 0.000001;
                }
-               else if(this.old_glowmod != '0 0 0') { this.old_glowmod = '0 0 0'; }
        }
 
        //printf("CSQCPlayer_ModelAppearance_Apply(): state = %s, colormap = %f, glowmod = %s\n", (this.csqcmodel_isdead ? "DEAD" : "ALIVE"), this.colormap, vtos(this.glowmod));

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 72ee803fa40b0331a930607d0b398f464fac11aa..d6a073a5de91d4798917c424c2f37cc8b3fd70eb 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -138,6 +138,8 @@ void CSQC_Init()
 
        registercvar("cl_multijump", "-1");
 
+       registercvar("cl_dodging", "0");
+
        registercvar("cl_spawn_near_teammate", "1");
 
        registercvar("cl_weapon_switch_reload", "1");

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 257e5e40f185ddc0bf254b9dc11d926258365cc2..f771b0f83cfea0d7c2a9545c96ea28f04af00d10 100644 (file)
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -671,11 +671,8 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s,
                        }
                        else
                        {
-                               for (;;)
+                               while((s = fgets(fh)))
                                {
-                                       if (!((s = fgets(fh))))
-                                               break;
-
                                        // catch different sorts of comments
                                        if(s == "")                    // empty lines
                                                continue;

diff --git a/qcsrc/common/mutators/mutator/buffs/all.inc b/qcsrc/common/mutators/mutator/buffs/all.inc
index a65532307c1132a56680e3a9988289d276cf38fd..5b53b3d651c2d76e49ac25e6778fc24a781e7fde 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/all.inc
+++ b/qcsrc/common/mutators/mutator/buffs/all.inc
@@ -4,7 +4,8 @@ string Buff_UndeprecateName(string buffname)
     {
         case "ammoregen": return "ammo";
         case "haste": case "scout": return "speed";
-        case "guard": case "revival": case "regen": return "medic";
+        case "guard": return "resistance";
+        case "revival": case "regen": return "medic";
         case "invis": return "invisible";
         case "jumper": return "jump";
         default: return buffname;
@@ -27,7 +28,7 @@ REGISTER_BUFF(RESISTANCE) {
     this.m_color = '0.36 1 0.07';
 }
 BUFF_SPAWNFUNCS(resistance, BUFF_RESISTANCE)
-BUFF_SPAWNFUNC_Q3TA_COMPAT(resistance, BUFF_RESISTANCE)
+BUFF_SPAWNFUNC_Q3TA_COMPAT(guard, BUFF_RESISTANCE)
 
 REGISTER_BUFF(SPEED) {
     this.m_name = _("Speed");
@@ -46,7 +47,6 @@ REGISTER_BUFF(MEDIC) {
     this.m_color = '1 0.12 0';
 }
 BUFF_SPAWNFUNCS(medic, BUFF_MEDIC)
-BUFF_SPAWNFUNC_Q3TA_COMPAT(guard, BUFF_MEDIC)
 BUFF_SPAWNFUNC_Q3TA_COMPAT(regen, BUFF_MEDIC)
 BUFF_SPAWNFUNC_Q3TA_COMPAT(revival, BUFF_MEDIC)
 

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 6aa798afb9b8b823f6363a914cde396fb165d55f..79989cc176d1a3e70200cd3fe03f60da91458817 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -159,6 +159,7 @@ bool autocvar_g_maplist_votable_suggestions;
 bool autocvar_g_maplist_votable_suggestions_override_mostrecent;
 float autocvar_g_maplist_votable_timeout;
 bool autocvar_g_maplist_ignore_sizes;
+bool autocvar_g_maplist_sizes_count_maxplayers = true;
 bool autocvar_g_maplist_sizes_count_bots = true;
 int autocvar_g_maxplayers;
 float autocvar_g_maxplayers_spectator_blocktime;

diff --git a/qcsrc/server/campaign.qc b/qcsrc/server/campaign.qc
index 336d825a7f58cc2ba4aa99ae1a45d81781293b80..110704f2bbd9b2d80cfba1f6325faa321b53f378 100644 (file)
--- a/qcsrc/server/campaign.qc
+++ b/qcsrc/server/campaign.qc
@@ -124,7 +124,7 @@ void CampaignPreInit()
                {
                        string arg = argv(j);
                        if(arg == "") continue;
-                       _MapInfo_Parse_Settemp(mapname, MAPINFO_SETTEMP_ACL_USER, 0, arg, 0); // no recursion!
+                       _MapInfo_Parse_Settemp(mapname, MAPINFO_SETTEMP_ACL_USER, 0, arg, 1);
                }
        }
 #endif

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index cb26ccc1fccc9c08be1bc46a4cf85bcd20842d8a..2f45c06aed9adbab7ebd8d499e1bf4ee3d6e768b 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -1955,6 +1955,8 @@ void Join(entity this)
 
 int GetPlayerLimit()
 {
+       if(g_duel)
+               return 2; // TODO: this workaround is needed since the mutator hook from duel can't be activated before the gametype is loaded (e.g. switching modes via gametype vote screen)
        int player_limit = autocvar_g_maxplayers;
        MUTATOR_CALLHOOK(GetPlayerLimit, player_limit);
        player_limit = M_ARGV(0, int);

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 8f131b745c8782c077e84cfef4641e1b4e12f8b1..bee939d9ac55fc5da8766fb70d0510123d1b71f3 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -1072,7 +1072,8 @@ bool MapHasRightSize(string map)
        // open map size restriction file
        string opensize_msg = strcat("opensize ", map);
        float fh = fopen(strcat("maps/", map, ".sizes"), FILE_READ);
-       int pcount = player_count;
+       int player_limit = ((autocvar_g_maplist_sizes_count_maxplayers) ? GetPlayerLimit() : 0);
+       int pcount = ((player_limit > 0) ? min(player_count, player_limit) : player_count); // bind it to the player limit so that forced spectators don't influence the limits
        if(!autocvar_g_maplist_sizes_count_bots)
                pcount -= currentbots;
        if(fh >= 0)
@@ -1105,7 +1106,7 @@ string Map_Filename(float position)
 
 void Map_MarkAsRecent(string m)
 {
-       cvar_set("g_maplist_mostrecent", strwords(strcat(m, " ", autocvar_g_maplist_mostrecent), max(0, autocvar_g_maplist_mostrecent_count)));
+       cvar_set("g_maplist_mostrecent", strwords(cons(m, autocvar_g_maplist_mostrecent), max(0, autocvar_g_maplist_mostrecent_count)));
 }
 
 float Map_IsRecent(string m)

diff --git a/server.cfg b/server.cfg
index 7b5855f1e36b363c4efccadf6f1f39f4ae5817cf..8862efcc08cec1ca280eb5a8f6040be3be92ad7f 100644 (file)
--- a/server.cfg
+++ b/server.cfg
@@ -1,8 +1,16 @@
 echo
-echo You have not written any server.cfg file yet.
-echo The server will therefore run at default settings.
+echo ^1You have started a dedicated server but have not created
+echo ^1any server.cfg in your config directory.
 echo
-echo For information on how to set up a dedicated server,
-echo look at the files in the server/ subdirectory of your
-echo Xonotic install.
+echo ^1If you are seeing this when just trying to play Xonotic
+echo ^1(not host a server), try the other executables.
 echo
+echo ^1For information on how to set up a dedicated server,
+echo ^1look at the files in the server/ subdirectory of your
+echo ^1Xonotic install.
+echo
+echo ^1Quitting in 5 seconds.
+echo
+
+// see https://gitlab.com/xonotic/xonotic/issues/184
+defer 5 quit

diff --git a/textures/gib2_gloss.tga b/textures/gib2_gloss.tga
new file mode 100644 (file)
index 0000000..1e83337
Binary files /dev/null and b/textures/gib2_gloss.tga differ

diff --git a/textures/gib2_spec.tga b/textures/gib2_spec.tga
deleted file mode 100644 (file)
index 1e83337..0000000
Binary files a/textures/gib2_spec.tga and /dev/null differ

diff --git a/textures/gib3_gloss.tga b/textures/gib3_gloss.tga
new file mode 100644 (file)
index 0000000..1e81d9a
Binary files /dev/null and b/textures/gib3_gloss.tga differ

diff --git a/textures/gib3_spec.tga b/textures/gib3_spec.tga
deleted file mode 100644 (file)
index 1e81d9a..0000000
Binary files a/textures/gib3_spec.tga and /dev/null differ

diff --git a/textures/gib4_gloss.tga b/textures/gib4_gloss.tga
new file mode 100644 (file)
index 0000000..899b220
Binary files /dev/null and b/textures/gib4_gloss.tga differ

diff --git a/textures/gib4_spec.tga b/textures/gib4_spec.tga
deleted file mode 100644 (file)
index 899b220..0000000
Binary files a/textures/gib4_spec.tga and /dev/null differ

diff --git a/textures/hagar_gloss.tga b/textures/hagar_gloss.tga
new file mode 100644 (file)
index 0000000..e44d88b
Binary files /dev/null and b/textures/hagar_gloss.tga differ

diff --git a/textures/hagar_spec.tga b/textures/hagar_spec.tga
deleted file mode 100644 (file)
index e44d88b..0000000
Binary files a/textures/hagar_spec.tga and /dev/null differ

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index f1335c9d29b185978c78baa09d773f5f74dd1043..389da6f74cb35b5340e0644530f2ce2291da9bcd 100644 (file)
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -228,7 +228,8 @@ seta cl_damageeffect_lifetime 0.1 "how much a damage effect lasts, based on dama
 seta cl_damageeffect_lifetime_min 3 "minimum lifetime a damage effect may have"
 seta cl_damageeffect_lifetime_max 6 "maximum lifetime a damage effect may have"
 
-set cl_deathglow 0.8 "number of seconds during which dead bodies glow out"
+set cl_deathglow 2 "number of seconds during which dead bodies glow out"
+set cl_deathglow_min 0.5 "glow out up to this glow factor"
 
 cl_movement 1
 cl_movement_track_canjump 0

diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index 4fd599567007c6f55371e22293be76c4cca36ed1..d4a97d7da54f872b631665fe9c0fad750faf00c2 100644 (file)
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -220,6 +220,7 @@ set g_maplist_selectrandom 0 "if 1, a random map will be chosen as next map - DE
 set g_maplist_shuffle 1 "new randomization method: like selectrandom, but avoid playing the same maps in short succession. This works by taking out the first element and inserting it into g_maplist with a bias to the end of the list"
 set g_maplist_check_waypoints 0 "when 1, maps are skipped if there currently are bots, but the map has no waypoints"
 set g_maplist_ignore_sizes 0 "when 1, all maps are shown in the map list regardless of player count"
+set g_maplist_sizes_count_maxplayers 1 "check the player limit when getting the player count so forced spectators don't affect the size restrictions"
 set g_maplist_sizes_count_bots 1 "include the number of bots currently in the server when counting the number of players for size restrictions"
 
 set g_items_mindist 4000 "starting distance for the fading of items"