Thu Oct 1 02:05:31 EDT 2009

Author: div0
Date: 2009-10-01 02:05:24 -0400 (Thu, 01 Oct 2009)
New Revision: 8003

Added:
   branches/nexuiz-2.0/data/models/sprites/flagdropped_frame0.tga
Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/Makefile
   branches/nexuiz-2.0/data/apply-eol-style.sh
   branches/nexuiz-2.0/data/balance25.cfg
   branches/nexuiz-2.0/data/balanceSamual.cfg
   branches/nexuiz-2.0/data/build-compat-pack.sh
   branches/nexuiz-2.0/data/check-sounds.sh
   branches/nexuiz-2.0/data/default25.cfg
   branches/nexuiz-2.0/data/default26.cfg
   branches/nexuiz-2.0/data/effectinfo.txt
   branches/nexuiz-2.0/data/find-eol-style.sh
   branches/nexuiz-2.0/data/input-tuba.cfg
   branches/nexuiz-2.0/data/maps/compile_bloodprisonctf.sh
   branches/nexuiz-2.0/data/maps/stormkeep2.mapinfo
   branches/nexuiz-2.0/data/maps/strength.sh
   branches/nexuiz-2.0/data/maps/tutorial.waypoints.cache
   branches/nexuiz-2.0/data/merge-settings-into-cfg.pl
   branches/nexuiz-2.0/data/models/ctf/shockwavetransring.md3.framegroups
   branches/nexuiz-2.0/data/models/desertfactory/objects_metal/compile.sh
   branches/nexuiz-2.0/data/models/desertfactory/objects_plants/compile.sh
   branches/nexuiz-2.0/data/models/desertfactory/objects_wood/compile.sh
   branches/nexuiz-2.0/data/models/desertfactory/structure_metal/compile.sh
   branches/nexuiz-2.0/data/models/desertfactory/structure_stone/compile.sh
   branches/nexuiz-2.0/data/models/desertfactory/structure_wood/compile.sh
   branches/nexuiz-2.0/data/models/gibs/robo.md3_0.skin
   branches/nexuiz-2.0/data/models/gibs/robo.md3_1.skin
   branches/nexuiz-2.0/data/models/gibs/robo1.md3_0.skin
   branches/nexuiz-2.0/data/models/gibs/robo1.md3_1.skin
   branches/nexuiz-2.0/data/models/gibs/robo2.md3_0.skin
   branches/nexuiz-2.0/data/models/gibs/robo2.md3_1.skin
   branches/nexuiz-2.0/data/models/gibs/robo3.md3_0.skin
   branches/nexuiz-2.0/data/models/gibs/robo3.md3_1.skin
   branches/nexuiz-2.0/data/models/gibs/robo4.md3_0.skin
   branches/nexuiz-2.0/data/models/gibs/robo4.md3_1.skin
   branches/nexuiz-2.0/data/models/gibs/robo7.md3_0.skin
   branches/nexuiz-2.0/data/models/gibs/robo7.md3_1.skin
   branches/nexuiz-2.0/data/models/gibs/robo8.md3_0.skin
   branches/nexuiz-2.0/data/models/gibs/robo8.md3_1.skin
   branches/nexuiz-2.0/data/models/onslaught/shockwavetransring.md3.framegroups
   branches/nexuiz-2.0/data/models/spiderbot/spiderbot.dpm.framegroups
   branches/nexuiz-2.0/data/models/sprites/make-sprites.sh
   branches/nexuiz-2.0/data/models/turrets/ewheel-base2.md3.framegroups
   branches/nexuiz-2.0/data/models/weapons/h_fireball.dpm.framegroups
   branches/nexuiz-2.0/data/particles/particlefont.pl
   branches/nexuiz-2.0/data/particles/particlefont.txt
   branches/nexuiz-2.0/data/physics10.cfg
   branches/nexuiz-2.0/data/physics26.cfg
   branches/nexuiz-2.0/data/physicsQ2.cfg
   branches/nexuiz-2.0/data/physicsQ2a.cfg
   branches/nexuiz-2.0/data/qcsrc/client/modeleffects.qc
   branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
   branches/nexuiz-2.0/data/qcsrc/server/bot/aim.qh
   branches/nexuiz-2.0/data/qcsrc/server/bot/bot.qh
   branches/nexuiz-2.0/data/qcsrc/server/bot/havocbot/havocbot.qc
   branches/nexuiz-2.0/data/qcsrc/server/bot/havocbot/havocbot.qh
   branches/nexuiz-2.0/data/qcsrc/server/bot/havocbot/role_keyhunt.qc
   branches/nexuiz-2.0/data/qcsrc/server/bot/navigation.qh
   branches/nexuiz-2.0/data/qcsrc/server/bot/waypoints.qh
   branches/nexuiz-2.0/data/qcsrc/server/w_common.qc
   branches/nexuiz-2.0/data/qcsrc/server/w_fireball.qc
   branches/nexuiz-2.0/data/scripts/fireball.shader
   branches/nexuiz-2.0/data/scripts/nutsandbolts.shader
   branches/nexuiz-2.0/data/scripts/sphere.shader
   branches/nexuiz-2.0/data/scripts/stormkeep.shader
   branches/nexuiz-2.0/data/update-cvarcount.sh
Log:
r7993 | div0 | 2009-09-30 06:47:59 -0400 (Wed, 30 Sep 2009) | 2 lines
bullets: always network a force of at least 1 (fixes missing bullet holes in havoc)
r7994 | div0 | 2009-09-30 06:48:25 -0400 (Wed, 30 Sep 2009) | 2 lines
fix search radii for decals
r7995 | div0 | 2009-09-30 09:11:45 -0400 (Wed, 30 Sep 2009) | 2 lines
add missing file (dropped flag WP)
r7996 | div0 | 2009-09-30 09:29:31 -0400 (Wed, 30 Sep 2009) | 2 lines
small fix for checkpvs console spam when a bot has no goalcurrent
r7997 | div0 | 2009-09-30 09:36:13 -0400 (Wed, 30 Sep 2009) | 2 lines
add a funny comment
r7998 | div0 | 2009-09-30 09:45:04 -0400 (Wed, 30 Sep 2009) | 2 lines
fix typo
r7999 | samual | 2009-09-30 22:12:40 -0400 (Wed, 30 Sep 2009) | 1 line
balanceSamual.cfg: Rebalance: Change fireball stuff
r8000 | samual | 2009-09-30 22:14:59 -0400 (Wed, 30 Sep 2009) | 1 line
balanceSamual.cfg: Rebalance: Moar fireball stuff + REVISION 8000 BITCHES... Sorry, I really wanted it.
r8001 | div0 | 2009-10-01 01:24:26 -0400 (Thu, 01 Oct 2009) | 2 lines
fix "unreachable code" warning some people seem to get
r8002 | div0 | 2009-10-01 01:36:49 -0400 (Thu, 01 Oct 2009) | 2 lines
EOL style fixes; 


Modified: branches/nexuiz-2.0/.patchsets
===================================================================

--- branches/nexuiz-2.0/.patchsets	2009-10-01 05:36:49 UTC (rev 8002)
+++ branches/nexuiz-2.0/.patchsets	2009-10-01 06:05:24 UTC (rev 8003)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7945,7948-7948,7951-7990
+revisions_applied = 1-7945,7948-7948,7951-7990,7993-8002


Property changes on: branches/nexuiz-2.0/data/Makefile
___________________________________________________________________
Name: svn:eol-style
   - LF
   + native


Property changes on: branches/nexuiz-2.0/data/apply-eol-style.sh
___________________________________________________________________
Name: svn:eol-style
   - LF
   + native


Property changes on: branches/nexuiz-2.0/data/balance25.cfg
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/nexuiz-2.0/data/balanceSamual.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceSamual.cfg	2009-10-01 05:36:49 UTC (rev 8002)
+++ branches/nexuiz-2.0/data/balanceSamual.cfg	2009-10-01 06:05:24 UTC (rev 8003)
@@ -523,19 +523,19 @@
 //   {{{ fireball
 set g_balance_fireball_primary_ammo 5
 set g_balance_fireball_primary_animtime 0.3
-set g_balance_fireball_primary_damage 50
+set g_balance_fireball_primary_damage 40
 set g_balance_fireball_primary_damageforcescale 4
 set g_balance_fireball_primary_damagetime 5
 set g_balance_fireball_primary_force 100
 set g_balance_fireball_primary_laserburntime 0.5
 set g_balance_fireball_primary_laserdamage 30
 set g_balance_fireball_primary_laseredgedamage 20
-set g_balance_fireball_primary_laserradius 128
+set g_balance_fireball_primary_laserradius 110
 set g_balance_fireball_primary_lifetime 7
-set g_balance_fireball_primary_refire 1
-set g_balance_fireball_primary_speed 700
+set g_balance_fireball_primary_refire 2
+set g_balance_fireball_primary_speed 900
 set g_balance_fireball_primary_speed_up 100
-set g_balance_fireball_secondary_ammo 15
+set g_balance_fireball_secondary_ammo 25
 set g_balance_fireball_secondary_animtime 0.15
 set g_balance_fireball_secondary_bfgdamage 100
 set g_balance_fireball_secondary_bfgforce 500
@@ -551,7 +551,7 @@
 set g_balance_fireball_secondary_laserradius 256
 set g_balance_fireball_secondary_lifetime 15
 set g_balance_fireball_secondary_radius 200
-set g_balance_fireball_secondary_refire 2
-set g_balance_fireball_secondary_refire2 0
+set g_balance_fireball_secondary_refire 0
+set g_balance_fireball_secondary_refire2 4
 set g_balance_fireball_secondary_speed 650
 //   }}}


Property changes on: branches/nexuiz-2.0/data/balanceSamual.cfg
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/build-compat-pack.sh
___________________________________________________________________
Name: svn:eol-style
   - LF
   + native


Property changes on: branches/nexuiz-2.0/data/check-sounds.sh
___________________________________________________________________
Name: svn:eol-style
   - LF
   + native


Property changes on: branches/nexuiz-2.0/data/default25.cfg
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/default26.cfg
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/nexuiz-2.0/data/effectinfo.txt
===================================================================
--- branches/nexuiz-2.0/data/effectinfo.txt	2009-10-01 05:36:49 UTC (rev 8002)
+++ branches/nexuiz-2.0/data/effectinfo.txt	2009-10-01 06:05:24 UTC (rev 8003)
@@ -889,7 +889,7 @@
 tex 47 47
 size 24 24
 alpha 256 256 0
-originjitter 16 16 16
+originjitter 14 14 14
 lightradius 200
 lightradiusfade 500
 lightcolor 8 0.4 0.4
@@ -969,7 +969,7 @@
 tex 56 59
 size 3 3
 alpha 256 256 0
-originjitter 6 6 6
+originjitter 10 10 10
 //lightradius 30
 //lightradiusfade 90
 //lightcolor 1 1 1
@@ -1052,7 +1052,7 @@
 tex 56 59
 size 5 5
 alpha 256 256 0
-originjitter 6 6 6
+originjitter 10 10 10
 lightradius 80
 lightradiusfade 800
 lightcolor 6 3.6 0.6
@@ -1227,7 +1227,7 @@
 tex 8 16
 size 48 48
 alpha 256 256 0
-originjitter 40 40 40
+originjitter 23 23 23
 lightradius 250
 lightradiusfade 400
 lightcolor 8 4 1
@@ -1376,7 +1376,7 @@
 tex 59 59
 size 32 32
 alpha 256 256 0
-originjitter 20 20 20
+originjitter 17 17 17
 lightradius 250
 lightradiusfade 250
 lightcolor 3.125 4.375 10
@@ -1423,7 +1423,7 @@
 tex 59 59
 size 32 32
 alpha 256 256 0
-originjitter 20 20 20
+originjitter 17 17 17
 lightradius 250
 lightradiusfade 250
 lightcolor 3.125 4.375 10
@@ -1468,7 +1468,7 @@
 tex 59 59
 size 64 64
 alpha 256 256 0
-originjitter 34 34 34
+originjitter 17 17 17
 lightradius 400
 lightradiusfade 300
 lightcolor 4 5 6
@@ -1683,7 +1683,7 @@
 tex 47 47
 size 24 24
 alpha 256 256 0
-originjitter 16 16 16
+originjitter 14 14 14
 lightradius 200
 lightradiusfade 250
 lightcolor 4 6 8
@@ -1801,7 +1801,7 @@
 tex 8 16
 size 28 38
 alpha 256 256 0
-originjitter 40 40 40
+originjitter 14 14 14
 lightradius 120
 lightradiusfade 400
 lightcolor 8 4 1
@@ -1989,7 +1989,7 @@
 tex 8 16
 size 72 72
 alpha 256 256 0
-originjitter 40 40 40
+originjitter 26 26 26
 lightradius 400
 lightradiusfade 750
 lightcolor 8 4 1
@@ -4255,7 +4255,7 @@
 tex 8 16
 size 72 72
 alpha 256 256 0
-originjitter 40 40 40
+originjitter 56 56 56
 lightradius 500
 lightradiusfade 500
 lightcolor 4 2 0.5


Property changes on: branches/nexuiz-2.0/data/find-eol-style.sh
___________________________________________________________________
Name: svn:eol-style
   - LF
   + native


Property changes on: branches/nexuiz-2.0/data/input-tuba.cfg
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/maps/compile_bloodprisonctf.sh
___________________________________________________________________
Name: svn:eol-style
   - LF
   + native


Property changes on: branches/nexuiz-2.0/data/maps/stormkeep2.mapinfo
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/maps/strength.sh
___________________________________________________________________
Name: svn:eol-style
   - LF
   + native

Modified: branches/nexuiz-2.0/data/maps/tutorial.waypoints.cache
===================================================================
--- branches/nexuiz-2.0/data/maps/tutorial.waypoints.cache	2009-10-01 05:36:49 UTC (rev 8002)
+++ branches/nexuiz-2.0/data/maps/tutorial.waypoints.cache	2009-10-01 06:05:24 UTC (rev 8003)
@@ -1,6 +1,6 @@
 '-22016.0 320.0 408.0'*'-21376.0 320.0 576.0'
 '-6880.0 336.0 432.0'*'-7424.0 640.0 448.0'
-'-2432.0 640.0 -468.0'*'-6896.0 640.0 480.7'
+'-2432.0 640.0 -468.0'*'-6894.9 640.0 480.7'
 '-4736.0 512.0 -616.0'*'-2432.0 384.0 -448.0'
 '  0.0 512.0 -600.0'*'1792.0 320.0 -448.0'
-'1792.0 512.0 -468.0'*'-350.5 512.0 -72.7'
+'1792.0 512.0 -468.0'*'-350.5 512.0 -73.0'


Property changes on: branches/nexuiz-2.0/data/merge-settings-into-cfg.pl
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/models/ctf/shockwavetransring.md3.framegroups
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/models/desertfactory/objects_metal/compile.sh
___________________________________________________________________
Name: svn:eol-style
   - LF
   + native


Property changes on: branches/nexuiz-2.0/data/models/desertfactory/objects_plants/compile.sh
___________________________________________________________________
Name: svn:eol-style
   - LF
   + native


Property changes on: branches/nexuiz-2.0/data/models/desertfactory/objects_wood/compile.sh
___________________________________________________________________
Name: svn:eol-style
   - LF
   + native


Property changes on: branches/nexuiz-2.0/data/models/desertfactory/structure_metal/compile.sh
___________________________________________________________________
Name: svn:eol-style
   - LF
   + native


Property changes on: branches/nexuiz-2.0/data/models/desertfactory/structure_stone/compile.sh
___________________________________________________________________
Name: svn:eol-style
   - LF
   + native


Property changes on: branches/nexuiz-2.0/data/models/desertfactory/structure_wood/compile.sh
___________________________________________________________________
Name: svn:eol-style
   - LF
   + native


Property changes on: branches/nexuiz-2.0/data/models/gibs/robo.md3_0.skin
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/models/gibs/robo.md3_1.skin
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/models/gibs/robo1.md3_0.skin
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/models/gibs/robo1.md3_1.skin
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/models/gibs/robo2.md3_0.skin
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/models/gibs/robo2.md3_1.skin
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/models/gibs/robo3.md3_0.skin
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/models/gibs/robo3.md3_1.skin
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/models/gibs/robo4.md3_0.skin
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/models/gibs/robo4.md3_1.skin
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/models/gibs/robo7.md3_0.skin
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/models/gibs/robo7.md3_1.skin
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/models/gibs/robo8.md3_0.skin
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/models/gibs/robo8.md3_1.skin
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/models/onslaught/shockwavetransring.md3.framegroups
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/nexuiz-2.0/data/models/spiderbot/spiderbot.dpm.framegroups
===================================================================
--- branches/nexuiz-2.0/data/models/spiderbot/spiderbot.dpm.framegroups	2009-10-01 05:36:49 UTC (rev 8002)
+++ branches/nexuiz-2.0/data/models/spiderbot/spiderbot.dpm.framegroups	2009-10-01 06:05:24 UTC (rev 8003)
@@ -1,6 +1,6 @@
-1   30  20 1 // forward
-32  30  20 1 // backward
-63  30  20 1 // left
-94  30 20 1 // right
-125 30 20 0 // jump
-0   1   20 0 // idle
+1   30  20 1 // forward
+32  30  20 1 // backward
+63  30  20 1 // left
+94  30 20 1 // right
+125 30 20 0 // jump
+0   1   20 0 // idle


Property changes on: branches/nexuiz-2.0/data/models/spiderbot/spiderbot.dpm.framegroups
___________________________________________________________________
Name: svn:eol-style
   + native

Copied: branches/nexuiz-2.0/data/models/sprites/flagdropped_frame0.tga (from rev 8002, trunk/data/models/sprites/flagdropped_frame0.tga)
===================================================================
(Binary files differ)


Property changes on: branches/nexuiz-2.0/data/models/sprites/make-sprites.sh
___________________________________________________________________
Name: svn:eol-style
   - LF
   + native

Modified: branches/nexuiz-2.0/data/models/turrets/ewheel-base2.md3.framegroups
===================================================================
--- branches/nexuiz-2.0/data/models/turrets/ewheel-base2.md3.framegroups	2009-10-01 05:36:49 UTC (rev 8002)
+++ branches/nexuiz-2.0/data/models/turrets/ewheel-base2.md3.framegroups	2009-10-01 06:05:24 UTC (rev 8003)
@@ -1,5 +1,5 @@
-1   1   1  0 // stop
-1   29  15 1 // forward slow
-1   29  30 1 // forward fast
-30  59  15 1 // back slow
-30  59  15 1 // back fast
+1   1   1  0 // stop
+1   29  15 1 // forward slow
+1   29  30 1 // forward fast
+30  59  15 1 // back slow
+30  59  15 1 // back fast


Property changes on: branches/nexuiz-2.0/data/models/turrets/ewheel-base2.md3.framegroups
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/models/weapons/h_fireball.dpm.framegroups
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/particles/particlefont.pl
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/particles/particlefont.txt
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/physics10.cfg
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/physics26.cfg
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/physicsQ2.cfg
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/physicsQ2a.cfg
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/qcsrc/client/modeleffects.qc
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/sbar.qc	2009-10-01 05:36:49 UTC (rev 8002)
+++ branches/nexuiz-2.0/data/qcsrc/client/sbar.qc	2009-10-01 06:05:24 UTC (rev 8003)
@@ -2209,6 +2209,15 @@
 	}
 }
 
+void Sbar_Reset (void)
+{
+	// reset gametype specific icons
+	if(gametype == GAME_KEYHUNT)
+		CSQC_kh_hudreset();
+	else if(gametype == GAME_CTF)
+		CSQC_ctf_hudreset();
+}
+
 void Sbar_Draw (void)
 {
 	// vectors for top right, bottom right, bottom and bottom left corners
@@ -2426,7 +2435,7 @@
   		else
 			Sbar_FinaleOverlay();
 
-		goto reset;
+		Sbar_Reset();
 	}
 	else if (sb_showscores_force || getstati(STAT_HEALTH) <= 0 || intermission == 1)
 	{
@@ -2437,7 +2446,7 @@
 		Sbar_Score();
 		Sbar_Timer();
 
-		goto reset;
+		Sbar_Reset();
   	}
 	else
 	{
@@ -2639,13 +2648,6 @@
 			CSQC_nb_hud();
 	}
 	return;
-
-:reset
-	// draw gametype specific icons
-	if(gametype == GAME_KEYHUNT)
-		CSQC_kh_hudreset();
-	else if(gametype == GAME_CTF)
-		CSQC_ctf_hudreset();
 }
 
 // CTF HUD
@@ -2873,7 +2875,7 @@
 				default:
 					break;
 			}
-			switch(i)
+			switch(i) // YAY! switch(i) inside a for loop for i. DailyWTF, here we come!
 			{
 				case 0:
 					drawpic (p, "gfx/hud/sb_kh_red", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key


Property changes on: branches/nexuiz-2.0/data/qcsrc/server/bot/aim.qh
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/qcsrc/server/bot/bot.qh
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/nexuiz-2.0/data/qcsrc/server/bot/havocbot/havocbot.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/bot/havocbot/havocbot.qc	2009-10-01 05:36:49 UTC (rev 8002)
+++ branches/nexuiz-2.0/data/qcsrc/server/bot/havocbot/havocbot.qc	2009-10-01 06:05:24 UTC (rev 8003)
@@ -382,6 +382,7 @@
 	maxspeed = cvar("sv_maxspeed");
 
 	// Jetpack navigation
+	if(self.goalcurrent)
 	if(self.navigation_jetpack_goal)
 	if(self.goalcurrent==self.navigation_jetpack_goal)
 	if(self.ammo_fuel)
@@ -806,6 +807,7 @@
 
 	// Bunnyhop!
 //	if(self.aistatus & AI_STATUS_ROAMING)
+	if(self.goalcurrent)
 	if(skill+self.bot_moveskill >= cvar("bot_ai_bunnyhop_skilloffset"))
 		havocbot_bunnyhop(dir);
 


Property changes on: branches/nexuiz-2.0/data/qcsrc/server/bot/havocbot/havocbot.qh
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/qcsrc/server/bot/havocbot/role_keyhunt.qc
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/qcsrc/server/bot/navigation.qh
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/qcsrc/server/bot/waypoints.qh
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/nexuiz-2.0/data/qcsrc/server/w_common.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_common.qc	2009-10-01 05:36:49 UTC (rev 8002)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_common.qc	2009-10-01 06:05:24 UTC (rev 8003)
@@ -187,7 +187,7 @@
 	f = pow(bound(0, vlen(self.velocity) / vlen(self.oldvelocity), 1), 2); // energy multiplier
 
 	if(other.solid == SOLID_BSP)
-		Damage_DamageInfo(self.origin, self.dmg * f, 0, 0, self.dmg_force * normalize(self.velocity) * f, self.projectiledeathtype, self);
+		Damage_DamageInfo(self.origin, self.dmg * f, 0, 0, max(1, self.dmg_force) * normalize(self.velocity) * f, self.projectiledeathtype, self);
 
 	if(other && other != self.enemy)
 	{
@@ -254,7 +254,7 @@
 	{
 		float f;
 		f = pow(bound(0, vlen(self.velocity) / vlen(self.oldvelocity), 1), 2); // energy multiplier
-		Damage_DamageInfo(self.origin, 0, 0, 0, self.dmg_force * normalize(self.velocity) * -f, self.projectiledeathtype, self);
+		Damage_DamageInfo(self.origin, 0, 0, 0, max(1, self.dmg_force) * normalize(self.velocity) * -f, self.projectiledeathtype, self);
 	}
 
 	UpdateCSQCProjectile(self);
@@ -512,7 +512,7 @@
 	{
 		pointparticles(particleeffectnum("TE_KNIGHTSPIKE"),end,trace_plane_normal * 2500,1);
 		if (trace_ent.solid == SOLID_BSP && !(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT))
-			Damage_DamageInfo(trace_endpos, damage, 0, 0, dir * force, dtype, self);
+			Damage_DamageInfo(trace_endpos, damage, 0, 0, dir * max(1, force), dtype, self);
 		Damage (trace_ent, self, self, damage, dtype, trace_endpos, dir * force);
 		//void(float effectnum, vector org, vector vel, float howmany) pointparticles = #337; // same as in CSQC
 	}


Property changes on: branches/nexuiz-2.0/data/qcsrc/server/w_fireball.qc
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/scripts/fireball.shader
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/scripts/nutsandbolts.shader
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/scripts/sphere.shader
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/scripts/stormkeep.shader
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/nexuiz-2.0/data/update-cvarcount.sh
___________________________________________________________________
Name: svn:eol-style
   - LF
   + native

