[nexuiz-commits] r8034 - in branches/nexuiz-2.0: . data data/qcsrc/client data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Oct 3 13:48:29 EDT 2009
Author: div0
Date: 2009-10-03 13:48:29 -0400 (Sat, 03 Oct 2009)
New Revision: 8034
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/balance.cfg
branches/nexuiz-2.0/data/balance25.cfg
branches/nexuiz-2.0/data/balanceHavoc.cfg
branches/nexuiz-2.0/data/balanceSamual.cfg
branches/nexuiz-2.0/data/defaultNexuiz.cfg
branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
branches/nexuiz-2.0/data/qcsrc/server/constants.qh
Log:
r8029 | div0 | 2009-10-03 12:11:00 -0400 (Sat, 03 Oct 2009) | 2 lines
fix the sbar change
r8030 | fruitiex | 2009-10-03 12:28:18 -0400 (Sat, 03 Oct 2009) | 2 lines
fade out the keyhunt icons when opening the menu
r8031 | div0 | 2009-10-03 12:55:02 -0400 (Sat, 03 Oct 2009) | 2 lines
slower CR refire (2.5 balance)
r8032 | fruitiex | 2009-10-03 13:08:14 -0400 (Sat, 03 Oct 2009) | 2 lines
new cvar for enabling/disabling the weapon icons
r8033 | fruitiex | 2009-10-03 13:10:38 -0400 (Sat, 03 Oct 2009) | 2 lines
cvar checksums
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-10-03 17:10:38 UTC (rev 8033)
+++ branches/nexuiz-2.0/.patchsets 2009-10-03 17:48:29 UTC (rev 8034)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7945,7948-7948,7951-7990,7993-8027
+revisions_applied = 1-7945,7948-7948,7951-7990,7993-8033
Modified: branches/nexuiz-2.0/data/balance.cfg
===================================================================
--- branches/nexuiz-2.0/data/balance.cfg 2009-10-03 17:10:38 UTC (rev 8033)
+++ branches/nexuiz-2.0/data/balance.cfg 2009-10-03 17:48:29 UTC (rev 8034)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 9b590c8f7c3065d917ac8e2e5e842a88
+set cvar_check_balance 7181a5458cca8abd093e2032a13affb3
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
Modified: branches/nexuiz-2.0/data/balance25.cfg
===================================================================
--- branches/nexuiz-2.0/data/balance25.cfg 2009-10-03 17:10:38 UTC (rev 8033)
+++ branches/nexuiz-2.0/data/balance25.cfg 2009-10-03 17:48:29 UTC (rev 8034)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 9b590c8f7c3065d917ac8e2e5e842a88
+set cvar_check_balance 7181a5458cca8abd093e2032a13affb3
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
@@ -493,7 +493,7 @@
set g_balance_campingrifle_primary_force 2
set g_balance_campingrifle_primary_speed 35000
set g_balance_campingrifle_primary_lifetime 5
-set g_balance_campingrifle_primary_refire 0.7
+set g_balance_campingrifle_primary_refire 0.8
set g_balance_campingrifle_primary_animtime 0.3
set g_balance_campingrifle_primary_ammo 10
set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu
Modified: branches/nexuiz-2.0/data/balanceHavoc.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceHavoc.cfg 2009-10-03 17:10:38 UTC (rev 8033)
+++ branches/nexuiz-2.0/data/balanceHavoc.cfg 2009-10-03 17:48:29 UTC (rev 8034)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 9b590c8f7c3065d917ac8e2e5e842a88
+set cvar_check_balance 7181a5458cca8abd093e2032a13affb3
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
Modified: branches/nexuiz-2.0/data/balanceSamual.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceSamual.cfg 2009-10-03 17:10:38 UTC (rev 8033)
+++ branches/nexuiz-2.0/data/balanceSamual.cfg 2009-10-03 17:48:29 UTC (rev 8034)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 9b590c8f7c3065d917ac8e2e5e842a88
+set cvar_check_balance 7181a5458cca8abd093e2032a13affb3
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-10-03 17:10:38 UTC (rev 8033)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-10-03 17:48:29 UTC (rev 8034)
@@ -26,7 +26,7 @@
seta g_configversion 0 "Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1 Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg"
// default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar)
-set cvar_check_default 091f36c4fb0d7b22bbd2d2fdff8b1447
+set cvar_check_default c0254c4c1cc8836cd7cc3989f4ad25f4
// Nexuiz version (formatted for machines)
// used to determine if a client version is compatible
@@ -1247,9 +1247,10 @@
seta sbar_scoreboard_alpha_bg 0.6 "scoreboard background alpha"
seta sbar_scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard"
seta sbar_hudselector 1 "0 = health/armor positions flipped, 1 = default hud layout, 2 = combined health and armor display"
-seta sbar_hud_accuracy 0 "1 = weapon accuracy on HUD"
+seta sbar_hud_accuracy 0 "1 = weapon accuracy on the weapon icons"
seta sbar_showcurrentammo 0 "0 = show all ammo types, 1 = show only the ammo type of the current weapon"
seta sbar_increment_maptime 0 "1 = show elapsed time on the timer"
+seta sbar_showweaponicons 1 "1 = show icons of weapons that you have"
// for menu server list (eventually make them have engine support?)
seta menu_slist_showfull 1 "show servers even if they are full and have no slots to join"
Modified: branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/sbar.qc 2009-10-03 17:10:38 UTC (rev 8033)
+++ branches/nexuiz-2.0/data/qcsrc/client/sbar.qc 2009-10-03 17:48:29 UTC (rev 8034)
@@ -2527,8 +2527,8 @@
Sbar_DrawXNum_Colored(armor_pos, x, 24, sbar_alpha_fg);
}
else {
- drawpic(armor_pos + '78 -4.5 0', "gfx/hud/sb_armor", '32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
- Sbar_DrawXNum_Colored(armor_pos, x, 24, (x+10)/55 * sbar_alpha_fg);
+ drawpic(armor_pos + '78 -4.5 0', "gfx/hud/sb_armor", '32 32 0', '1 1 1', (x+10)/55 * sbar_alpha_fg, DRAWFLAG_NORMAL);
+ Sbar_DrawXNum_Colored(armor_pos, x, 24, sbar_alpha_fg);
}
}
@@ -2538,19 +2538,6 @@
Sbar_DrawXNum_Colored(health_pos, x, 24, sbar_alpha_fg);
}
- // weapon icons
- x = 1.0;
- Sbar_DrawWeapon_Clear();
- for(i = 1; i <= 24; ++i)
- {
- if(weaponimpulse[i-1] >= 0)
- if(stat_weapons & x)
- {
- Sbar_DrawWeapon(i-1, fade, (i == activeweapon), i);
- }
- x *= 2;
- }
-
// ammo
float a; // i will be the ammo type (already declared), a will contain how much ammo there is of type i
@@ -2638,7 +2625,20 @@
// draw strength/invincibility icon and timer
CSQC_Strength_Timer();
-
+
+ // weapon icons
+ if(cvar("sbar_showweaponicons")) {
+ x = 1.0;
+ Sbar_DrawWeapon_Clear();
+ for(i = 1; i <= 24; ++i)
+ {
+ if(weaponimpulse[i-1] >= 0)
+ if(stat_weapons & x)
+ Sbar_DrawWeapon(i-1, fade, (i == activeweapon), i);
+ x *= 2;
+ }
+ }
+
// draw gametype specific icons
if(gametype == GAME_KEYHUNT)
CSQC_kh_hud();
@@ -2856,6 +2856,8 @@
aa = 0.5;
break;
}
+ a = a * sbar_alpha_fg;
+ aa = aa * sbar_alpha_fg;
if(a > 0)
{
switch(keyteam)
Modified: branches/nexuiz-2.0/data/qcsrc/server/constants.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/constants.qh 2009-10-03 17:10:38 UTC (rev 8033)
+++ branches/nexuiz-2.0/data/qcsrc/server/constants.qh 2009-10-03 17:48:29 UTC (rev 8034)
@@ -1,5 +1,5 @@
-string CVAR_CHECK_DEFAULT = "091f36c4fb0d7b22bbd2d2fdff8b1447";
-string CVAR_CHECK_BALANCE = "9b590c8f7c3065d917ac8e2e5e842a88";
+string CVAR_CHECK_DEFAULT = "c0254c4c1cc8836cd7cc3989f4ad25f4";
+string CVAR_CHECK_BALANCE = "7181a5458cca8abd093e2032a13affb3";
float FALSE = 0;
float TRUE = 1;
More information about the nexuiz-commits
mailing list