r2562 - in branches/nexuiz-2.0/data: . maps menu/data/gamemodes qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon May 14 08:14:58 EDT 2007
Author: div0
Date: 2007-05-14 08:14:58 -0400 (Mon, 14 May 2007)
New Revision: 2562
Modified:
branches/nexuiz-2.0/data/default.cfg
branches/nexuiz-2.0/data/maps/arena_soylent.txt
branches/nexuiz-2.0/data/maps/dm_bluesky.txt
branches/nexuiz-2.0/data/maps/dm_runningman_1on1remix.txt
branches/nexuiz-2.0/data/maps/dm_soylent.txt
branches/nexuiz-2.0/data/maps/dom_runningman.txt
branches/nexuiz-2.0/data/maps/lms_runningman_1on1remix.txt
branches/nexuiz-2.0/data/maps/lms_soylent.txt
branches/nexuiz-2.0/data/maps/rune_runningman.txt
branches/nexuiz-2.0/data/maps/rune_soylent.txt
branches/nexuiz-2.0/data/maps/tdm_runningman.txt
branches/nexuiz-2.0/data/maps/tdm_soylent.txt
branches/nexuiz-2.0/data/menu/data/gamemodes/gamemisc.menu
branches/nexuiz-2.0/data/physics15.cfg
branches/nexuiz-2.0/data/physics151.cfg
branches/nexuiz-2.0/data/physics151b.cfg
branches/nexuiz-2.0/data/physics16rc1.cfg
branches/nexuiz-2.0/data/physicsQ.cfg
branches/nexuiz-2.0/data/physicsQ3.cfg
branches/nexuiz-2.0/data/physicsQBF.cfg
branches/nexuiz-2.0/data/physicsQBFplus.cfg
branches/nexuiz-2.0/data/physicsQBR.cfg
branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
branches/nexuiz-2.0/data/qcsrc/server/cl_physics.qc
branches/nexuiz-2.0/data/qcsrc/server/havocbot.qc
Log:
sv_jumpvelocity; typo fixes in maps/*.txt
Modified: branches/nexuiz-2.0/data/default.cfg
===================================================================
--- branches/nexuiz-2.0/data/default.cfg 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/default.cfg 2007-05-14 12:14:58 UTC (rev 2562)
@@ -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
@@ -718,9 +718,9 @@
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
Modified: branches/nexuiz-2.0/data/maps/arena_soylent.txt
===================================================================
--- branches/nexuiz-2.0/data/maps/arena_soylent.txt 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/maps/arena_soylent.txt 2007-05-14 12:14:58 UTC (rev 2562)
@@ -1,7 +1,7 @@
Soylent Space (arena_soylent)
maps/soylent
-Medium sized vertical Level
+Medium sized vertical level
Players: 2-6
@@ -12,4 +12,4 @@
Gametype: Arena
Author:
-Paul Evers
\ No newline at end of file
+Paul Evers
Modified: branches/nexuiz-2.0/data/maps/dm_bluesky.txt
===================================================================
--- branches/nexuiz-2.0/data/maps/dm_bluesky.txt 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/maps/dm_bluesky.txt 2007-05-14 12:14:58 UTC (rev 2562)
@@ -1,7 +1,7 @@
Blue Sky (dm_bluesky)
maps/bluesky
-Small fun map
+Small and fun map
with a mighty jump
Players: 2-6
Modified: branches/nexuiz-2.0/data/maps/dm_runningman_1on1remix.txt
===================================================================
--- branches/nexuiz-2.0/data/maps/dm_runningman_1on1remix.txt 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/maps/dm_runningman_1on1remix.txt 2007-05-14 12:14:58 UTC (rev 2562)
@@ -13,4 +13,4 @@
Gametype: Deathmatch
Author:
-Paul Evers
\ No newline at end of file
+Paul Evers
Modified: branches/nexuiz-2.0/data/maps/dm_soylent.txt
===================================================================
--- branches/nexuiz-2.0/data/maps/dm_soylent.txt 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/maps/dm_soylent.txt 2007-05-14 12:14:58 UTC (rev 2562)
@@ -1,7 +1,7 @@
Soylent Space (dm_soylent)
maps/soylent
-Medium sized vertical Level
+Medium sized vertical level
Players: 2-6
@@ -12,4 +12,4 @@
Gametype: Deathmatch
Author:
-Paul Evers
\ No newline at end of file
+Paul Evers
Modified: branches/nexuiz-2.0/data/maps/dom_runningman.txt
===================================================================
--- branches/nexuiz-2.0/data/maps/dom_runningman.txt 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/maps/dom_runningman.txt 2007-05-14 12:14:58 UTC (rev 2562)
@@ -1,7 +1,7 @@
Running Man (dom_runningman)
maps/runningman
-Small Level, best suited
+Small DM-Level, best suited
for 2 players.
Players: 2-4
@@ -13,4 +13,4 @@
Gametype: Domination
Author:
-Paul Evers
\ No newline at end of file
+Paul Evers
Modified: branches/nexuiz-2.0/data/maps/lms_runningman_1on1remix.txt
===================================================================
--- branches/nexuiz-2.0/data/maps/lms_runningman_1on1remix.txt 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/maps/lms_runningman_1on1remix.txt 2007-05-14 12:14:58 UTC (rev 2562)
@@ -1,8 +1,8 @@
Running Man (lms_runningman_1on1remix)
maps/runningman_1on1remix
-Small DM-Level, best suited
-for 2 players.
+DM-Level especially designed
+for 1on1 Matches.
Players: 2-4
Modified: branches/nexuiz-2.0/data/maps/lms_soylent.txt
===================================================================
--- branches/nexuiz-2.0/data/maps/lms_soylent.txt 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/maps/lms_soylent.txt 2007-05-14 12:14:58 UTC (rev 2562)
@@ -1,7 +1,7 @@
Soylent Space (lms_soylent)
maps/soylent
-Medium sized vertical Level
+Medium sized vertical level
Players: 2-6
@@ -12,4 +12,4 @@
Gametype: Last Man Standing
Author:
-Paul Evers
\ No newline at end of file
+Paul Evers
Modified: branches/nexuiz-2.0/data/maps/rune_runningman.txt
===================================================================
--- branches/nexuiz-2.0/data/maps/rune_runningman.txt 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/maps/rune_runningman.txt 2007-05-14 12:14:58 UTC (rev 2562)
@@ -1,7 +1,7 @@
Running Man (rune_runningman)
maps/runningman
-Small Level, best suited
+Small DM-Level, best suited
for 2 players.
Players: 2-4
@@ -13,4 +13,4 @@
Gametype: Rune Match
Author:
-Paul Evers
\ No newline at end of file
+Paul Evers
Modified: branches/nexuiz-2.0/data/maps/rune_soylent.txt
===================================================================
--- branches/nexuiz-2.0/data/maps/rune_soylent.txt 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/maps/rune_soylent.txt 2007-05-14 12:14:58 UTC (rev 2562)
@@ -1,7 +1,7 @@
Soylent Space (rune_soylent)
maps/soylent
-Medium sized vertical Level
+Medium sized vertical level
Players: 2-6
@@ -12,4 +12,4 @@
Gametype: Rune Match
Author:
-Paul Evers
\ No newline at end of file
+Paul Evers
Modified: branches/nexuiz-2.0/data/maps/tdm_runningman.txt
===================================================================
--- branches/nexuiz-2.0/data/maps/tdm_runningman.txt 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/maps/tdm_runningman.txt 2007-05-14 12:14:58 UTC (rev 2562)
@@ -1,7 +1,7 @@
Running Man (tdm_runningman)
maps/runningman
-Small Level, best suited
+Small DM-Level, best suited
for 2 players.
Players: 2-4
@@ -13,4 +13,4 @@
Gametype: Team Deathmatch
Author:
-Paul Evers
\ No newline at end of file
+Paul Evers
Modified: branches/nexuiz-2.0/data/maps/tdm_soylent.txt
===================================================================
--- branches/nexuiz-2.0/data/maps/tdm_soylent.txt 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/maps/tdm_soylent.txt 2007-05-14 12:14:58 UTC (rev 2562)
@@ -1,7 +1,7 @@
Soylent Space (tdm_soylent)
maps/soylent
-Medium sized vertical Level
+Medium sized vertical level
Players: 2-6
@@ -12,4 +12,4 @@
Gametype: Team Deathmatch
Author:
-Paul Evers
\ No newline at end of file
+Paul Evers
Modified: branches/nexuiz-2.0/data/menu/data/gamemodes/gamemisc.menu
===================================================================
--- branches/nexuiz-2.0/data/menu/data/gamemodes/gamemisc.menu 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/menu/data/gamemodes/gamemisc.menu 2007-05-14 12:14:58 UTC (rev 2562)
@@ -363,7 +363,7 @@
}
Item Data_Cvar JumpHeight
{
- cvarName "g_balance_jumpheight"
+ cvarName "sv_jumpvelocity"
defValue 300
[DataLink_Setting]
Modified: branches/nexuiz-2.0/data/physics15.cfg
===================================================================
--- branches/nexuiz-2.0/data/physics15.cfg 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/physics15.cfg 2007-05-14 12:14:58 UTC (rev 2562)
@@ -3,9 +3,9 @@
sv_accelerate 5.5
sv_airaccelerate 5.5
sv_friction 5
-edgefriction 0
+edgefriction 1
sv_stepheight 34
-set g_balance_jumpheight 300
+set sv_jumpvelocity 300
set sv_friction_on_land 0.25
set sv_airaccel_sideways_friction 0
set sv_airaccel_qw 0
Modified: branches/nexuiz-2.0/data/physics151.cfg
===================================================================
--- branches/nexuiz-2.0/data/physics151.cfg 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/physics151.cfg 2007-05-14 12:14:58 UTC (rev 2562)
@@ -3,9 +3,9 @@
sv_accelerate 5.5
sv_airaccelerate 5.5
sv_friction 5
-edgefriction 0
+edgefriction 1
sv_stepheight 34
-set g_balance_jumpheight 300
+set sv_jumpvelocity 300
set sv_friction_on_land 0
set sv_airaccel_sideways_friction 0
set sv_airaccel_qw 0
Modified: branches/nexuiz-2.0/data/physics151b.cfg
===================================================================
--- branches/nexuiz-2.0/data/physics151b.cfg 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/physics151b.cfg 2007-05-14 12:14:58 UTC (rev 2562)
@@ -3,9 +3,9 @@
sv_accelerate 5.5
sv_airaccelerate 5.5
sv_friction 5
-edgefriction 0
+edgefriction 1
sv_stepheight 34
-set g_balance_jumpheight 300
+set sv_jumpvelocity 300
set sv_friction_on_land 0
set sv_airaccel_sideways_friction 0
set sv_airaccel_qw 0
Modified: branches/nexuiz-2.0/data/physics16rc1.cfg
===================================================================
--- branches/nexuiz-2.0/data/physics16rc1.cfg 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/physics16rc1.cfg 2007-05-14 12:14:58 UTC (rev 2562)
@@ -3,9 +3,9 @@
sv_accelerate 5.5
sv_airaccelerate 5.5
sv_friction 5
-edgefriction 0
+edgefriction 1
sv_stepheight 34
-set g_balance_jumpheight 300
+set sv_jumpvelocity 300
set sv_friction_on_land 0.2
set sv_airaccel_sideways_friction 0
set sv_airaccel_qw 0
Modified: branches/nexuiz-2.0/data/physicsQ.cfg
===================================================================
--- branches/nexuiz-2.0/data/physicsQ.cfg 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/physicsQ.cfg 2007-05-14 12:14:58 UTC (rev 2562)
@@ -3,9 +3,9 @@
sv_accelerate 5.5
sv_airaccelerate 5.5
sv_friction 5
-edgefriction 0
+edgefriction 1
sv_stepheight 34
-set g_balance_jumpheight 300
+set sv_jumpvelocity 300
set sv_friction_on_land 0
set sv_airaccel_sideways_friction 0
set sv_airaccel_qw 1
Modified: branches/nexuiz-2.0/data/physicsQ3.cfg
===================================================================
--- branches/nexuiz-2.0/data/physicsQ3.cfg 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/physicsQ3.cfg 2007-05-14 12:14:58 UTC (rev 2562)
@@ -4,9 +4,9 @@
sv_accelerate 10
sv_airaccelerate 1
sv_friction 6
-edgefriction 0
+edgefriction 1
sv_stepheight 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
Modified: branches/nexuiz-2.0/data/physicsQBF.cfg
===================================================================
--- branches/nexuiz-2.0/data/physicsQBF.cfg 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/physicsQBF.cfg 2007-05-14 12:14:58 UTC (rev 2562)
@@ -3,9 +3,9 @@
sv_accelerate 5.5
sv_airaccelerate 5.5
sv_friction 5
-edgefriction 0
+edgefriction 1
sv_stepheight 34
-set g_balance_jumpheight 300
+set sv_jumpvelocity 300
set sv_friction_on_land 0
set sv_airaccel_sideways_friction 0.8
set sv_airaccel_qw 1
Modified: branches/nexuiz-2.0/data/physicsQBFplus.cfg
===================================================================
--- branches/nexuiz-2.0/data/physicsQBFplus.cfg 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/physicsQBFplus.cfg 2007-05-14 12:14:58 UTC (rev 2562)
@@ -3,9 +3,9 @@
sv_accelerate 5.5
sv_airaccelerate 5.5
sv_friction 5
-edgefriction 0
+edgefriction 1
sv_stepheight 34
-set g_balance_jumpheight 300
+set sv_jumpvelocity 300
set sv_friction_on_land 0
set sv_airaccel_sideways_friction 0.5
set sv_airaccel_qw 0.93
Modified: branches/nexuiz-2.0/data/physicsQBR.cfg
===================================================================
--- branches/nexuiz-2.0/data/physicsQBR.cfg 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/physicsQBR.cfg 2007-05-14 12:14:58 UTC (rev 2562)
@@ -3,9 +3,9 @@
sv_accelerate 5.5
sv_airaccelerate 5.5
sv_friction 5
-edgefriction 0
+edgefriction 1
sv_stepheight 34
-set g_balance_jumpheight 300
+set sv_jumpvelocity 300
set sv_friction_on_land 0
set sv_airaccel_sideways_friction 0.3
set sv_airaccel_qw 0.93
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2007-05-14 12:14:58 UTC (rev 2562)
@@ -584,7 +584,7 @@
stuffcmd(e, strcat("cl_movement_airaccelerate ", ftos(cvar("sv_airaccelerate")), "\n"));
stuffcmd(e, strcat("cl_movement_maxairspeed ", ftos(cvar("sv_maxairspeed")), "\n"));
stuffcmd(e, strcat("cl_movement_stopspeed ", ftos(cvar("sv_stopspeed")), "\n"));
- stuffcmd(e, strcat("cl_movement_jumpvelocity ", ftos(cvar("g_balance_jumpheight")), "\n"));
+ stuffcmd(e, strcat("cl_movement_jumpvelocity ", ftos(cvar("sv_jumpvelocity")), "\n"));
stuffcmd(e, strcat("cl_movement_stepheight ", ftos(cvar("sv_stepheight")), "\n"));
stuffcmd(e, strcat("set cl_movement_friction_on_land ", ftos(cvar("sv_friction_on_land")), "\n"));
stuffcmd(e, strcat("set cl_movement_airaccel_qw ", ftos(cvar("sv_airaccel_qw")), "\n"));
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_physics.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_physics.qc 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_physics.qc 2007-05-14 12:14:58 UTC (rev 2562)
@@ -25,7 +25,7 @@
{
float mjumpheight;
- mjumpheight = cvar("g_balance_jumpheight");
+ mjumpheight = cvar("sv_jumpvelocity");
if (self.waterlevel >= 2)
{
if (self.watertype == CONTENT_WATER)
Modified: branches/nexuiz-2.0/data/qcsrc/server/havocbot.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/havocbot.qc 2007-05-13 17:14:56 UTC (rev 2561)
+++ branches/nexuiz-2.0/data/qcsrc/server/havocbot.qc 2007-05-14 12:14:58 UTC (rev 2562)
@@ -205,7 +205,7 @@
self.movement_y = dir * v_right;
if (self.flags & FL_INWATER) self.movement_z = dir * v_up; else self.movement_z = 0;
- if ((dir * v_up) >= cvar("g_balance_jumpheight")*0.5 && (self.flags & FL_ONGROUND)) self.button2=1;
+ if ((dir * v_up) >= cvar("sv_jumpvelocity")*0.5 && (self.flags & FL_ONGROUND)) self.button2=1;
if (((dodge * v_up) > 0) && random()*frametime >= 0.2*bound(0,(10-skill)*0.1,1)) self.button2=TRUE;
if (((dodge * v_up) < 0) && random()*frametime >= 0.5*bound(0,(10-skill)*0.1,1)) self.havocbot_ducktime=time+0.3/bound(0.1,skill,10);
More information about the nexuiz-commits
mailing list