Merge branch 'bones_was_here/misc2' into 'master'

Misc low importance stuff

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

diff --git a/physicsNexuiz10.cfg b/physicsNexuiz10.cfg
index 021ba773818d78edc64769d6742c9413e5b73142..bdaa0e66b677ede2e7617cc8e817fde9c9c5cdb4 100644 (file)
--- a/physicsNexuiz10.cfg
+++ b/physicsNexuiz10.cfg
@@ -1,5 +1,5 @@
 g_mod_physics Nexuiz10
-// Xonotic 1.0 physics
+// Nexuiz 1.0 physics
 
 sv_gravity 800
 sv_maxspeed 400

diff --git a/physicsNexuiz11.cfg b/physicsNexuiz11.cfg
index 7365d1840958052ec5fc7f04aafafc76e6d681dc..c66ac46a0d80f2d4920f7ef141a8df3a86a17fad 100644 (file)
--- a/physicsNexuiz11.cfg
+++ b/physicsNexuiz11.cfg
@@ -1,5 +1,5 @@
 g_mod_physics Nexuiz11
-// Xonotic 1.5 physics
+// Nexuiz 1.5 physics
 
 sv_gravity 800
 sv_maxspeed 400

diff --git a/physicsNexuiz151.cfg b/physicsNexuiz151.cfg
index c8503dbedd7ce9522d9a9ddd59e5723c68c20113..b6022954107529a3b85076a24c20abe3c2c89d60 100644 (file)
--- a/physicsNexuiz151.cfg
+++ b/physicsNexuiz151.cfg
@@ -1,5 +1,5 @@
 g_mod_physics Nexuiz151
-// experimental post-Xonotic 1.5 physics (never released)
+// experimental post-Nexuiz 1.5 physics (never released)
 
 sv_gravity 800
 sv_maxspeed 400

diff --git a/physicsNexuiz151b.cfg b/physicsNexuiz151b.cfg
index 656df926bbcf7a6695157b1399e740037fa8ab67..4ecdef9c0751b6d56530b51796e0e1bc96b9c5fa 100644 (file)
--- a/physicsNexuiz151b.cfg
+++ b/physicsNexuiz151b.cfg
@@ -1,5 +1,5 @@
 g_mod_physics Nexuiz151b
-// experimental post-Xonotic 1.5 physics (never released)
+// experimental post-Nexuiz 1.5 physics (never released)
 
 sv_gravity 800
 sv_maxspeed 400

diff --git a/physicsNexuiz16rc1.cfg b/physicsNexuiz16rc1.cfg
index 9519444327291b3248ae13efe53c4a0e76781773..912399130dcde5195fbe9dcf795497827bf9a860 100644 (file)
--- a/physicsNexuiz16rc1.cfg
+++ b/physicsNexuiz16rc1.cfg
@@ -1,5 +1,5 @@
 g_mod_physics Nexuiz16rc1
-// experimental post-Xonotic 1.5 physics (never released)
+// experimental post-Nexuiz 1.5 physics (never released)
 
 sv_gravity 800
 sv_maxspeed 400

diff --git a/physicsNexuiz20.cfg b/physicsNexuiz20.cfg
index a3aff85db63d0e8ddeef0ee45d0acf5fac6f8fce..956310b8ebd42a62d3664edc94a67e3b07e1bdb1 100644 (file)
--- a/physicsNexuiz20.cfg
+++ b/physicsNexuiz20.cfg
@@ -1,5 +1,5 @@
 g_mod_physics Nexuiz20
-// Quake, Bunny Reintroduced (Xonotic 2.0 to 2.4.2 physics)
+// Quake, Bunny Reintroduced (Nexuiz 2.0 to 2.4.2 physics)
 
 sv_gravity 800
 sv_maxspeed 400

diff --git a/physicsNexuiz25.cfg b/physicsNexuiz25.cfg
index 51811f9c324500134a304399c376f78e22131b54..0654a9f29ebc15d84419dcb7c854a101dd812eb1 100644 (file)
--- a/physicsNexuiz25.cfg
+++ b/physicsNexuiz25.cfg
@@ -1,5 +1,5 @@
 g_mod_physics Nexuiz25
-// Xonotic 2.5 physics
+// Nexuiz 2.5 physics
 
 sv_gravity 800
 sv_maxspeed 400

diff --git a/physicsNexuiz26.cfg b/physicsNexuiz26.cfg
index f079f2825a00800fe0e831a94f96fcc65ba50a5e..e20e2c93eac3908ad2695c362b349f53010d729c 100644 (file)
--- a/physicsNexuiz26.cfg
+++ b/physicsNexuiz26.cfg
@@ -1,5 +1,5 @@
 g_mod_physics Nexuiz26
-// Xonotic 2.6 physics
+// Nexuiz 2.6 physics
 
 sv_gravity 800
 sv_maxspeed 400

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 871fab3bde130952261046fff316d14e95c6fa81..7835908cb88ec1e88b0ba8aed8a1bc12c8346c89 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -401,7 +401,7 @@ void fpscounter_update()
 
                int channel = MSG_C2S;
                WriteHeader(channel, fpsreport);
-               WriteShort(channel, bound(0, rint(fps), 65535)); // prevent insane fps values
+               WriteShort(channel, bound(0, rint(fps), 32767)); // prevent insane fps values
        }
 }
 

diff --git a/qcsrc/common/mapobjects/func/rainsnow.qc b/qcsrc/common/mapobjects/func/rainsnow.qc
index 4f4d4d0aca59349bd04975b75b514c4501e3c7c4..de49f1e367c508327cc1363e8a57b9ec9f1a61e6 100644 (file)
--- a/qcsrc/common/mapobjects/func/rainsnow.qc
+++ b/qcsrc/common/mapobjects/func/rainsnow.qc
@@ -13,7 +13,7 @@ bool rainsnow_SendEntity(entity this, entity to, float sf)
        WriteShort(MSG_ENTITY, compressShortVector(this.dest));
        WriteShort(MSG_ENTITY, this.count);
        WriteByte(MSG_ENTITY, this.cnt);
-       WriteShort(MSG_ENTITY, bound(0, this.fade_end, 65535));
+       WriteShort(MSG_ENTITY, bound(0, this.fade_end, 32767));
        return true;
 }
 

diff --git a/qcsrc/common/mapobjects/models.qc b/qcsrc/common/mapobjects/models.qc
index 4d4ccc8dd2821b5ef60b33e4f62be4cfee56952d..85a8ab843620a151c774747bb3fd7001b0ff5386 100644 (file)
--- a/qcsrc/common/mapobjects/models.qc
+++ b/qcsrc/common/mapobjects/models.qc
@@ -116,9 +116,9 @@ bool g_clientmodel_genericsendentity(entity this, entity to, int sf)
                if(sf & 0x80)
                {
                        WriteShort(MSG_ENTITY, this.lodmodelindex0);
-                       WriteShort(MSG_ENTITY, bound(0, this.loddistance1, 65535));
+                       WriteShort(MSG_ENTITY, bound(0, this.loddistance1, 32767));
                        WriteShort(MSG_ENTITY, this.lodmodelindex1);
-                       WriteShort(MSG_ENTITY, bound(0, this.loddistance2, 65535));
+                       WriteShort(MSG_ENTITY, bound(0, this.loddistance2, 32767));
                        WriteShort(MSG_ENTITY, this.lodmodelindex2);
                }
                else
@@ -140,8 +140,8 @@ bool g_clientmodel_genericsendentity(entity this, entity to, int sf)
                        WriteVector(MSG_ENTITY, this.movedir);
                        WriteByte(MSG_ENTITY, floor(this.lip * 255));
                }
-               WriteShort(MSG_ENTITY, bound(0, this.fade_start, 65535));
-               WriteShort(MSG_ENTITY, bound(0, this.fade_end, 65535));
+               WriteShort(MSG_ENTITY, bound(0, this.fade_start, 32767));
+               WriteShort(MSG_ENTITY, bound(0, this.fade_end, 32767));
                WriteByte(MSG_ENTITY, floor(this.alpha_max * 256));
                WriteByte(MSG_ENTITY, floor(this.alpha_min * 256));
                WriteByte(MSG_ENTITY, this.inactive);

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 7d3c1faca69520d5faa995bcfa443259d4ba668a..d80bdffa78d8aaf09e9e7a6faea3479aa5b49438 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -1056,7 +1056,7 @@ string getwelcomemessage(entity this)
        modifications = substring(modifications, 2, strlen(modifications) - 2);
 
        string versionmessage = GetClientVersionMessage(this);
-       string s = strcat(versionmessage, "^8\n^8\nhost is ^9", autocvar_hostname, "^8\n");
+       string s = strcat(versionmessage, "^8\n^8\nserver is ^9", autocvar_hostname, "^8\n");
 
        s = strcat(s, "^8\nmatch type is ^1", gamemode_name, "^8\n");
 

diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc
index cfbc0caf7a86facb47588c2838d14e84c8f0716d..7214c1550d13eab2396351747b83f951c76b3003 100644 (file)
--- a/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@ -69,7 +69,7 @@ void PingPLReport_Think(entity this)
        {
                WriteHeader(MSG_BROADCAST, TE_CSQC_PINGPLREPORT);
                WriteByte(MSG_BROADCAST, this.cnt);
-               WriteShort(MSG_BROADCAST, bound(1, CS(e).ping, 32767));
+               WriteShort(MSG_BROADCAST, bound(1, rint(CS(e).ping), 32767));
                WriteByte(MSG_BROADCAST, min(ceil(CS(e).ping_packetloss * 255), 255));
                WriteByte(MSG_BROADCAST, min(ceil(CS(e).ping_movementloss * 255), 255));
 

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index f5204648527d640b4eca0d63350265966eb99c68..c62cb55407beedd41fd03f9492cb1e78260d9a6b 100644 (file)
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -777,8 +777,6 @@ r_useportalculling 1
 set cl_lerpanim_maxdelta_framegroups 0.05 // must be faster than fastest weapon refire
 set cl_lerpanim_maxdelta_server 0.1 // must be slower than slowest server controlled anim (e.g. animinfo stuff)
 
-r_lerpsprites 1
-
 // autodemo deleting
 seta cl_autodemo_delete_keeprecords 0 "when 1, records with a newly made race/cts demo are kept even if cl_autodemo_delete is used to delete demos"