[nexuiz-commits] r6391 - in branches/nexuiz-2.0: . data/maps data/qcsrc/server data/scripts misc/netradiant-NexuizPack/nexuiz.game/data

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Tue Mar 31 04:44:11 EDT 2009 

Author: div0
Date: 2009-03-31 04:44:11 -0400 (Tue, 31 Mar 2009)
New Revision: 6391

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/changes-since-last-release
   branches/nexuiz-2.0/data/maps/campaignNexuiz25.txt
   branches/nexuiz-2.0/data/qcsrc/server/campaign.qc
   branches/nexuiz-2.0/data/scripts/entities.def
   branches/nexuiz-2.0/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def
Log:
r6387 | div0 | 2009-03-31 08:30:06 +0200 (Tue, 31 Mar 2009) | 2 lines
q3map2 misc_model spawnflag 32 description
r6388 | div0 | 2009-03-31 10:16:30 +0200 (Tue, 31 Mar 2009) | 2 lines
update changes list :P
r6389 | div0 | 2009-03-31 10:32:26 +0200 (Tue, 31 Mar 2009) | 2 lines
fix the low gravity campaign level
r6390 | div0 | 2009-03-31 10:34:31 +0200 (Tue, 31 Mar 2009) | 2 lines
less lives on evilspace lms


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-03-31 08:34:31 UTC (rev 6390)
+++ branches/nexuiz-2.0/.patchsets	2009-03-31 08:44:11 UTC (rev 6391)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6385
+revisions_applied = 1-6390

Modified: branches/nexuiz-2.0/changes-since-last-release
===================================================================
--- branches/nexuiz-2.0/changes-since-last-release	2009-03-31 08:34:31 UTC (rev 6390)
+++ branches/nexuiz-2.0/changes-since-last-release	2009-03-31 08:44:11 UTC (rev 6391)
@@ -1,4 +1,4 @@
-CHANGES since 2.4.2 to r5904:
+CHANGES since 2.4.2 to r6387:
 compat-q3a: switch crylink/hagar, as crylink is closer to BFG and hagar is closer to Plasmagun
 engine: add a half-baked "commandmode" (currently it has, like messagemode, no history, no line editing)
 engine: added blend and orientation commands for effectinfo.txt (overrides the defaults chosen by the particle type)
@@ -95,6 +95,7 @@
 game: cvar sv_vote_stop, the amount of time till one can vote again after stopping ones own vote
 game: cvar teamplay_lockonrestart
 game: cvar timelimit_overtime, timelimit_overtimes, timelimit_suddendeath (timelimit_maxovertime removed)
+game: fix a server crash exploit
 game: fix flag falling through bunker
 game: fix q3skoredm1
 game: fix some memory leaks
@@ -113,6 +114,7 @@
 game: improved weapon system, new weapons Port-O-Launch, MinstaNex, On-hand hook, TAG Seeker, HLAC, Camping Rifle; now up to 24 weapons supported
 game: IP ban syncing support (servers can share a ban list, can be used as a kind of global IP ban system)
 game: item respawn: 20s for 50health and 25armor
+game: jetpack (g_jetpack, or entities item_jetpack, item_fuel, item_fuel_regen)
 game: kick banned players also when they try to talk
 game: lemmings countdown ('kill' and switching teams is no longer instant)
 game: log can get :time: events
@@ -126,6 +128,7 @@
 game: new particle effects
 game: new tokenizer fixing weirdly split kick reasons/vote commands
 game: new weapon and player sounds
+game: optimize bot waypoint loading
 game: performance improved (fteqcc -O3)
 game: race game type (see Docs/basics.html for more details)
 game: ready now toggles the ready state
@@ -170,15 +173,19 @@
 mapping: entity trigger_items
 mapping: field nottargeted overrides targetname checks in e.g. func_door (so it can be used for misc_follow without needing an extra trigger)
 mapping: field team on items, and cnt as weight
+mapping: filtering by gametype: "gametypefilter" "+ctf,kh"
 mapping: LOD for misc_models and similar entities
 mapping: mapname.cfg is deprecated. Use clientsettemp_for_type and cdtrack in mapname.mapinfo
+mapping: randomizing origin, angle or angles fields: "originjitter", "anglejitter", "anglesjitter" fields
 mapping: target2, target3, target4 as extra target fields
+mapping: team field in trigger_teleport and trigger_push
 mapping: triggers now MUST be common/trigger; their exact shape now works (no longer their bbox)
 mapping: turrets
 mapping: zeroradiant support, bugfix patchset updated
 map: reslimed: less distracting fog
 map: some more TDM map settings
 map: starship and silvercity: no CTF
+media: new weapon system (see cl_weaponsystem.qc comment about model formats)
 menu: blueplastic skin
 menu: channel mixer
 menu: cvar list editor

Modified: branches/nexuiz-2.0/data/maps/campaignNexuiz25.txt
===================================================================
--- branches/nexuiz-2.0/data/maps/campaignNexuiz25.txt	2009-03-31 08:34:31 UTC (rev 6390)
+++ branches/nexuiz-2.0/data/maps/campaignNexuiz25.txt	2009-03-31 08:44:11 UTC (rev 6391)
@@ -20,7 +20,7 @@
 "ctf","runningmanctf",3,5,100,,"CTF: Running Man","Now that you have played a simple CTF match, let's try one with team mates.\n\nDo not shoot your team mate, and let him protect you while you carry the flag back home."
 "ctf","bloodprisonctf",5,6,150,,"CTF: Blood Prison","Let's try the same with a total of 6 players."
 "ctf","accident",5,7,100,,"CTF: Accident","Enough of the CTF training arenas – you can now play on the real thing, namely, this industrial CTF level which you can find on many online servers too. Just remember that this map is called 'accident'."
-"lms","evilspace",3,7,15,"g_weaponarena laser","SPECIAL: [evilspace]","All you get is a Laser.\n\nWell, I think you know how to use it to push the bots off this map into the deadly void..."
+"lms","evilspace",3,7,9,"g_weaponarena laser","SPECIAL: [evilspace]","All you get is a Laser.\n\nWell, I think you know how to use it to push the bots off this map into the deadly void..."
 "dom","basement",1,5,70,,"DOM: Basement","Domination: take control points so they show the color of your team, and make the enemies not take yours. Points are awarded for holding a control point.\n\n70 points win."
 "dom","runningman",3,6,100,,"DOM: Running Man","This time it's a bigger map and you get a team mate to help you capture the control points.\n\n3 bots, and 100 points to win."
 "dom","slimepit",5,7,100,,"DOM: The Slime Pit","An old, rusty industrial arena on which you have to watch out for slime...\n\nNote: while trying to capture one control point after another, you should keep an eye on your already captured control points, and defend them from incoming enemies."

Modified: branches/nexuiz-2.0/data/qcsrc/server/campaign.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/campaign.qc	2009-03-31 08:34:31 UTC (rev 6390)
+++ branches/nexuiz-2.0/data/qcsrc/server/campaign.qc	2009-03-31 08:44:11 UTC (rev 6391)
@@ -94,6 +94,10 @@
 	cvar_set("bot_number", ftos(campaign_bots[0]));
 	MapInfo_SwitchGameType(MapInfo_Type_FromString(campaign_gametype[0]));
 
+	// copy sv_gravity cvar, as the engine needs it too (sorry, this will mess
+	// with the menu a little still...)
+	cvar_set_builtin("sv_gravity", cvar_string("sv_gravity"));
+
 	if(Campaign_Invalid())
 		return;
 

Modified: branches/nexuiz-2.0/data/scripts/entities.def
===================================================================
--- branches/nexuiz-2.0/data/scripts/entities.def	2009-03-31 08:34:31 UTC (rev 6390)
+++ branches/nexuiz-2.0/data/scripts/entities.def	2009-03-31 08:44:11 UTC (rev 6391)
@@ -600,7 +600,7 @@
 When the laser's target has itself target set, its targets are triggered when someone enters or leaves the laser.
 */
 
-/*QUAKED misc_model (1 .5 .25) (-16 -16 -16) (16 16 16) - SOLID - EXTRUDE_NORMALS EXTRUDE_TERRAIN
+/*QUAKED misc_model (1 .5 .25) (-16 -16 -16) (16 16 16) - SOLID - EXTRUDE_NORMALS EXTRUDE_TERRAIN COLOR_TO_ALPHA
 Generic placeholder for inserting MD3 models in game. Requires compilation of map geometry to be added to level. If the map is compiled with Q3Map2, then ASE, 3DS, OBJ and other model formats are supported.
 -------- Q3MAP2 KEYS --------
 model: file name of model to include
@@ -618,6 +618,7 @@
 SOLID: make the model solid
 EXTRUDE_NORMALS: for converting triangles to clip brushes, extrude along the model normals (by default, extrusion happens in a coordinate axis direction that is decided per triangle)
 EXTRUDE_TERRAIN: always extrude downwards (for terrain)
+COLOR_TO_ALPHA: use the color value as alpha (for terrain blending)
 */
 
 /*QUAKED misc_gamemodel (0 .5 .8) (-8 -8 -8) (8 8 8) ALIGN_ORIGIN ALIGN_BOTTOM

Modified: branches/nexuiz-2.0/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def
===================================================================
--- branches/nexuiz-2.0/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def	2009-03-31 08:34:31 UTC (rev 6390)
+++ branches/nexuiz-2.0/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def	2009-03-31 08:44:11 UTC (rev 6391)
@@ -600,7 +600,7 @@
 When the laser's target has itself target set, its targets are triggered when someone enters or leaves the laser.
 */
 
-/*QUAKED misc_model (1 .5 .25) (-16 -16 -16) (16 16 16) - SOLID - EXTRUDE_NORMALS EXTRUDE_TERRAIN
+/*QUAKED misc_model (1 .5 .25) (-16 -16 -16) (16 16 16) - SOLID - EXTRUDE_NORMALS EXTRUDE_TERRAIN COLOR_TO_ALPHA
 Generic placeholder for inserting MD3 models in game. Requires compilation of map geometry to be added to level. If the map is compiled with Q3Map2, then ASE, 3DS, OBJ and other model formats are supported.
 -------- Q3MAP2 KEYS --------
 model: file name of model to include
@@ -618,6 +618,7 @@
 SOLID: make the model solid
 EXTRUDE_NORMALS: for converting triangles to clip brushes, extrude along the model normals (by default, extrusion happens in a coordinate axis direction that is decided per triangle)
 EXTRUDE_TERRAIN: always extrude downwards (for terrain)
+COLOR_TO_ALPHA: use the color value as alpha (for terrain blending)
 */
 
 /*QUAKED misc_gamemodel (0 .5 .8) (-8 -8 -8) (8 8 8) ALIGN_ORIGIN ALIGN_BOTTOM

More information about the nexuiz-commits mailing list