Merge branch 'master' into mirceakitsune/weapon_hagar_secondary_load

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
index 269b07c526ce3dc2293a7cf67e38bb2c81066359..38580b606f59b7d6cc1816e2cc9251f82e79d795 100644 (file)
--- a/_hud_descriptions.cfg
+++ b/_hud_descriptions.cfg
@@ -110,6 +110,7 @@ seta hud_panel_notify_bg_alpha "" "if set to something else than \"\" = override
 seta hud_panel_notify_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_panel_notify_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 seta hud_panel_notify_flip "" "order the list top to bottom instead of bottom to top"
+seta hud_panel_notify_fontsize "" "multiplier for the font size used for player names in the panel"
 seta hud_panel_notify_print "" "also con_notify print the messages that are shown on the notify panel"
 
 seta hud_panel_timer "" "enable/disable this panel"

diff --git a/annoy_balance.cfg b/annoy_balance.cfg
new file mode 100644 (file)
index 0000000..184eb4e
--- /dev/null
+++ b/annoy_balance.cfg
@@ -0,0 +1,21 @@
+// TEMPORARY CONFIG FOR BALANCE TESTING PURPOSES
+
+// ANNOY people with the BALANCE
+alias annoy                "sv_cmd adminmsg 0 \"${* q}\" 70"
+       // show message for 70 sec, clear previous one
+alias annoy_s              "annoy $*; echo \ 1SERVER^7: $*"
+       // annoy_s goes to rcon2irc (this echo fakes a chat message's output)
+alias printbalance         "annoy NOTE: Current balance is ^1$curbalance"
+       // refresh the balance status bar (call this every 60 sec)
+alias printbalance_s       "annoy_s NOTE: Next match will run ^1$curbalance"
+       // announce the balance for next match
+alias switchbalance_samual "exec balanceXonotic.cfg; set curbalance fruit; printbalance_s"
+alias switchbalance_fruit  "exec balanceSamual.cfg; set curbalance samual; printbalance_s"
+alias switchbalance        "switchbalance_$curbalance"
+       // toggle between the balances
+alias sv_hook_gameend      "switchbalance"
+       // do this at the end of each match
+set curbalance fruit
+alias annoybalance         "printbalance; defer 60 annoybalance"
+annoybalance
+       // our timer
\ No newline at end of file

diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index a59faa67ff3b28ff4da29002b0fcd9deb7981822..a894d1e802708326fc2a0e784ae7fe3a15186103 100644 (file)
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -115,7 +115,7 @@ set g_balance_health_regenlinear 5
 set g_balance_pause_health_regen 5
 set g_balance_pause_health_regen_spawn 0
 set g_balance_health_rot 0.04
-set g_balance_health_rotlinear 2
+set g_balance_health_rotlinear 1
 set g_balance_pause_health_rot 0.5
 set g_balance_pause_health_rot_spawn 5
 set g_balance_health_regenstable 100
@@ -124,7 +124,7 @@ set g_balance_health_limit 999
 set g_balance_armor_regen 0
 set g_balance_armor_regenlinear 0
 set g_balance_armor_rot 0.04
-set g_balance_armor_rotlinear 2
+set g_balance_armor_rotlinear 1
 set g_balance_pause_armor_rot 1
 set g_balance_pause_armor_rot_spawn 5
 set g_balance_armor_regenstable 100

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 6aa741ebd99ce947e72bd5cc732dc6519a5edbf0..d0314b1213e66da59f9964ba3397b4880c53defa 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1423,8 +1423,8 @@ seta hud_panel_weapons_ammo_full_fuel 100 "show 100% of the status bar at this a
 
 seta hud_panel_ammo_maxammo "40" "when you have this much ammo, the ammo status bar is full"
 
-seta hud_panel_healtharmor_maxhealth "250" "when you have this much health, the health status bar is full"
-seta hud_panel_healtharmor_maxarmor "150" "when you have this much armor, the armor status bar is full"
+seta hud_panel_healtharmor_maxhealth "200" "when you have this much health, the health status bar is full"
+seta hud_panel_healtharmor_maxarmor "200" "when you have this much armor, the armor status bar is full"
 
 seta hud_panel_notify_time 10 "time that a new entry stays until it fades out"
 seta hud_panel_notify_fadetime 3 "fade out time"

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 6e2813a2cf53c615f26a0eb8671a5863b8fa3479..6a01cb556c59dc9b34c6220a6ef7088c00850380 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -1096,7 +1096,7 @@ void CSQC_UpdateView(float w, float h)
                                        
 
                                // handle the values
-                               if (activeweapon == WEP_NEX && nex_charge && autocvar_crosshair_ring_nex) // ring around crosshair representing velocity-dependent damage for the nex
+                               if (autocvar_crosshair_ring && activeweapon == WEP_NEX && nex_charge && autocvar_crosshair_ring_nex) // ring around crosshair representing velocity-dependent damage for the nex
                                {
                                        if (nex_chargepool || use_nex_chargepool) { 
                                                use_nex_chargepool = 1; 
@@ -1116,7 +1116,7 @@ void CSQC_UpdateView(float w, float h)
                                        ring_rgb = wcross_color;
                                        ring_image = "gfx/crosshair_ring_nexgun.tga";
                                }
-                               else if (activeweapon == WEP_MINE_LAYER && minelayer_maxmines && autocvar_crosshair_ring_minelayer) 
+                               else if (autocvar_crosshair_ring && activeweapon == WEP_MINE_LAYER && minelayer_maxmines && autocvar_crosshair_ring_minelayer) 
                                {
                                        ring_value = bound(0, getstati(STAT_LAYED_MINES) / minelayer_maxmines, 1); // if you later need to use the count of bullets in another place, then add a float for it. For now, no need to.
                                        ring_alpha = autocvar_crosshair_ring_minelayer_alpha;

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 4728284a402562876d75286180e9cc935f27cedd..ce8b608fce346d2f29d8e5989271a465895e1993 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -89,11 +89,12 @@ void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector the
 
 vector HUD_Get_Num_Color (float x, float maxvalue)
 {
+       float blinkingamt;
        vector color;
-       if(x > maxvalue) {
-               color_x = 0;
+       if(x >= maxvalue) {
+               color_x = sin(2*M_PI*time);
                color_y = 1;
-               color_z = 0;
+               color_z = sin(2*M_PI*time);
        }
        else if(x > maxvalue * 0.75) {
                color_x = 0.4 - (x-150)*0.02 * 0.4; //red value between 0.4 -> 0
@@ -120,6 +121,14 @@ vector HUD_Get_Num_Color (float x, float maxvalue)
                color_y = 0;
                color_z = 0;
        }
+
+       blinkingamt = (1 - x/maxvalue/0.25);
+       if(blinkingamt > 0)
+       {
+               color_x = color_x - color_x * blinkingamt * sin(2*M_PI*time);
+               color_y = color_y - color_y * blinkingamt * sin(2*M_PI*time);
+               color_z = color_z - color_z * blinkingamt * sin(2*M_PI*time);
+       }
        return color;
 }
 
@@ -508,6 +517,7 @@ void HUD_Panel_ExportCfg(string cfgname)
                                        HUD_Write_PanelCvar_q("_progressbar");
                                        HUD_Write_PanelCvar_q("_progressbar_strength");
                                        HUD_Write_PanelCvar_q("_progressbar_shield");
+                                       HUD_Write_PanelCvar_q("_text");
                                        break;
                                case HUD_PANEL_HEALTHARMOR:
                                        HUD_Write_PanelCvar_q("_flip");
@@ -520,6 +530,7 @@ void HUD_Panel_ExportCfg(string cfgname)
                                        break;
                                case HUD_PANEL_NOTIFY:
                                        HUD_Write_PanelCvar_q("_flip");
+                                       HUD_Write_PanelCvar_q("_fontsize");
                                        HUD_Write_PanelCvar_q("_print");
                                        break;
                                case HUD_PANEL_RADAR: