r6072 - in branches/nexuiz-2.0: . data data/gfx data/qcsrc/common data/qcsrc/server misc/tools
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Mar 7 09:49:46 EST 2009
Author: div0
Date: 2009-03-07 09:49:46 -0500 (Sat, 07 Mar 2009)
New Revision: 6072
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/averagewidth.pl
branches/nexuiz-2.0/data/defaultNexuiz.cfg
branches/nexuiz-2.0/data/gfx/crosshaircampingrifle.tga
branches/nexuiz-2.0/data/gfx/crosshaircrylink.tga
branches/nexuiz-2.0/data/gfx/crosshairelectro.tga
branches/nexuiz-2.0/data/gfx/crosshairgrenadelauncher.tga
branches/nexuiz-2.0/data/gfx/crosshairhagar.tga
branches/nexuiz-2.0/data/gfx/crosshairhlac.tga
branches/nexuiz-2.0/data/gfx/crosshairhook.tga
branches/nexuiz-2.0/data/gfx/crosshairminstanex.tga
branches/nexuiz-2.0/data/gfx/crosshairnex.tga
branches/nexuiz-2.0/data/gfx/crosshairporto.tga
branches/nexuiz-2.0/data/gfx/crosshairrocketlauncher.tga
branches/nexuiz-2.0/data/gfx/crosshairseeker.tga
branches/nexuiz-2.0/data/gfx/crosshairshotgun.tga
branches/nexuiz-2.0/data/gfx/crosshairuzi.tga
branches/nexuiz-2.0/data/qcsrc/common/gamecommand.qc
branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc
branches/nexuiz-2.0/data/qcsrc/server/w_hook.qc
branches/nexuiz-2.0/misc/tools/makebuild.sh
Log:
r6065 | div0 | 2009-03-06 15:40:35 +0100 (Fri, 06 Mar 2009) | 2 lines
netradiant?
r6066 | div0 | 2009-03-06 16:34:17 +0100 (Fri, 06 Mar 2009) | 2 lines
fix some stuff, unsupported -> extra
r6067 | esteel | 2009-03-06 21:04:09 +0100 (Fri, 06 Mar 2009) | 2 lines
add 'addtolist' to 'qc_cmd help'
r6068 | div0 | 2009-03-07 11:13:02 +0100 (Sat, 07 Mar 2009) | 2 lines
fix typo
r6069 | div0 | 2009-03-07 13:55:28 +0100 (Sat, 07 Mar 2009) | 2 lines
bugfix for the per-weapon crosshairs: make them visible on any background.
r6070 | div0 | 2009-03-07 14:46:50 +0100 (Sat, 07 Mar 2009) | 2 lines
add an extra "map _init/_init" to allow changing maxplayers
r6071 | div0 | 2009-03-07 15:20:15 +0100 (Sat, 07 Mar 2009) | 2 lines
fix hook shot origin
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-03-07 14:20:15 UTC (rev 6071)
+++ branches/nexuiz-2.0/.patchsets 2009-03-07 14:49:46 UTC (rev 6072)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6063
+revisions_applied = 1-6071
Modified: branches/nexuiz-2.0/data/averagewidth.pl
===================================================================
--- branches/nexuiz-2.0/data/averagewidth.pl 2009-03-07 14:20:15 UTC (rev 6071)
+++ branches/nexuiz-2.0/data/averagewidth.pl 2009-03-07 14:49:46 UTC (rev 6072)
@@ -55,6 +55,7 @@
print "Total chars: $chars\n";
print "Total width: $width\n";
print "Average: @{[$width / $chars]}\n";
+print "Chat line width: @{[800 * 0.6 / 10 / ($width / $chars)]}\n";
__DATA__
GNU GENERAL PUBLIC LICENSE
Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-03-07 14:20:15 UTC (rev 6071)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-03-07 14:49:46 UTC (rev 6072)
@@ -737,7 +737,7 @@
// startmap_dm is used when running with the -listen or -dedicated commandline options
set serverconfig server.cfg
-alias startmap_dm "set _sv_init 0; map _init/_init; exec $serverconfig; set _sv_init 1"
+alias startmap_dm "set _sv_init 0; map _init/_init; exec $serverconfig; set _sv_init 1; map _init/_init"
// aliases:
alias +attack2 +button3
Modified: branches/nexuiz-2.0/data/gfx/crosshaircampingrifle.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/crosshaircrylink.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/crosshairelectro.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/crosshairgrenadelauncher.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/crosshairhagar.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/crosshairhlac.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/crosshairhook.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/crosshairminstanex.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/crosshairnex.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/crosshairporto.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/crosshairrocketlauncher.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/crosshairseeker.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/crosshairshotgun.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/crosshairuzi.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/qcsrc/common/gamecommand.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/common/gamecommand.qc 2009-03-07 14:20:15 UTC (rev 6071)
+++ branches/nexuiz-2.0/data/qcsrc/common/gamecommand.qc 2009-03-07 14:49:46 UTC (rev 6072)
@@ -81,6 +81,7 @@
print(" maplist remove map\n");
print(" maplist shuffle\n");
print(" maplist cleanup\n");
+ print(" addtolist variable addedvalue\n");
return TRUE;
}
Modified: branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc 2009-03-07 14:20:15 UTC (rev 6071)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc 2009-03-07 14:49:46 UTC (rev 6072)
@@ -470,7 +470,7 @@
if(g_grappling_hook)
hook_shotorigin = '8 -8 -12';
else
- hook_shotorigin = '25 8 -8';
+ hook_shotorigin = '21 8 -8.5';
}
void SetGrappleHookBindings()
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_hook.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_hook.qc 2009-03-07 14:20:15 UTC (rev 6071)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_hook.qc 2009-03-07 14:49:46 UTC (rev 6072)
@@ -60,7 +60,7 @@
if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
self.ammo_cells = self.ammo_cells - cvar("g_balance_hook_secondary_ammo");
- W_SetupShot (self, '21 8 -9.5', FALSE, 4, "weapons/hookbomb_fire.wav");
+ W_SetupShot (self, '21 8 -8.5', FALSE, 4, "weapons/hookbomb_fire.wav");
gren = spawn ();
gren.owner = self;
Modified: branches/nexuiz-2.0/misc/tools/makebuild.sh
===================================================================
--- branches/nexuiz-2.0/misc/tools/makebuild.sh 2009-03-07 14:20:15 UTC (rev 6071)
+++ branches/nexuiz-2.0/misc/tools/makebuild.sh 2009-03-07 14:49:46 UTC (rev 6072)
@@ -10,6 +10,7 @@
base=`pwd`
# customizable specific stuff
+netradiant_release=1.5.0-svn212
basepk3=$base/data20080229.pk3 # 2.4
hotbasepk3= # hotfix
nexdir=$base/nexuiz
@@ -256,6 +257,26 @@
# fix up permissions
chmod 644 *.dll *.exe
+mkdir extra
+cd extra
+wget http://www.icculus.org/netradiant/files/netradiant-${netradiant_release}-win32.zip
+unzip netradiant-${netradiant_release}-win32.zip
+mv NetRadiant netradiant-${netradiant_release}-win32
+rm -f netradiant-${netradiant_release}-win32.zip
+wget http://www.icculus.org/netradiant/files/netradiant-${netradiant_release}-osxintel.zip
+unzip netradiant-${netradiant_release}-osxintel.zip
+mv NetRadiant.app NetRadiant-${netradiant_release}-osxintel.app
+rm -f netradiant-${netradiant_release}-osxintel.zip
+cat >> unsupported.txt <<EOF
+This directory contains NetRadiant, a stabilized Q3 map editor,
+configured for Nexuiz.
+
+It is not officially supported by Alientrap.
+
+Website: http://www.icculus.org/netradiant/
+EOF
+cd ..
+
# make main structure
mkdir Nexuiz
mv * Nexuiz/ || true
@@ -263,7 +284,7 @@
find . -name .svn -exec rm -rf {} \; -prune
rm -f "$zipdir/nexuiz$date$ext.zip"
-zip $zipflags -9yr "$zipdir/nexuiz$date$ext.zip" Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/server Nexuiz/data/data$tag$date.pk3 Nexuiz/data/common-spog.pk3 Nexuiz/havoc/*
+zip $zipflags -9yr "$zipdir/nexuiz$date$ext.zip" Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/server Nexuiz/data/data$tag$date.pk3 Nexuiz/data/common-spog.pk3 Nexuiz/havoc/* Nexuiz/extra/*
ln -snf nexuiz$date$ext.zip "$zipdir/nexuiz-$newest.zip"
rm -f "$zipdir/nexuizengineonly$date$ext.zip"
More information about the nexuiz-commits
mailing list