[nexuiz-commits] r6490 - in trunk: data data/qcsrc/server misc/netradiant-NexuizPack/nexuiz.game/data
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Apr 15 05:18:47 EDT 2009
Author: div0
Date: 2009-04-15 05:18:46 -0400 (Wed, 15 Apr 2009)
New Revision: 6490
Modified:
trunk/data/Makefile
trunk/data/defaultNexuiz.cfg
trunk/data/qcsrc/server/constants.qh
trunk/data/qcsrc/server/gamecommand.qc
trunk/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def
Log:
entities.def update; new cvar checksums
Modified: trunk/data/Makefile
===================================================================
--- trunk/data/Makefile 2009-04-15 09:01:26 UTC (rev 6489)
+++ trunk/data/Makefile 2009-04-15 09:18:46 UTC (rev 6490)
@@ -3,6 +3,7 @@
PK3NAME ?= `date +../data%Y%m%d.pk3`
ZIP ?= 7za a -tzip -mx=9
ZIPEXCLUDE ?= -x\!*.pk3 -xr\!\.svn -x\!qcsrc
+DIFF ?= diff
FTEQCCFLAGS ?= -Wall -Wno-mundane -O3 -Ono-c -Ono-cs -flo
FTEQCCFLAGS_PROGS ?=
@@ -20,7 +21,7 @@
.PHONY: update-cvarcount
update-cvarcount:
[ "$(NEX_BUILDSYSTEM)" = "" ] || [ "$(NEX_BUILDSYSTEM)" = "1" ]
- [ "$(NEX_BUILDSYSTEM)" != "" ] || { ! [ -f ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def ] || diff ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def scripts/entities.def || { echo entities.def mismatch, please merge ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def and scripts/entities.def; exit 1; }; }
+ [ "$(NEX_BUILDSYSTEM)" != "" ] || { ! [ -f ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def ] || $(DIFF) ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def scripts/entities.def || { echo entities.def mismatch, please merge ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def and scripts/entities.def; exit 1; }; }
[ "$(NEX_BUILDSYSTEM)" != "" ] || { DO_NOT_RUN_MAKE=1 sh update-cvarcount.sh; }
.PHONY: qc
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2009-04-15 09:01:26 UTC (rev 6489)
+++ trunk/data/defaultNexuiz.cfg 2009-04-15 09:18:46 UTC (rev 6490)
@@ -24,7 +24,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 779a1c2f508f65a13bad23ce1758beb8
+set cvar_check_default cfaa3e6ce44a23e5563db2d3ee7c53e4
// Nexuiz version (formatted for machines)
// used to determine if a client version is compatible
Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh 2009-04-15 09:01:26 UTC (rev 6489)
+++ trunk/data/qcsrc/server/constants.qh 2009-04-15 09:18:46 UTC (rev 6490)
@@ -1,4 +1,4 @@
-string CVAR_CHECK_DEFAULT = "779a1c2f508f65a13bad23ce1758beb8";
+string CVAR_CHECK_DEFAULT = "cfaa3e6ce44a23e5563db2d3ee7c53e4";
string CVAR_CHECK_WEAPONS = "00219e78f5d78d7d8a1600c4f4c73aa5";
float FALSE = 0;
Modified: trunk/data/qcsrc/server/gamecommand.qc
===================================================================
--- trunk/data/qcsrc/server/gamecommand.qc 2009-04-15 09:01:26 UTC (rev 6489)
+++ trunk/data/qcsrc/server/gamecommand.qc 2009-04-15 09:18:46 UTC (rev 6490)
@@ -900,7 +900,9 @@
if(trace_startsolid)
{
rint(42); // do an engine breakpoint on VM_rint so you can get the trace that errnoeously returns startsolid
+ tracebox(start, PL_MIN, PL_MAX, end, MOVE_NOMONSTERS, world);
tracebox(p, PL_MIN, PL_MAX, p, MOVE_NOMONSTERS, world);
+
tracebox(p, PL_MIN + '0.1 0.1 0.1', PL_MAX - '0.1 0.1 0.1', p, MOVE_NOMONSTERS, world);
if(trace_startsolid)
error(strcat("trace_endpos much in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(trace_endpos), "\n"));
Modified: trunk/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def
===================================================================
--- trunk/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def 2009-04-15 09:01:26 UTC (rev 6489)
+++ trunk/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def 2009-04-15 09:18:46 UTC (rev 6490)
@@ -73,7 +73,7 @@
/*QUAKED func_door (0 .5 .8) ? START_OPEN - DOOR_DONT_LINK - - TOGGLE
Normal sliding door entity. By default, the door will activate when player walks close to it or when damage is inflicted to it.
-If DOOR_DONT_LINK is not set, the door will be linked with all doors it touches.
+If DOOR_DONT_LINK is not set, the door will be linked with all doors it touches. Note however that for linked doors to work properly, it is necessary that ALL linked doors have SOME volume of common area (that is, there must be a point that is part of ALL doors).
-------- KEYS --------
message: is printed when the door is touched if it is a trigger door and it hasn't been fired yet, or death message if dmg is set
message2: death message when someone gets pushed into this (default: "was thrown into a world of hurt by"). The # character is replaced by the attacker name if present (and it instead does not get appended to the end)
@@ -582,7 +582,7 @@
*/
/*QUAKED misc_laser (.5 .5 .5) (-8 -8 -8) (8 8 8) START_ON FINITE
-Laser beam emitter
+Laser beam emitter. Note that for the laser to be deadly, it has to start OUTSIDE the player's collision box. To ensure this, you may want to put this entity inside the walls (or directly on their surface), or cover it with a playerclip brush.
-------- KEYS --------
target: target_position the laser targets (may be another entity, preferably target_position, possibly controlled by misc_follow)
mdl: name of particle effect for the beam end point (see effectinfo.txt; default is laser_deadly if dmg is set, and none if not)
More information about the nexuiz-commits
mailing list