[nexuiz-commits] r7874 - in branches/nexuiz-2.0: . data data/qcsrc/client data/qcsrc/menu/nexuiz data/qcsrc/server server/rcon2irc
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Sep 23 05:45:13 EDT 2009
Author: div0
Date: 2009-09-23 05:45:12 -0400 (Wed, 23 Sep 2009)
New Revision: 7874
Removed:
branches/nexuiz-2.0/data/physics15.cfg
branches/nexuiz-2.0/data/physicsQBR.cfg
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/defaultNexuiz.cfg
branches/nexuiz-2.0/data/effectinfo.txt
branches/nexuiz-2.0/data/qcsrc/client/projectile.qc
branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_misc.c
branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc
branches/nexuiz-2.0/data/tooltips.db
branches/nexuiz-2.0/server/rcon2irc/suggestmap.pl
Log:
r7809 | div0 | 2009-09-15 08:14:48 -0400 (Tue, 15 Sep 2009) | 2 lines
rename physicsQBR.cfg to physics20.cfg now that nothing references it any more
r7810 | div0 | 2009-09-15 08:15:44 -0400 (Tue, 15 Sep 2009) | 2 lines
Nexuiz 1.0 player physics config
r7811 | div0 | 2009-09-15 08:21:54 -0400 (Tue, 15 Sep 2009) | 2 lines
give electro secondary a trail like in Nexuiz 1.0 :P
r7812 | div0 | 2009-09-15 08:44:13 -0400 (Tue, 15 Sep 2009) | 2 lines
Nexuiz physics did not change from 1.1 to 1.5. So physics15.cfg should be physics11.cfg.
r7813 | fruitiex | 2009-09-15 10:16:17 -0400 (Tue, 15 Sep 2009) | 2 lines
rcon2irc plugins by merlijn
r7814 | fruitiex | 2009-09-15 12:13:52 -0400 (Tue, 15 Sep 2009) | 2 lines
showspeed menu item replaced by cl_showspeed, cl_showacceleration added
r7815 | div0 | 2009-09-15 15:35:04 -0400 (Tue, 15 Sep 2009) | 2 lines
slightly better electro trail
r7816 | div0 | 2009-09-16 02:13:25 -0400 (Wed, 16 Sep 2009) | 2 lines
fix species loading
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-09-23 09:33:53 UTC (rev 7873)
+++ branches/nexuiz-2.0/.patchsets 2009-09-23 09:45:12 UTC (rev 7874)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7563,7565-7586,7589-7589,7592-7592,7595-7595,7597-7597,7599-7602,7605-7610,7612-7615,7619-7620,7623-7623,7626-7628,7630-7630,7644-7651,7656-7656,7658-7660,7663-7665,7670-7670,7672-7676,7678-7680,7686-7687,7689-7698,7701-7701,7703-7714,7717-7723,7731-7731,7735-7741,7744-7745,7752-7754,7756-7758,7761-7764,7771-7773,7775-7775,7778-7778,7781-7788,7795-7799
+revisions_applied = 1-7563,7565-7586,7589-7589,7592-7592,7595-7595,7597-7597,7599-7602,7605-7610,7612-7615,7619-7620,7623-7623,7626-7628,7630-7630,7644-7651,7656-7656,7658-7660,7663-7665,7670-7670,7672-7676,7678-7680,7686-7687,7689-7698,7701-7701,7703-7714,7717-7723,7731-7731,7735-7741,7744-7745,7752-7754,7756-7758,7761-7764,7771-7773,7775-7775,7778-7778,7781-7788,7795-7816
Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-09-23 09:33:53 UTC (rev 7873)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-09-23 09:45:12 UTC (rev 7874)
@@ -1578,7 +1578,8 @@
seta cl_showpressedkeys 0 "Show which movement keys someone is pressing: 1 for spectating, 2 for always"
seta cl_showpressedkeys_position "0.5 0.8" "1 0 would be upper right corner, 0.5 0.5 the center"
-seta cl_showspeed 0 "show the XY speed of the player, number selects unit (1 = qu/s (no postfix), 2 = qu/s, 3 = m/s, 4 = km/h, 5 = mph, 6 = knots)"
+seta cl_showspeed 0 "show the XY speed of the player"
+seta cl_showspeed_unit 0 "unit selection (0 = qu/s (no postfix), 1 = qu/s, 2 = m/s, 3 = km/h, 4 = mph, 5 = knots)"
seta cl_showspeed_z 0 "include the speed on the Z-axis"
seta cl_showspeed_size 30 "size of the numbers"
seta cl_showspeed_position 0.7 "Y-axis positioning of the numbers"
@@ -1586,7 +1587,7 @@
seta cl_showacceleration 0 "show the XY acceleration of the player"
seta cl_showacceleration_z 0 "include the speed on the Z-axis"
seta cl_showacceleration_size 40 "height of the bar"
-seta cl_showacceleration_scale 10 "X-axis scale of the bar"
+seta cl_showacceleration_scale 5 "X-axis scale of the bar"
seta cl_showacceleration_alpha 0.5 "alpha of the bar"
seta cl_showacceleration_color_custom 0 "0 = dynamic color depending on acceleration, 1 = use custom color"
seta cl_showacceleration_color "1 0 0" "color of the bar, needs cl_showacceleration_color_custom to be 1"
Modified: branches/nexuiz-2.0/data/effectinfo.txt
===================================================================
--- branches/nexuiz-2.0/data/effectinfo.txt 2009-09-23 09:33:53 UTC (rev 7873)
+++ branches/nexuiz-2.0/data/effectinfo.txt 2009-09-23 09:45:12 UTC (rev 7874)
@@ -1341,11 +1341,11 @@
// glowing vapor trail
// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_NEXUIZPLASMA"), from, to)
effect TR_NEXUIZPLASMA
-trailspacing 2
+trailspacing 1
type static
color 0x283880 0x283880
size 3 3
-tex 62 62
+tex 38 38
alpha 256 256 968
//velocityjitter 16 16 16
lightradius 90
Deleted: branches/nexuiz-2.0/data/physics15.cfg
===================================================================
--- branches/nexuiz-2.0/data/physics15.cfg 2009-09-23 09:33:53 UTC (rev 7873)
+++ branches/nexuiz-2.0/data/physics15.cfg 2009-09-23 09:45:12 UTC (rev 7874)
@@ -1,23 +0,0 @@
-// Nexuiz 1.5 physics
-sv_gravity 800
-sv_maxspeed 400
-sv_maxairspeed 50
-sv_accelerate 5.5
-sv_airaccelerate 5.5
-sv_friction 5
-edgefriction 1
-sv_stepheight 34
-sv_jumpvelocity 300
-sv_wateraccelerate -1
-sv_waterfriction -1
-sv_airaccel_sideways_friction 0
-sv_airaccel_qw 0
-sv_airstopaccelerate 0
-sv_airstrafeaccelerate 0
-sv_maxairstrafespeed 0
-sv_aircontrol 0
-sv_warsowbunny_turnaccel 0
-sv_warsowbunny_accel 0.1593
-sv_warsowbunny_topspeed 925
-sv_warsowbunny_backtosideratio 0.8
-sv_friction_on_land 0.25
Deleted: branches/nexuiz-2.0/data/physicsQBR.cfg
===================================================================
--- branches/nexuiz-2.0/data/physicsQBR.cfg 2009-09-23 09:33:53 UTC (rev 7873)
+++ branches/nexuiz-2.0/data/physicsQBR.cfg 2009-09-23 09:45:12 UTC (rev 7874)
@@ -1,23 +0,0 @@
-// Quake, Bunny Reintroduced (Nexuiz 2.0 to 2.4.2 physics)
-sv_gravity 800
-sv_maxspeed 400
-sv_maxairspeed 220
-sv_accelerate 5.5
-sv_airaccelerate 5.5
-sv_friction 5
-edgefriction 1
-sv_stepheight 34
-sv_jumpvelocity 300
-sv_wateraccelerate -1
-sv_waterfriction -1
-sv_airaccel_sideways_friction 0.3
-sv_airaccel_qw 0.93
-sv_airstopaccelerate 0
-sv_airstrafeaccelerate 0
-sv_maxairstrafespeed 0
-sv_aircontrol 0
-sv_warsowbunny_turnaccel 0
-sv_warsowbunny_accel 0.1593
-sv_warsowbunny_topspeed 925
-sv_warsowbunny_backtosideratio 0.8
-sv_friction_on_land 0
Modified: branches/nexuiz-2.0/data/qcsrc/client/projectile.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/projectile.qc 2009-09-23 09:33:53 UTC (rev 7873)
+++ branches/nexuiz-2.0/data/qcsrc/client/projectile.qc 2009-09-23 09:45:12 UTC (rev 7874)
@@ -47,6 +47,9 @@
case PROJECTILE_CRYLINK_BOUNCING:
trailparticles(self, particleeffectnum("TR_CRYLINKPLASMA"), from, to);
break;
+ case PROJECTILE_ELECTRO:
+ trailparticles(self, particleeffectnum("TR_NEXUIZPLASMA"), from, to);
+ break;
case PROJECTILE_ELECTRO_BEAM:
trailparticles(self, particleeffectnum("TR_NEXUIZPLASMA"), from, to);
break;
Modified: branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/sbar.qc 2009-09-23 09:33:53 UTC (rev 7873)
+++ branches/nexuiz-2.0/data/qcsrc/client/sbar.qc 2009-09-23 09:45:12 UTC (rev 7874)
@@ -1940,30 +1940,30 @@
float pos, conversion_factor;
string speed, unit;
- switch(cvar("cl_showspeed"))
+ switch(cvar("cl_showspeed_unit"))
{
default:
- case 1:
+ case 0:
unit = "";
conversion_factor = 1.0;
break;
- case 2:
+ case 1:
unit = " qu/s";
conversion_factor = 1.0;
break;
- case 3:
+ case 2:
unit = " m/s";
conversion_factor = 0.0254;
break;
- case 4:
+ case 3:
unit = " km/h";
conversion_factor = 0.0254 * 3.6;
break;
- case 5:
+ case 4:
unit = " mph";
conversion_factor = 0.0254 * 3.6 * 0.6213711922;
break;
- case 6:
+ case 5:
unit = " knots";
conversion_factor = 0.0254 * 1.943844492; // 1 m/s = 1.943844492 knots, because 1 knot = 1.852 km/h
break;
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_misc.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_misc.c 2009-09-23 09:33:53 UTC (rev 7873)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_misc.c 2009-09-23 09:45:12 UTC (rev 7874)
@@ -38,22 +38,31 @@
me.TR(me);
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "showfps", "Show frames per second"));
me.TR(me);
- me.TD(me, 1, 3, e = makeNexuizTextLabel(0, "Speedmeter:"));
+ me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_showspeed", "Speedometer"));
me.TR(me);
me.TDempty(me, 0.2);
- me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "0", "Off"));
- setDependent(e, "showtopspeed", 0, 0);
- me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "1", "in/s"));
- me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "2", "m/s"));
+ me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "cl_showspeed_unit", "0", "qu/s (hidden)"));
+ setDependent(e, "cl_showspeed", 1, 1);
+ me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "cl_showspeed_unit", "1", "qu/s"));
+ setDependent(e, "cl_showspeed", 1, 1);
+ me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "cl_showspeed_unit", "2", "m/s"));
+ setDependent(e, "cl_showspeed", 1, 1);
me.TR(me);
me.TDempty(me, 0.2);
- me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "3", "km/h"));
- me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "4", "mph"));
- me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "5", "knots"));
+ me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "cl_showspeed_unit", "3", "km/h"));
+ setDependent(e, "cl_showspeed", 1, 1);
+ me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "cl_showspeed_unit", "4", "mph"));
+ setDependent(e, "cl_showspeed", 1, 1);
+ me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "cl_showspeed_unit", "5", "knots"));
+ setDependent(e, "cl_showspeed", 1, 1);
me.TR(me);
+ me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_showacceleration", "Show accelerometer"));
+ me.TR(me);
me.TDempty(me, 0.2);
- me.TD(me, 1, 2.8, e = makeNexuizCheckBoxEx(-1, 0, "showtopspeed", "Also show top speed"));
- setDependent(e, "showspeed", 0.5, -0.5);
+ me.TD(me, 1, 2.8/2, e = makeNexuizTextLabel(0, "Accelerometer scale:"));
+ setDependent(e, "cl_showacceleration", 1, 1);
+ me.TD(me, 1, 2.8/2, e = makeNexuizSlider(1, 10, 0.5, "cl_showacceleration_scale"));
+ setDependent(e, "cl_showacceleration", 1, 1);
me.TR(me);
me.TR(me);
me.TDempty(me, 0.5);
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc 2009-09-23 09:33:53 UTC (rev 7873)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc 2009-09-23 09:45:12 UTC (rev 7874)
@@ -110,6 +110,7 @@
case "alien": s = SPECIES_ALIEN; break;
case "robot_shiny": s = SPECIES_ROBOT_SHINY; break;
case "robot_rusty": s = SPECIES_ROBOT_RUSTY; break;
+ case "robot_solid": s = SPECIES_ROBOT_SOLID; break;
case "animal": s = SPECIES_ANIMAL; break;
case "reserved": s = SPECIES_RESERVED; break;
}
Modified: branches/nexuiz-2.0/data/tooltips.db
===================================================================
--- branches/nexuiz-2.0/data/tooltips.db 2009-09-23 09:33:53 UTC (rev 7873)
+++ branches/nexuiz-2.0/data/tooltips.db 2009-09-23 09:45:12 UTC (rev 7874)
@@ -190,8 +190,10 @@
\showtime\Show current time of day, useful on screenshots
\showdate\Show current date, useful on screenshots
\showfps\Show your rendered frames per second
-\showspeed\Show your current speed
-\showtopspeed\Show your top speed, kept on the screen for a maximum of 3 seconds
+\cl_showspeed\Show the speed of the player
+\cl_showspeed_unit\Select the unit used by the speedometer. qu/s = in/s
+\cl_showacceleration\Show the acceleration of the player
+\cl_showacceleration_scale\Excaggerate the accelerometer by this scale multiplier
\NexuizSettingsDialog/Advanced settings...\Advanced settings where you can tweak every single variable of the game
\g_friendlyfire\Percentage of damage dealt to teammates
Modified: branches/nexuiz-2.0/server/rcon2irc/suggestmap.pl
===================================================================
--- branches/nexuiz-2.0/server/rcon2irc/suggestmap.pl 2009-09-23 09:33:53 UTC (rev 7873)
+++ branches/nexuiz-2.0/server/rcon2irc/suggestmap.pl 2009-09-23 09:45:12 UTC (rev 7874)
@@ -6,8 +6,7 @@
#read the suggest vote
[ dp => q{:vote:suggested:(.+):(\d+)} => sub {
my ($map, $id) = @_;
- my $nick = color_dp2irc $store{"playernick_byid_$id"};
- $nick ||= '(console)';
+ my $nick = $store{"playernick_byid_$id"} || 'console';
out irc => 0, "PRIVMSG $config{irc_channel} :* map suggested: \00304$map\017 by $nick\017";
return 0;
} ],
More information about the nexuiz-commits
mailing list