r3815 - in branches/nexuiz-2.0: . data data/qcsrc/server data/scripts misc/gtkradiant misc/gtkradiant/singlepatches

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sun Jul 13 12:33:43 EDT 2008 

Author: div0
Date: 2008-07-13 12:33:43 -0400 (Sun, 13 Jul 2008)
New Revision: 3815

Added:
   branches/nexuiz-2.0/data/serverbench.cfg
   branches/nexuiz-2.0/misc/gtkradiant/singlepatches/gtkradiant-spawnflagsboxes.diff
Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/server/defs.qh
   branches/nexuiz-2.0/data/scripts/entities.def
   branches/nexuiz-2.0/misc/gtkradiant/gtkradiant-nexuiz-patchset.diff
Log:
r3799 | div0 | 2008-07-09 18:06:40 +0200 (Wed, 09 Jul 2008) | 2 lines
fix func_door description
r3800 | div0 | 2008-07-09 18:10:41 +0200 (Wed, 09 Jul 2008) | 2 lines
add spawnflag boxes
r3801 | div0 | 2008-07-09 18:24:19 +0200 (Wed, 09 Jul 2008) | 2 lines
fix bboxes of items to match FL_ITEM
r3802 | div0 | 2008-07-09 21:30:24 +0200 (Wed, 09 Jul 2008) | 3 lines
Add a benchmark .cfg that runs the server for a predefined "game".
Should only differ by operating system, may be used to benchmark server/QC VM code.
r3803 | div0 | 2008-07-09 21:31:25 +0200 (Wed, 09 Jul 2008) | 2 lines
oops, cvar name
r3804 | div0 | 2008-07-10 07:48:12 +0200 (Thu, 10 Jul 2008) | 2 lines
compilation fix for fteqcc -O0

Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2008-07-13 16:31:29 UTC (rev 3814)
+++ branches/nexuiz-2.0/.patchsets	2008-07-13 16:33:43 UTC (rev 3815)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-3760,3762-3773,3777-3778,3787-3788,3790-3790,3796-3797
+revisions_applied = 1-3760,3762-3773,3777-3778,3787-3788,3790-3790,3796-3797,3799-3804

Modified: branches/nexuiz-2.0/data/qcsrc/server/defs.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/defs.qh	2008-07-13 16:31:29 UTC (rev 3814)
+++ branches/nexuiz-2.0/data/qcsrc/server/defs.qh	2008-07-13 16:33:43 UTC (rev 3815)
@@ -212,6 +212,7 @@
 // For weapon cycling commands
 float WEP_FIRST				= 1;
 float WEP_LAST				= 9;
+float WEP_COUNT             = 10;
 
 void(entity client, string s) centerprint_builtin = #73;
 .vector dest1, dest2;
@@ -398,7 +399,7 @@
 
 float bot_waypoints_for_items;
 
-.float	attack_finished_for[WEP_LAST + 1];
+.float	attack_finished_for[WEP_COUNT];
 .float attack_finished_single;
 #define ATTACK_FINISHED(ent) ((ent).(attack_finished_for[(ent).weapon]))
 

Modified: branches/nexuiz-2.0/data/scripts/entities.def
===================================================================
--- branches/nexuiz-2.0/data/scripts/entities.def	2008-07-13 16:31:29 UTC (rev 3814)
+++ branches/nexuiz-2.0/data/scripts/entities.def	2008-07-13 16:33:43 UTC (rev 3815)
@@ -78,7 +78,7 @@
 speed: movement speed (100 default)
 wait: wait before returning (3 default, -1 = never return)
 lip: lip remaining at end of move (8 default)
-dmg: damage to inflict when blocked (2 default)
+dmg: damage to inflict when blocked (when triggered and someone is in the way)
 sounds: when 1, use default door sounds
 noise1: sound when the door opens
 noise2: sound when the door closes
@@ -266,7 +266,7 @@
 targetname: when targeted by a func_button, pressing the button will reassign the spawn point to the team of the activator. If a team has no more spawn point left, it immediately loses.
 */
 
-/*QUAKED item_armor_large (.4 .8 .4) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED item_armor_large (.4 .8 .4) (-30 -30 0) (30 30 32) FLOATING
 Large Armor (default 100 armor points)
 -------- KEYS --------
 respawntime: time till it respawns (default: 30)
@@ -278,7 +278,7 @@
 model="models/items/g_a25.md3"
 */
 
-/*QUAKED item_armor_medium (.4 .8 .4) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED item_armor_medium (.4 .8 .4) (-30 -30 0) (30 30 32) FLOATING
 Medium Armor (default 25 armor points)
 -------- KEYS --------
 respawntime: time till it respawns (default: 30)
@@ -290,7 +290,7 @@
 model="models/items/g_armormedium.md3"
 */
 
-/*QUAKED item_armor_small (.4 .8 .4) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED item_armor_small (.4 .8 .4) (-30 -30 0) (30 30 32) FLOATING
 Small Armor (default 5 armor points)
 -------- KEYS --------
 respawntime: time till it respawns (default: 15)
@@ -302,7 +302,7 @@
 model="models/items/g_a1.md3"
 */
 
-/*QUAKED item_bullets (.3 .3 1) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED item_bullets (.3 .3 1) (-30 -30 0) (30 30 32) FLOATING
 Machine Gun ammo
 -------- KEYS --------
 ammo_nails: bullets gained by this item (if unset, g_pickup_nails is used)
@@ -313,7 +313,7 @@
 model="models/items/a_bullets.mdl"
 */
 
-/*QUAKED item_cells (.3 .3 1) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED item_cells (.3 .3 1) (-30 -30 0) (30 30 32) FLOATING
 Nex, Electro and Crylink ammo
 -------- KEYS --------
 ammo_cells: cells gained by this item (if unset, g_pickup_cells is used)
@@ -346,7 +346,7 @@
 noise3: sound played when flag is lost in the field and respawns itself
 */
 
-/*QUAKED item_health_large (.9 .3 .3) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED item_health_large (.9 .3 .3) (-30 -30 0) (30 30 48) FLOATING
 Large Health (default 50 health points)
 -------- KEYS --------
 respawntime: time till it respawns (default: 15)
@@ -358,7 +358,7 @@
 model="models/items/g_h50.md3"
 */
 
-/*QUAKED item_health_medium (.9 .3 .3) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED item_health_medium (.9 .3 .3) (-30 -30 0) (30 30 48) FLOATING
 Medium Health (default 25 health points)
 -------- KEYS --------
 respawntime: time till it respawns (default: 15)
@@ -370,7 +370,7 @@
 model="models/items/g_h25.md3"
 */
 
-/*QUAKED item_health_mega (.9 .3 .3) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED item_health_mega (.9 .3 .3) (-30 -30 0) (30 30 48) FLOATING
 Mega Health (default 100 health points)
 In Minstagib, this randomly turns into either an invisibility, an extra lives or a speed power-up with a default respawn time of 120.
 -------- KEYS --------
@@ -383,7 +383,7 @@
 model="models/items/g_h100.md3"
 */
 
-/*QUAKED item_health_small (.9 .3 .3) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED item_health_small (.9 .3 .3) (-30 -30 0) (30 30 48) FLOATING
 Small Health (default 5 health points)
 -------- KEYS --------
 respawntime: time till it respawns (default: 15)
@@ -395,7 +395,7 @@
 model="models/items/g_h1.md3"
 */
 
-/*QUAKED item_invincible (.3 .3 1) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED item_invincible (.3 .3 1) (-30 -30 0) (30 30 48) FLOATING
 Strong Shield
 In Minstagib, this randomly turns into either an invisibility, an extra lives or a speed power-up with a default respawn time of 120.
 -------- KEYS --------
@@ -406,7 +406,7 @@
 model="models/items/g_invincible.md3"
 */
 
-/*QUAKED item_minst_cells (.3 .3 1) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED item_minst_cells (.3 .3 1) (-30 -30 0) (30 30 32) FLOATING
 Minstagib ammo.
 Always contains 5 (g_minstagib_ammo_drop) shots.
 It only appears when playing Minstagib and prevents auto-replacement of weapon_nex & weapon_rocketlauncher when used.
@@ -418,7 +418,7 @@
 model="models/items/a_cells.md3"
 */
 
-/*QUAKED item_rockets (.3 .3 1) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED item_rockets (.3 .3 1) (-30 -30 0) (30 30 32) FLOATING
 Rocket Launcher, Hagar and Mortar ammo
 -------- KEYS --------
 ammo_rockets: rockets gained by this item (if unset, g_pickup_rockets is used)
@@ -429,7 +429,7 @@
 model="models/items/a_rockets.md3"
 */
 
-/*QUAKED item_shells (.3 .3 1) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED item_shells (.3 .3 1) (-30 -30 0) (30 30 32) FLOATING
 Shotgun ammo
 -------- KEYS --------
 ammo_shells: shells gained by this item (if unset, g_pickup_shells is used)
@@ -440,7 +440,7 @@
 model="models/items/a_shells.md3"
 */
 
-/*QUAKED item_strength (.3 .3 1) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED item_strength (.3 .3 1) (-30 -30 0) (30 30 48) FLOATING
 Strength aka Quad damage
 In Minstagib, this randomly turns into either an invisibility, an extra lives or a speed power-up with a default respawn time of 120.
 -------- KEYS --------
@@ -765,7 +765,7 @@
 target: this must point to a misc_teleporter_dest entity.
 */
 
-/*QUAKED weapon_crylink (1 0 .5) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED weapon_crylink (1 0 .5) (-30 -30 0) (30 30 32) FLOATING
 the Crylink
 -------- KEYS --------
 ammo_cells: initial cells of the weapon (if unset, g_pickup_cells is used)
@@ -776,7 +776,7 @@
 model="models/weapons/g_crylink.md3"
 */
 
-/*QUAKED weapon_electro (1 0 .5) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED weapon_electro (1 0 .5) (-30 -30 0) (30 30 32) FLOATING
 the Electro
 -------- KEYS --------
 ammo_cells: initial cells of the weapon (if unset, g_pickup_cells is used)
@@ -787,7 +787,7 @@
 model="models/weapons/g_electro.md3"
 */
 
-/*QUAKED weapon_grenadelauncher (1 0 .5) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED weapon_grenadelauncher (1 0 .5) (-30 -30 0) (30 30 32) FLOATING
 the Mortar
 -------- KEYS --------
 ammo_rockets: initial rockets of the weapon (if unset, g_pickup_rockets is used)
@@ -798,7 +798,7 @@
 model="models/weapons/g_gl.md3"
 */
 
-/*QUAKED weapon_hagar (1 0 .5) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED weapon_hagar (1 0 .5) (-30 -30 0) (30 30 32) FLOATING
 the Hagar
 -------- KEYS --------
 ammo_rockets: initial rockets of the weapon (if unset, g_pickup_rockets is used)
@@ -809,7 +809,7 @@
 model="models/weapons/g_hagar.md3"
 */
 
-/*QUAKED weapon_nex (1 0 .5) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED weapon_nex (1 0 .5) (-30 -30 0) (30 30 32) FLOATING
 the Nex
 In Minstagib, this turns into an item_minst_cells if no explicit item_minst_cells have been placed.
 -------- KEYS --------
@@ -821,7 +821,7 @@
 model="models/weapons/g_nex.md3"
 */
 
-/*QUAKED weapon_rocketlauncher (1 0 .5) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED weapon_rocketlauncher (1 0 .5) (-30 -30 0) (30 30 32) FLOATING
 the Rocket Launcher
 In Minstagib, this turns into an item_minst_cells if no explicit item_minst_cells have been placed.
 -------- KEYS --------
@@ -833,7 +833,7 @@
 model="models/weapons/g_rl.md3"
 */
 
-/*QUAKED weapon_shotgun (1 0 .5) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED weapon_shotgun (1 0 .5) (-30 -30 0) (30 30 32) FLOATING
 the Shotgun
 -------- KEYS --------
 ammo_shells: initial shells of the weapon (if unset, g_pickup_shells is used)
@@ -844,7 +844,7 @@
 model="models/weapons/g_shotgun.md3"
 */
 
-/*QUAKED weapon_uzi (1 0 .5) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED weapon_uzi (1 0 .5) (-30 -30 0) (30 30 32) FLOATING
 the Machine Gun
 -------- KEYS --------
 ammo_nails: initial bullets of the weapon (if unset, g_pickup_nails is used)

Added: branches/nexuiz-2.0/data/serverbench.cfg
===================================================================
--- branches/nexuiz-2.0/data/serverbench.cfg	                        (rev 0)
+++ branches/nexuiz-2.0/data/serverbench.cfg	2008-07-13 16:33:43 UTC (rev 3815)
@@ -0,0 +1,24 @@
+// basic setup
+sv_public 0
+sv_random_seed 12345
+sv_mapchange_delay 1
+bot_join_empty 1
+sys_usenoclockbutbenchmark 1
+
+// when benchmark is over, just exit
+quit_and_redirect "invalid.example.org"
+
+// benchmark setup
+maxplayers 32
+bot_number 32
+skill 100
+fraglimit_override 0
+timelimit_override 3
+sv_eventlog 1
+g_nixnex 1
+g_nixnex_with_laser 1
+g_balance_nixnex_roundtime 3
+map downer
+
+// time darkplaces/nexuiz-dedicated +exec serverbench.cfg | grep ^: > serverbench.log
+// on Linux/Ubuntu, this should always yield a file with the md5sum

Modified: branches/nexuiz-2.0/misc/gtkradiant/gtkradiant-nexuiz-patchset.diff
===================================================================
--- branches/nexuiz-2.0/misc/gtkradiant/gtkradiant-nexuiz-patchset.diff	2008-07-13 16:31:29 UTC (rev 3814)
+++ branches/nexuiz-2.0/misc/gtkradiant/gtkradiant-nexuiz-patchset.diff	2008-07-13 16:33:43 UTC (rev 3815)
@@ -759,6 +759,19 @@
  };
  
  
+Index: radiant/groupdialog.cpp
+===================================================================
+--- radiant/groupdialog.cpp	(revision 297)
++++ radiant/groupdialog.cpp	(working copy)
+@@ -1328,7 +1328,7 @@
+ 
+             {
+               // Spawnflags (4 colums wide max, or window gets too wide.)
+-              GtkWidget* LayoutTable = gtk_table_new (4, 4, FALSE);
++              LayoutTable = gtk_table_new (4, 4, FALSE);
+               gtk_box_pack_start (GTK_BOX (vbox2), LayoutTable, FALSE, TRUE, 0);
+               gtk_widget_show(LayoutTable);
+ 
 Index: tools/quake3/q3map2/convert_map.c
 ===================================================================
 --- tools/quake3/q3map2/convert_map.c	(revision 290)
@@ -2256,4 +2269,4 @@
 +++ include/version.default	(working copy)
 @@ -1 +1 @@
 -1.4.0
-+1.4.0-div0-obj-bp2texdeffix-bpsurfacedialog
++1.4.0-div0-obj-bp2texdeffix-bpsurfacedialog-spawnflagsboxes

Added: branches/nexuiz-2.0/misc/gtkradiant/singlepatches/gtkradiant-spawnflagsboxes.diff
===================================================================
--- branches/nexuiz-2.0/misc/gtkradiant/singlepatches/gtkradiant-spawnflagsboxes.diff	                        (rev 0)
+++ branches/nexuiz-2.0/misc/gtkradiant/singlepatches/gtkradiant-spawnflagsboxes.diff	2008-07-13 16:33:43 UTC (rev 3815)
@@ -0,0 +1,13 @@
+Index: radiant/groupdialog.cpp
+===================================================================
+--- radiant/groupdialog.cpp	(revision 297)
++++ radiant/groupdialog.cpp	(working copy)
+@@ -1328,7 +1328,7 @@
+ 
+             {
+               // Spawnflags (4 colums wide max, or window gets too wide.)
+-              GtkWidget* LayoutTable = gtk_table_new (4, 4, FALSE);
++              LayoutTable = gtk_table_new (4, 4, FALSE);
+               gtk_box_pack_start (GTK_BOX (vbox2), LayoutTable, FALSE, TRUE, 0);
+               gtk_widget_show(LayoutTable);
+

More information about the nexuiz-commits mailing list