r2681 - trunk/pro

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Wed May 23 15:51:56 EDT 2007


Author: esteel
Date: 2007-05-23 15:51:56 -0400 (Wed, 23 May 2007)
New Revision: 2681

Modified:
   trunk/pro/default.cfg
   trunk/pro/physicsPro.cfg
Log:
synced pro configs with normal configs


Modified: trunk/pro/default.cfg
===================================================================
--- trunk/pro/default.cfg	2007-05-23 19:24:36 UTC (rev 2680)
+++ trunk/pro/default.cfg	2007-05-23 19:51:56 UTC (rev 2681)
@@ -138,7 +138,7 @@
 cl_movement_accelerate $sv_accelerate
 cl_movement_edgefriction $edgefriction
 cl_movement_friction $sv_friction
-cl_movement_jumpvelocity $g_balance_jumpheight
+cl_movement_jumpvelocity $sv_jumpvelocity
 cl_movement_maxairspeed $sv_maxairspeed
 cl_movement_maxspeed $sv_maxspeed
 cl_movement_stepheight $sv_stepheight
@@ -220,7 +220,7 @@
 seta g_maplist $g_maplist_defaultlist
 seta g_maplist_index 0 // this is used internally for saving position in maplist cycle
 seta g_maplist_selectrandom 0 // if 1, a random map will be chosen as next map - DEPRECATED in favor of g_maplist_shuffle
-seta g_maplist_shuffle 0 // new randomization method: like selectrandom, but avoid playing the same maps in short succession. This works by taking out the first element and inserting it into g_maplist with a bias to the end of the list.
+seta g_maplist_shuffle 1 // new randomization method: like selectrandom, but avoid playing the same maps in short succession. This works by taking out the first element and inserting it into g_maplist with a bias to the end of the list.
 // timeout for kill credit when your damage knocks someone into a death trap
 set g_maxpushtime 8.0
 
@@ -440,13 +440,14 @@
 cl_decals_time 2
 seta cl_nogibs 0
 cl_stainmaps 0
-gl_flashblend 0
-seta r_glsl 1
-seta r_glsl_deluxemapping 1
-seta r_glsl_offsetmapping 0
-seta r_glsl_offsetmapping_reliefmapping 0
-seta r_glsl_offsetmapping_scale 0.02
+cl_particles_explosions_smokes 1
+r_glsl 1
+r_glsl_deluxemapping 1
+r_glsl_offsetmapping 0
+r_glsl_offsetmapping_reliefmapping 0
+r_glsl_offsetmapping_scale 0.02
 // execute normal.cfg to make sure that all effect settings are reset
+alias menu_sync "" // will be re-aliased later
 exec normal.cfg
 
 // misc
@@ -512,11 +513,11 @@
 bind MWHEELUP weapnext
 bind MWHEELDOWN weapprev
 bind BACKSPACE dropweapon
+bind g dropweapon
+bind f +use
 
 // misc
 bind e +hook
-bind - sizedown
-bind = sizeup
 bind ` toggleconsole
 bind ~ toggleconsole
 bind TAB +showscores
@@ -544,7 +545,7 @@
 bind kp_uparrow "say_team roaming (%l^7) (%h^7 %a^7 %w^7);g_waypointsprite_team_here"
 bind kp_pgup "say_team attacking (%l^7) (%h^7 %a^7 %w^7);g_waypointsprite_team_here"
 bind kp_multiply "say_team killed flagcarrier (%y^7);g_waypointsprite_team_p"
-bind kp_slash "say_team dropped flag (%d^7);g_waypointsprite_team_d"
+bind kp_slash "say_team dropped flag (%d^7);g_waypointsprite_team_here_d"
 bind kp_enter "say :-) / nice one"
 bind kp_plus "say good game"
 bind kp_minus "say hi / good luck and have fun"
@@ -567,6 +568,8 @@
 set sv_vote_wait 120
 // a simple majority suffices to accept a vote (meaning: YES votes > NO votes, otherwise: YES votes > half of the players)
 set sv_vote_simple_majority 0
+// when disabled, don't allow game type changes
+set sv_vote_change_gametype 0
 alias vhelp "cmd vote help"
 alias vstatus "cmd vote status"
 alias vcall "cmd vote call $*"
@@ -584,6 +587,7 @@
 
 // alias for switching the teamselect menu
 alias menu_showteamselect "set scmenu_directmenu TeamSelect; togglemenu"
+alias menu_sync "menu_cmd sync"
 bind f5 menu_showteamselect
 
 // NixNex (No-Items x Nexuiz) - at each time, everyone uses the same weapon,
@@ -672,10 +676,11 @@
 //   3: absolute velocity + player velocity component in shot direction (note: does NOT yield the right relative velocity, but may be good enough, but it is somewhat prone to sniper rockets)
 //   4: just add the player velocity length to the absolute velocity (tZork's sniper rockets)
 
-set g_maplist_votable 5
-set g_maplist_votable_keeptwotime 15
-set g_maplist_votable_timeout 30 // note: must be below 50 seconds!
-set g_maplist_votable_suggestions 2
+seta g_maplist_votable 5
+seta g_maplist_votable_keeptwotime 15
+seta g_maplist_votable_timeout 30 // note: must be below 50 seconds!
+seta g_maplist_votable_suggestions 2
+seta g_maplist_votable_suggestions_change_gametype 0
 alias suggestmap "cmd suggestmap $1"
 
 set g_chat_flood_spl 0                   // seconds between lines to not count as flooding
@@ -712,14 +717,14 @@
 // key for that?
 seta cl_hidewaypoints 0
 
-// command extensions
+// command extension
 alias qc_cmd               "sv_cmd $*" // menu QC will override this to menu_cmd
 alias adminmsg             "sv_cmd adminmsg $*"
 alias teamstatus           "sv_cmd teamstatus"
 alias printstats           "sv_cmd printstats" // print status on demand
-alias g_maplist_add        "qc_cmd rpn /maps/$1.mapcfg fexists_assert /g_maplist g_maplist /$1 union def"
-alias g_maplist_remove     "qc_cmd rpn /g_maplist g_maplist /$1 difference def"
-alias g_maplist_putfirst   "qc_cmd rpn /maps/$1.mapcfg fexists_assert /g_maplist /$1 g_maplist union def"
+alias g_maplist_add        "qc_cmd rpn /maps/$1.mapcfg fexists_assert /g_maplist g_maplist /'$1' union def"
+alias g_maplist_remove     "qc_cmd rpn /g_maplist g_maplist /'$1' difference def"
+alias g_maplist_putfirst   "qc_cmd rpn /maps/$1.mapcfg fexists_assert /g_maplist /'$1' g_maplist union def"
 alias g_maplist_shufflenow "qc_cmd rpn /g_maplist g_maplist shuffle def"
 
 // key hunt
@@ -743,3 +748,6 @@
 set g_balance_keyhunt_damageforcescale 1
 set g_keyhunt_teams_override 0
 set g_keyhunt_teams 0 // mapcfgs NEED to specify this!
+
+// so it can be stuffcmd-ed still
+set cl_gravity 800 // but ignored anyway

Modified: trunk/pro/physicsPro.cfg
===================================================================
--- trunk/pro/physicsPro.cfg	2007-05-23 19:24:36 UTC (rev 2680)
+++ trunk/pro/physicsPro.cfg	2007-05-23 19:51:56 UTC (rev 2681)
@@ -6,7 +6,7 @@
 sv_friction 6
 edgefriction 0
 sv_stepheight 34 // this is for Nexuiz maps, Quake3 used 18
-set g_balance_jumpheight 270
+set sv_jumpvelocity 270
 set sv_friction_on_land 0
 set sv_airaccel_sideways_friction 0
 set sv_airaccel_qw 1




More information about the nexuiz-commits mailing list