Merge remote branch 'origin/fruitiex/fruitbalance'

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index e73af35b4066757af8235043c1f99f603b06bef6..ea4b42fcc7510436b16b57fa3fff6724226473f2 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -2023,3 +2023,6 @@ r_polygonoffset_submodel_factor 0
 // once the issue is found, please revert back to the default of -14
 r_polygonoffset_decals_offset -100
 r_polygonoffset_decals_factor 0
+// this is mainly for _decal entities (their shaders should use "polygonoffset" shader parameter) - this is "good enough" as it seems, but smaller than the decals one so these don't zfight decals
+mod_q3shader_default_polygonoffset -50
+mod_q3shader_default_polygonfactor 0

diff --git a/gfx/menu/default/icon_aeslevel1.tga b/gfx/menu/default/icon_aeslevel1.tga
index f1e92735a1a3ccbf89702b8dc97b3877890324b7..7103e55b7468141f943d223d05c321cea593092e 100644 (file)
Binary files a/gfx/menu/default/icon_aeslevel1.tga and b/gfx/menu/default/icon_aeslevel1.tga differ

diff --git a/gfx/menu/default/icon_aeslevel2.tga b/gfx/menu/default/icon_aeslevel2.tga
index 7153820cd52c84b153d486e868b239f2508e678f..793b457692829f61f01c791b2010ffcc3a9a6a29 100644 (file)
Binary files a/gfx/menu/default/icon_aeslevel2.tga and b/gfx/menu/default/icon_aeslevel2.tga differ

diff --git a/gfx/menu/default/icon_aeslevel3.tga b/gfx/menu/default/icon_aeslevel3.tga
index c31bfe802e988d94d72b84ceeae36a4fb5ef9d3c..ec2f15bf2f056f3b9f8411224cfcd0837f2e2028 100644 (file)
Binary files a/gfx/menu/default/icon_aeslevel3.tga and b/gfx/menu/default/icon_aeslevel3.tga differ

diff --git a/gfx/menu/default/icon_aeslevel4.tga b/gfx/menu/default/icon_aeslevel4.tga
index 88963f8d840f66bb06b9fcb7a7c378e124a4e238..8f7f4669b81f01adaa6c41e42ca9d3f92abd4032 100644 (file)
Binary files a/gfx/menu/default/icon_aeslevel4.tga and b/gfx/menu/default/icon_aeslevel4.tga differ

diff --git a/gfx/menu/default/icon_aeslevel5.tga b/gfx/menu/default/icon_aeslevel5.tga
index 0ed332d8ac546d2880554d9915076650c6b55d84..8662b137b6c3d72ea0422fdc46181e25bcc82a22 100644 (file)
Binary files a/gfx/menu/default/icon_aeslevel5.tga and b/gfx/menu/default/icon_aeslevel5.tga differ

diff --git a/gfx/menu/luminos/icon_aeslevel1.tga b/gfx/menu/luminos/icon_aeslevel1.tga
index f1e92735a1a3ccbf89702b8dc97b3877890324b7..7103e55b7468141f943d223d05c321cea593092e 100644 (file)
Binary files a/gfx/menu/luminos/icon_aeslevel1.tga and b/gfx/menu/luminos/icon_aeslevel1.tga differ

diff --git a/gfx/menu/luminos/icon_aeslevel2.tga b/gfx/menu/luminos/icon_aeslevel2.tga
index 7153820cd52c84b153d486e868b239f2508e678f..793b457692829f61f01c791b2010ffcc3a9a6a29 100644 (file)
Binary files a/gfx/menu/luminos/icon_aeslevel2.tga and b/gfx/menu/luminos/icon_aeslevel2.tga differ

diff --git a/gfx/menu/luminos/icon_aeslevel3.tga b/gfx/menu/luminos/icon_aeslevel3.tga
index c31bfe802e988d94d72b84ceeae36a4fb5ef9d3c..ec2f15bf2f056f3b9f8411224cfcd0837f2e2028 100644 (file)
Binary files a/gfx/menu/luminos/icon_aeslevel3.tga and b/gfx/menu/luminos/icon_aeslevel3.tga differ

diff --git a/gfx/menu/luminos/icon_aeslevel4.tga b/gfx/menu/luminos/icon_aeslevel4.tga
index 88963f8d840f66bb06b9fcb7a7c378e124a4e238..8f7f4669b81f01adaa6c41e42ca9d3f92abd4032 100644 (file)
Binary files a/gfx/menu/luminos/icon_aeslevel4.tga and b/gfx/menu/luminos/icon_aeslevel4.tga differ

diff --git a/gfx/menu/luminos/icon_aeslevel5.tga b/gfx/menu/luminos/icon_aeslevel5.tga
index 0ed332d8ac546d2880554d9915076650c6b55d84..8662b137b6c3d72ea0422fdc46181e25bcc82a22 100644 (file)
Binary files a/gfx/menu/luminos/icon_aeslevel5.tga and b/gfx/menu/luminos/icon_aeslevel5.tga differ

diff --git a/gfx/menu/xaw/icon_aeslevel1.tga b/gfx/menu/xaw/icon_aeslevel1.tga
index f1e92735a1a3ccbf89702b8dc97b3877890324b7..7103e55b7468141f943d223d05c321cea593092e 100644 (file)
Binary files a/gfx/menu/xaw/icon_aeslevel1.tga and b/gfx/menu/xaw/icon_aeslevel1.tga differ

diff --git a/gfx/menu/xaw/icon_aeslevel2.tga b/gfx/menu/xaw/icon_aeslevel2.tga
index 7153820cd52c84b153d486e868b239f2508e678f..793b457692829f61f01c791b2010ffcc3a9a6a29 100644 (file)
Binary files a/gfx/menu/xaw/icon_aeslevel2.tga and b/gfx/menu/xaw/icon_aeslevel2.tga differ

diff --git a/gfx/menu/xaw/icon_aeslevel3.tga b/gfx/menu/xaw/icon_aeslevel3.tga
index c31bfe802e988d94d72b84ceeae36a4fb5ef9d3c..ec2f15bf2f056f3b9f8411224cfcd0837f2e2028 100644 (file)
Binary files a/gfx/menu/xaw/icon_aeslevel3.tga and b/gfx/menu/xaw/icon_aeslevel3.tga differ

diff --git a/gfx/menu/xaw/icon_aeslevel4.tga b/gfx/menu/xaw/icon_aeslevel4.tga
index 88963f8d840f66bb06b9fcb7a7c378e124a4e238..8f7f4669b81f01adaa6c41e42ca9d3f92abd4032 100644 (file)
Binary files a/gfx/menu/xaw/icon_aeslevel4.tga and b/gfx/menu/xaw/icon_aeslevel4.tga differ

diff --git a/gfx/menu/xaw/icon_aeslevel5.tga b/gfx/menu/xaw/icon_aeslevel5.tga
index 0ed332d8ac546d2880554d9915076650c6b55d84..8662b137b6c3d72ea0422fdc46181e25bcc82a22 100644 (file)
Binary files a/gfx/menu/xaw/icon_aeslevel5.tga and b/gfx/menu/xaw/icon_aeslevel5.tga differ

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 971a791aad847ac58625919380c4b6e81412cba9..d6575102ab387e2db66032a1c861d8b622cc0ccc 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -3895,11 +3895,17 @@ void HUD_VoteWindow(void)
        }
 
        // draw the progress bars
-       drawsetcliparea(pos_x, pos_y, mySize_x * 0.5 * (vote_yescount/vote_needed), mySize_y);
-       drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_prog", eX * mySize_x + eY * (3/8) * mySize_y, '1 1 1', a, DRAWFLAG_NORMAL);
+       if(vote_yescount && vote_needed)
+       {
+               drawsetcliparea(pos_x, pos_y, mySize_x * 0.5 * (vote_yescount/vote_needed), mySize_y);
+               drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_prog", eX * mySize_x + eY * (3/8) * mySize_y, '1 1 1', a, DRAWFLAG_NORMAL);
+       }
 
-       drawsetcliparea(pos_x + mySize_x - mySize_x * 0.5 * (vote_nocount/vote_needed), pos_y, mySize_x * 0.5, mySize_y);
-       drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_prog", eX * mySize_x + eY * (3/8) * mySize_y, '1 1 1', a, DRAWFLAG_NORMAL);
+       if(vote_nocount && vote_needed)
+       {
+               drawsetcliparea(pos_x + mySize_x - mySize_x * 0.5 * (vote_nocount/vote_needed), pos_y, mySize_x * 0.5, mySize_y);
+               drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_prog", eX * mySize_x + eY * (3/8) * mySize_y, '1 1 1', a, DRAWFLAG_NORMAL);
+       }
 
        drawresetcliparea();
 

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c
index b8b33c9739e756f4b4cdbf8872de035c6611648b..5f6262cf45e5bdb508f69dd32f7117cd4b9c673e 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c
@@ -198,19 +198,25 @@ void XonoticServerInfoDialog_loadServerInfo(entity me, float i)
                        if(cvar("crypto_aeslevel") >= 3)
                                me.currentServerEncrypt = "not supported (can't connect)";
                        else
-                               me.currentServerEncrypt = "not supported";
+                               me.currentServerEncrypt = "not supported (won't encrypt)";
                        break;
                case 1:
-                       me.currentServerEncrypt = "supported";
+                       if(cvar("crypto_aeslevel") >= 2)
+                               me.currentServerEncrypt = "supported (will encrypt)";
+                       else
+                               me.currentServerEncrypt = "supported (won't encrypt)";
                        break;
                case 2:
-                       me.currentServerEncrypt = "requested";
+                       if(cvar("crypto_aeslevel") >= 1)
+                               me.currentServerEncrypt = "requested (will encrypt)";
+                       else
+                               me.currentServerEncrypt = "requested (won't encrypt)";
                        break;
                case 3:
                        if(cvar("crypto_aeslevel") <= 0)
                                me.currentServerEncrypt = "required (can't connect)";
                        else
-                               me.currentServerEncrypt = "required";
+                               me.currentServerEncrypt = "required (will encrypt)";
                        break;
        }
        me.encryptLabel.setText(me.encryptLabel, me.currentServerEncrypt);

diff --git a/textures/nexball/ball.tga b/textures/nexball/ball.tga
new file mode 100644 (file)
index 0000000..6f96add
Binary files /dev/null and b/textures/nexball/ball.tga differ

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

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