r5338 - in branches/nexuiz-2.0: . data misc

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sun Dec 28 16:12:43 EST 2008 

Author: div0
Date: 2008-12-28 16:12:43 -0500 (Sun, 28 Dec 2008)
New Revision: 5338

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/changes-since-last-release
   branches/nexuiz-2.0/data/weaponsPro.cfg
   branches/nexuiz-2.0/misc/jpeg-if-not-alpha.sh
Log:
r5336 | div0 | 2008-12-28 22:10:25 +0100 (Sun, 28 Dec 2008) | 2 lines
new change list
r5337 | div0 | 2008-12-28 22:12:20 +0100 (Sun, 28 Dec 2008) | 2 lines
sync weaponsPro.cfg

Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2008-12-28 21:12:20 UTC (rev 5337)
+++ branches/nexuiz-2.0/.patchsets	2008-12-28 21:12:43 UTC (rev 5338)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-5334
+revisions_applied = 1-5337

Modified: branches/nexuiz-2.0/changes-since-last-release
===================================================================
--- branches/nexuiz-2.0/changes-since-last-release	2008-12-28 21:12:20 UTC (rev 5337)
+++ branches/nexuiz-2.0/changes-since-last-release	2008-12-28 21:12:43 UTC (rev 5338)
@@ -1,12 +1,14 @@
-CHANGES since 2.4.2 to r4976:
+CHANGES since 2.4.2 to r5313:
 compat-q3a: switch crylink/hagar, as crylink is closer to BFG and hagar is closer to Plasmagun
 game: airshot announcer
 game: alternate HUD is now default
 game: antilag improved
 game: assault bugfixed
+game: bots try to not take items near team mates
 game: cmd maplist improved
 game: colors improved (TODO credit sev in nexuiz-credits.txt!)
 game: command allready
+game: command "cmd records"
 game: command lockteams, unlockteams
 game: command movetoteam_red, ...
 game: command nospectators
@@ -25,6 +27,7 @@
 game: cvar g_balance_ctf_damageforcescale
 game: cvar g_balance_electro_combo_speed
 game: cvar g_balance_teams_complain can now be turned off
+game: cvar g_ballistics_force, makes MG and SG projectiles
 game: cvar g_bugrigs*
 game: cvar g_ctf_allow_drop
 game: cvar g_ctf_fullbrightflags
@@ -33,6 +36,7 @@
 game: cvar g_jump_grunt
 game: cvar g_maxplayers
 game: cvar g_pickup_respawntime*
+game: cvar g_showweaponspawns
 game: cvar g_spawn_furthest
 game: cvar g_spawnpoints_auto_move_out_of_solid
 game: cvar g_start_delay
@@ -49,14 +53,17 @@
 game: fix some memory leaks
 game: fix flag falling through bunker
 game: fix q3skoredm1
+game: friendly fire slightly added now
 game: handle sv_foginterval on the client now
 game: hook attaches to moving objects
 game: hook can pull players (but detaches when that player shoots you)
 game: hook detaches when teleporting
 game: hook is no longer "seta"
 game: hook jitter-less
+game: hook takes ammo
 game: hook sky-attach bug fixed
 game: improved weapon system, new weapons Port-O-Launch, MinstaNex, On-hand hook, TAG Seeker, HLAC; now up to 24 weapons supported
+game: IP ban syncing support
 game: item respawn: 20s for 50health and 25armor
 game: kick banned players also when they try to talk
 game: lemmings countdown ;)
@@ -82,6 +89,7 @@
 game: timeout feature
 game: turrets
 game: vote call is now possible for server admins too
+game: weapons rebalanced according to frag statistics
 game: zoom unlagged, detect zoom scripts (for spectating/demos)
 map: aggressor supports keyhunt
 map: all maps recompiled, now with external lightmaps
@@ -90,6 +98,7 @@
 mapping: entities.def updated
 mapping: entity func_breakable
 mapping: entity func_door: make DOOR_NOT_LINK work
+mapping: entity func_door_rotating
 mapping: entity func_pointparticles
 mapping: entity func_sparks
 mapping: entity func_train now supports -1 wait on path_corner, making it NOT wait
@@ -133,6 +142,8 @@
 menuskins: HEIGHT_DIALOGBORDER
 menu: wicked skins
 misc: +exec benchmark.cfg
+misc: new color codes ^xRGB
 models: specop now knows that she is female
+models: new flag model
 rcon2irc: disconnect fix
 rcon2irc: irc_trigger

Modified: branches/nexuiz-2.0/data/weaponsPro.cfg
===================================================================
--- branches/nexuiz-2.0/data/weaponsPro.cfg	2008-12-28 21:12:20 UTC (rev 5337)
+++ branches/nexuiz-2.0/data/weaponsPro.cfg	2008-12-28 21:12:43 UTC (rev 5338)
@@ -260,7 +260,7 @@
 set g_balance_hlac_primary_spread_add 0.0045
 set g_balance_hlac_primary_spread_crouchmod 0.25
 
-set g_balance_hlac_primary_damage 25
+set g_balance_hlac_primary_damage 23
 set g_balance_hlac_primary_edgedamage 10
 set g_balance_hlac_primary_force 100
 set g_balance_hlac_primary_radius 70
@@ -274,7 +274,7 @@
 set g_balance_hlac_secondary_spread 0.15
 set g_balance_hlac_secondary_spread_crouchmod 0.5
 
-set g_balance_hlac_secondary_damage 25
+set g_balance_hlac_secondary_damage 23
 set g_balance_hlac_secondary_edgedamage 10
 set g_balance_hlac_secondary_force 100
 set g_balance_hlac_secondary_radius 70
@@ -347,20 +347,20 @@
 set g_balance_campingrifle_primary_headshotaddeddamage 160
 set g_balance_campingrifle_primary_spread 0
 set g_balance_campingrifle_primary_force 2
-set g_balance_campingrifle_primary_speed 30000
+set g_balance_campingrifle_primary_speed 35000
 set g_balance_campingrifle_primary_lifetime 5
 set g_balance_campingrifle_primary_refire 0.7
 set g_balance_campingrifle_primary_animtime 0.3
 set g_balance_campingrifle_primary_ammo 10
-set g_balance_campingrifle_primary_bulletconstant 130 // 97.5 qu
+set g_balance_campingrifle_primary_bulletconstant 120 // 51.9qu
 set g_balance_campingrifle_secondary_damage 60
 set g_balance_campingrifle_secondary_headshotaddeddamage 0
-set g_balance_campingrifle_secondary_spread 0.02
+set g_balance_campingrifle_secondary_spread 0.01
 set g_balance_campingrifle_secondary_force 1
-set g_balance_campingrifle_secondary_speed 8000
+set g_balance_campingrifle_secondary_speed 18000
 set g_balance_campingrifle_secondary_lifetime 5
 set g_balance_campingrifle_secondary_refire 0.12
 set g_balance_campingrifle_secondary_animtime 0.06
 set g_balance_campingrifle_secondary_ammo 10
 set g_balance_campingrifle_secondary_health 5
-set g_balance_campingrifle_secondary_bulletconstant 130 // 6.9 qu
+set g_balance_campingrifle_secondary_bulletconstant 120 // 13.7qu

Modified: branches/nexuiz-2.0/misc/jpeg-if-not-alpha.sh
===================================================================
--- branches/nexuiz-2.0/misc/jpeg-if-not-alpha.sh	2008-12-28 21:12:20 UTC (rev 5337)
+++ branches/nexuiz-2.0/misc/jpeg-if-not-alpha.sh	2008-12-28 21:12:43 UTC (rev 5338)
@@ -8,13 +8,13 @@
 	case "$X" in
 		*.jpg)
 			if [ -n "$scaledown" ]; then
-				mogrify "$X" -geometry "$scaledown<" -quality 100
+				mogrify -geometry "$scaledown>" -quality 100 "$X"
 			fi
 			jpegoptim --strip-all -m$qual "$X"
 			;;
 		*.png|*.tga)
 			if [ -n "$scaledown" ]; then
-				mogrify "$X" -geometry "$scaledown<" -quality 100
+				mogrify -geometry "$scaledown>" -quality 100 "$X"
 			fi
 			if convert "$X" -depth 16 RGBA:- | perl -e 'while(read STDIN, $_, 8) { substr($_, 6, 2) eq "\xFF\xFF" or exit 1; ++$pix; } exit not $pix;'; then
 				echo "$X has no alpha, converting"

More information about the nexuiz-commits mailing list