Merge remote branch 'origin/fruitiex/panelhud'

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 8dcaeacc93e4bf8108fc378b9de58fc8facd5a53..a92616304ee6dfe5e2f665e0ab3c08b2523fbf49 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -88,9 +88,9 @@ alias movetoteam_auto "sv_cmd movetoteam $1 auto"
 mod_q3bsp_lightmapmergepower 4
 
 // player defaults
-_cl_color 102
+_cl_color 112
 _cl_name Player
-_cl_playermodel models/player/umbra.iqm
+_cl_playermodel models/player/erebus.iqm
 _cl_playerskin 0
 seta crosshair 16
 seta crosshair_color "0.6 0.8 1"
@@ -386,6 +386,7 @@ sv_jumpstep 1 // step up stairs while jumping, makes it easier to reach ledges
 set ekg 0      "Throw huge amounts of gibs"
 
 cl_movement 1
+cl_movement_track_canjump 0
 cl_stairsmoothspeed 200
 
 seta cl_autoswitch 1 "automatically switch to newly picked up weapons if they are better than what you are carrying"
@@ -867,7 +868,7 @@ r_picmipsprites 0 // Xonotic uses sprites that should never be picmipped (team m
 r_picmipworld 1
 gl_picmip_world 0
 gl_picmip_sprites 0
-gl_picmip_other 2 // so, picmip -2 is best possible quality
+gl_picmip_other 1 // so, picmip -1 is best possible quality
 r_mipsprites 1
 r_mipskins 1
 r_shadow_realtime_world_lightmaps 1

diff --git a/effects-ultimate.cfg b/effects-ultimate.cfg
index f6e002ba6d1d69d19423656a818c4fcb0278ddb0..5a6deb9b9430f71a4bc3ce20a4ff8e180caee048 100644 (file)
--- a/effects-ultimate.cfg
+++ b/effects-ultimate.cfg
@@ -2,7 +2,7 @@ cl_decals 1
 cl_decals_time 10
 cl_particles_quality 1
 gl_flashblend 0
-gl_picmip -2
+gl_picmip -1
 gl_texture_anisotropy 16
 mod_q3bsp_nolightmaps 0
 r_bloom 1

diff --git a/effects-ultra.cfg b/effects-ultra.cfg
index e9f7b0cc76d33fe7cda7f4327dd308d20290622b..b6d7f04aa4b9f2d5121bce06e326877f22d72a99 100644 (file)
--- a/effects-ultra.cfg
+++ b/effects-ultra.cfg
@@ -2,7 +2,7 @@ cl_decals 1
 cl_decals_time 10
 cl_particles_quality 1
 gl_flashblend 0
-gl_picmip -2
+gl_picmip -1
 gl_texture_anisotropy 16
 mod_q3bsp_nolightmaps 0
 r_bloom 1

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 12c810f16c7d43fcfbe55f644b5b5c5528785cff..fea11ec930d644bd47feadd9804851e1581f73df 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1334,7 +1334,7 @@ void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto, -2
                        self.killindicator.nextthink = time + (self.lip) * 0.05;
                        self.killindicator.cnt = ceil(killtime);
                        self.killindicator.count = bound(0, ceil(killtime), 10);
-                       sprint(self, strcat("^1You'll be dead in ", ftos(self.killindicator.cnt), " seconds\n"));
+                       //sprint(self, strcat("^1You'll be dead in ", ftos(self.killindicator.cnt), " seconds\n"));
 
                        for(e = world; (e = find(e, classname, "body")) != world; )
                        {