[nexuiz-commits] r6403 - in branches/nexuiz-2.0: . data

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-04-01 10:23:03 -0400 (Wed, 01 Apr 2009)
New Revision: 6403

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/Makefile
   branches/nexuiz-2.0/data/defaultNexuiz.cfg
Log:
r6395 | div0 | 2009-03-31 20:43:40 +0200 (Tue, 31 Mar 2009) | 2 lines
add a semicolon to the makefile
r6396 | div0 | 2009-03-31 20:45:45 +0200 (Tue, 31 Mar 2009) | 2 lines
remove the "brutus" command again (didn't want to commit it)
r6397 | div0 | 2009-03-31 21:37:35 +0200 (Tue, 31 Mar 2009) | 2 lines
fix weird sign in Don't camp message
r6399 | div0 | 2009-04-01 08:12:12 +0200 (Wed, 01 Apr 2009) | 2 lines
bump version in cfg


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-04-01 06:13:52 UTC (rev 6402)
+++ branches/nexuiz-2.0/.patchsets	2009-04-01 14:23:03 UTC (rev 6403)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6393
+revisions_applied = 1-6399

Modified: branches/nexuiz-2.0/data/Makefile
===================================================================
--- branches/nexuiz-2.0/data/Makefile	2009-04-01 06:13:52 UTC (rev 6402)
+++ branches/nexuiz-2.0/data/Makefile	2009-04-01 14:23:03 UTC (rev 6403)
@@ -20,7 +20,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: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-04-01 06:13:52 UTC (rev 6402)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-04-01 14:23:03 UTC (rev 6403)
@@ -1,4 +1,4 @@
-set g_nexuizversion 2.4svn	"Nexuiz version (formatted for humans)"
+set g_nexuizversion 2.5svn	"Nexuiz version (formatted for humans)"
 
 //!<showbrand
 showbrand 3
@@ -616,7 +616,7 @@
 set g_lms_start_ammo_fuel 0
 set g_lms_regenerate 0
 set g_lms_campcheck_interval 10
-set g_lms_campcheck_message "^1Don't	camp!"
+set g_lms_campcheck_message "^1Don't camp!"
 set g_lms_campcheck_damage 100
 set g_lms_campcheck_distance 1800
 set g_lms_last_join 3	"if g_lms_join_anytime is false, new players can only join if the worst active player has more than (fraglimit - g_lms_last_join) lives"