[nexuiz-commits] r8067 - in branches/nexuiz-2.0: . data data/qcsrc/menu/nexuiz data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Wed Oct 7 02:24:25 EDT 2009


Author: div0
Date: 2009-10-07 02:24:25 -0400 (Wed, 07 Oct 2009)
New Revision: 8067

Added:
   branches/nexuiz-2.0/data/physicsNexrun_defrag.cfg
   branches/nexuiz-2.0/data/weaponsNexrun_defrag.cfg
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/defaultHavoc.cfg
   branches/nexuiz-2.0/data/defaultNexuiz.cfg
   branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_radar.c
   branches/nexuiz-2.0/data/qcsrc/server/constants.qh
Log:
r8062 | lordhavoc | 2009-10-05 19:23:49 -0400 (Mon, 05 Oct 2009) | 2 lines
changed havoc to use cl_nolerp 1 and cl_netfps 125
r8063 | samual | 2009-10-06 13:27:15 -0400 (Tue, 06 Oct 2009) | 1 line
Fix #557: Use seta for joystick cvars so they're saved to the configuration file
r8064 | fruitiex | 2009-10-06 13:35:06 -0400 (Tue, 06 Oct 2009) | 2 lines
cvar hashes
r8065 | fruitiex | 2009-10-06 13:48:05 -0400 (Tue, 06 Oct 2009) | 2 lines
A "nerfed" Nexrun physics set for q3a map compatibility. Will probably become one of two different "modes" of Nexrun (as cpm and vq3 are in defrag). The weaponsNexrun* configs are still not complete and will change in the future.
r8066 | fruitiex | 2009-10-06 15:23:04 -0400 (Tue, 06 Oct 2009) | 2 lines
fix a slider not fitting into the dialog, discovered by Dib :)


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-10-06 19:23:04 UTC (rev 8066)
+++ branches/nexuiz-2.0/.patchsets	2009-10-07 06:24:25 UTC (rev 8067)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7945,7948-7948,7951-7990,7993-8060
+revisions_applied = 1-7945,7948-7948,7951-7990,7993-8066

Modified: branches/nexuiz-2.0/data/balance.cfg
===================================================================
--- branches/nexuiz-2.0/data/balance.cfg	2009-10-06 19:23:04 UTC (rev 8066)
+++ branches/nexuiz-2.0/data/balance.cfg	2009-10-07 06:24:25 UTC (rev 8067)
@@ -3,7 +3,7 @@
 //
 // And... don't forget to edit the other balance*.cfg too.
 
-set cvar_check_balance 78188ae599396a346b72738a042880c5
+set cvar_check_balance f419825b823199b15cb1aafdb4e5422a
 
 // {{{ 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-06 19:23:04 UTC (rev 8066)
+++ branches/nexuiz-2.0/data/balance25.cfg	2009-10-07 06:24:25 UTC (rev 8067)
@@ -3,7 +3,7 @@
 //
 // And... don't forget to edit the other balance*.cfg too.
 
-set cvar_check_balance 78188ae599396a346b72738a042880c5
+set cvar_check_balance f419825b823199b15cb1aafdb4e5422a
 
 // {{{ weapon replacement
 // NOTE: this only replaces weapons on the map

Modified: branches/nexuiz-2.0/data/balanceHavoc.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceHavoc.cfg	2009-10-06 19:23:04 UTC (rev 8066)
+++ branches/nexuiz-2.0/data/balanceHavoc.cfg	2009-10-07 06:24:25 UTC (rev 8067)
@@ -3,7 +3,7 @@
 //
 // And... don't forget to edit the other balance*.cfg too.
 
-set cvar_check_balance 78188ae599396a346b72738a042880c5
+set cvar_check_balance f419825b823199b15cb1aafdb4e5422a
 
 // {{{ 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-06 19:23:04 UTC (rev 8066)
+++ branches/nexuiz-2.0/data/balanceSamual.cfg	2009-10-07 06:24:25 UTC (rev 8067)
@@ -3,7 +3,7 @@
 //
 // And... don't forget to edit the other balance*.cfg too.
 
-set cvar_check_balance 78188ae599396a346b72738a042880c5
+set cvar_check_balance f419825b823199b15cb1aafdb4e5422a
 
 // {{{ weapon replacement
 // NOTE: this only replaces weapons on the map

Modified: branches/nexuiz-2.0/data/defaultHavoc.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultHavoc.cfg	2009-10-06 19:23:04 UTC (rev 8066)
+++ branches/nexuiz-2.0/data/defaultHavoc.cfg	2009-10-07 06:24:25 UTC (rev 8067)
@@ -18,6 +18,8 @@
 g_nexball_goalleadlimit 0
 
 crosshair 6
+cl_netfps 125
+cl_nolerp 1
 cl_bob 0
 cl_bobmodel 0
 v_kicktime 0

Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-10-06 19:23:04 UTC (rev 8066)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-10-07 06:24:25 UTC (rev 8067)
@@ -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
@@ -244,7 +244,7 @@
 cl_bob 0.01 // how much view moves up/down when moving (does not move if cl_bobcycle is 0, but still enables cl_bobmodel), default is 0.02
 cl_bobmodel 1 // whether to have gun model move around on screen when moving (only works if cl_bob is not 0), default is 1
 cl_rollangle 0 // amount of view tilt when strafing, default is 2.0
-v_kicktime 0.5 // how long damage kicks of the view last, default is 0.5 seconds
+v_kicktime 0 // how long damage kicks of the view last, default is 0 seconds
 gl_polyblend 0.5 // whether to use screen tints, default is 1
 r_motionblur 0 // motion blur value, default is 0
 r_damageblur 0 // motion blur when damaged, default is 0
@@ -921,22 +921,22 @@
 bind JOY10 "+show_info"
 bind JOY11 "+showscores"
 bind JOY12 "+con_chat_maximize"
-set joyadvanced "1"
-set joyadvaxisr "2"
-set joyadvaxisx "3"
-set joyadvaxisy "1"
-set joyadvaxisz "4"
-set joysidesensitivity "1.0"
-set joypitchsensitivity "0.9"
-set joyyawsensitivity "-1.8"
+seta joyadvanced "1"
+seta joyadvaxisr "2"
+seta joyadvaxisx "3"
+seta joyadvaxisy "1"
+seta joyadvaxisz "4"
+seta joysidesensitivity "1.0"
+seta joypitchsensitivity "0.9"
+seta joyyawsensitivity "-1.8"
 // SDL only
-set joy_deadzoneforward "0.05"
-set joy_deadzonepitch "0.05"
-set joy_deadzoneside "0.05"
-set joy_deadzoneup "0.05"
-set joy_deadzoneyaw "0.05"
-set joy_sensitivitypitch "0.9"
-set joy_sensitivityyaw "-1.8"
+seta joy_deadzoneforward "0.05"
+seta joy_deadzonepitch "0.05"
+seta joy_deadzoneside "0.05"
+seta joy_deadzoneup "0.05"
+seta joy_deadzoneyaw "0.05"
+seta joy_sensitivitypitch "0.9"
+seta joy_sensitivityyaw "-1.8"
 
 // team say
 bind kp_ins messagemode

Copied: branches/nexuiz-2.0/data/physicsNexrun_defrag.cfg (from rev 8066, trunk/data/physicsNexrun_defrag.cfg)
===================================================================
--- branches/nexuiz-2.0/data/physicsNexrun_defrag.cfg	                        (rev 0)
+++ branches/nexuiz-2.0/data/physicsNexrun_defrag.cfg	2009-10-07 06:24:25 UTC (rev 8067)
@@ -0,0 +1,28 @@
+// Nexrun tweaked to suit defrag maps
+sv_gravity 800
+sv_maxspeed 320
+// CPMA: 320
+sv_maxairspeed 320
+// CPMA: 320
+sv_accelerate 15
+sv_airaccelerate 1
+sv_friction 8
+edgefriction 1
+sv_stepheight 34
+// CPMA: 18
+sv_jumpvelocity 270
+sv_wateraccelerate 4
+sv_waterfriction 1
+sv_airaccel_sideways_friction 0
+sv_airaccel_qw 0.95
+// CPMA: 1
+sv_airstopaccelerate 2.5
+sv_airstrafeaccelerate 70
+sv_maxairstrafespeed 30
+sv_aircontrol 150
+sv_warsowbunny_turnaccel 0
+sv_warsowbunny_accel 0.1593
+sv_warsowbunny_topspeed 925
+sv_warsowbunny_backtosideratio 0.8
+sv_friction_on_land 0
+sv_doublejump 0

Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_radar.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_radar.c	2009-10-06 19:23:04 UTC (rev 8066)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_radar.c	2009-10-07 06:24:25 UTC (rev 8067)
@@ -6,7 +6,7 @@
 	ATTRIB(NexuizRadarDialog, title, string, "Radar, HUD & Waypoints")
 	ATTRIB(NexuizRadarDialog, color, vector, SKINCOLOR_DIALOG_RADAR)
 	ATTRIB(NexuizRadarDialog, intendedWidth, float, 0.7)
-	ATTRIB(NexuizRadarDialog, rows, float, 18)
+	ATTRIB(NexuizRadarDialog, rows, float, 19)
 	ATTRIB(NexuizRadarDialog, columns, float, 4)
 ENDCLASS(NexuizRadarDialog)
 #endif

Modified: branches/nexuiz-2.0/data/qcsrc/server/constants.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/constants.qh	2009-10-06 19:23:04 UTC (rev 8066)
+++ branches/nexuiz-2.0/data/qcsrc/server/constants.qh	2009-10-07 06:24:25 UTC (rev 8067)
@@ -1,5 +1,5 @@
-string CVAR_CHECK_DEFAULT = "091f36c4fb0d7b22bbd2d2fdff8b1447";
-string CVAR_CHECK_BALANCE = "78188ae599396a346b72738a042880c5";
+string CVAR_CHECK_DEFAULT = "c0254c4c1cc8836cd7cc3989f4ad25f4";
+string CVAR_CHECK_BALANCE = "f419825b823199b15cb1aafdb4e5422a";
 
 float	FALSE					= 0;
 float	TRUE					= 1;

Copied: branches/nexuiz-2.0/data/weaponsNexrun_defrag.cfg (from rev 8066, trunk/data/weaponsNexrun_defrag.cfg)
===================================================================
--- branches/nexuiz-2.0/data/weaponsNexrun_defrag.cfg	                        (rev 0)
+++ branches/nexuiz-2.0/data/weaponsNexrun_defrag.cfg	2009-10-07 06:24:25 UTC (rev 8067)
@@ -0,0 +1,15 @@
+// nexrun weapon settings tweaked for defrag maps
+g_balance_falldamage_factor 0
+g_balance_kill_delay 0
+g_respawn_delay 0
+
+g_shootfromcenter 1
+g_projectiles_newton_style 0
+sv_gameplayfix_delayprojectiles 0
+g_start_weapon_laser 0
+g_balance_laser_secondary 1
+g_balance_laser_secondary_shotangle -90
+g_balance_grenadelauncher_secondary_speed_up 0
+g_balance_grenadelauncher_secondary_speed 0 
+g_balance_rocketlauncher_speed 1000
+g_balance_rocketlauncher_speedstart 1000



More information about the nexuiz-commits mailing list