r3793 - in branches/nexuiz-2.0: . data/scripts

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-07-08 14:01:10 -0400 (Tue, 08 Jul 2008)
New Revision: 3793

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/scripts/entities.def
Log:
r3773 | div0 | 2008-07-03 15:25:33 +0200 (Thu, 03 Jul 2008) | 2 lines
default for trigger_hurt.dmg

Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2008-07-08 18:00:13 UTC (rev 3792)
+++ branches/nexuiz-2.0/.patchsets	2008-07-08 18:01:10 UTC (rev 3793)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-3760,3762-3770,3790-3790
+revisions_applied = 1-3760,3762-3770,3773-3773,3790-3790

Modified: branches/nexuiz-2.0/data/scripts/entities.def
===================================================================
--- branches/nexuiz-2.0/data/scripts/entities.def	2008-07-08 18:00:13 UTC (rev 3792)
+++ branches/nexuiz-2.0/data/scripts/entities.def	2008-07-08 18:01:10 UTC (rev 3793)
@@ -677,7 +677,7 @@
 Any object touching this will be hurt.
 Has the useful effect of automatically returning flags, keys and runes when they touch it.
 -------- KEYS --------
-dmg: amount of damage to deal when it
+dmg: amount of damage to deal when it (default: 1000)
 message: kill message when someone gets killed by this (default: "was in the wrong place.")
 */