From: unknown <samual@xonotic.org>
Date: Sat, 27 Nov 2010 13:09:52 +0000 (-0500)
Subject: ACTUALLY commit the orbs now that I fixed their origin issue (Also: Commit the fix... 
X-Git-Tag: xonotic-v0.1.0preview~86^2~2^2~1^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0e90769eba4eafd9102491684cb2a79ba745c34a;p=xonotic%2Fxonotic-data.pk3dir.git

ACTUALLY commit the orbs now that I fixed their origin issue (Also: Commit the fix for the origin issue :P)
---

diff --git a/models/orbs/orbblue.md3 b/models/orbs/orbblue.md3
new file mode 100644
index 000000000..ac412e51d
Binary files /dev/null and b/models/orbs/orbblue.md3 differ
diff --git a/models/orbs/orbblue.tga b/models/orbs/orbblue.tga
new file mode 100644
index 000000000..325577f41
Binary files /dev/null and b/models/orbs/orbblue.tga differ
diff --git a/models/orbs/orbblue_glow.tga b/models/orbs/orbblue_glow.tga
new file mode 100644
index 000000000..d06af3190
Binary files /dev/null and b/models/orbs/orbblue_glow.tga differ
diff --git a/models/orbs/orbpink.md3 b/models/orbs/orbpink.md3
new file mode 100644
index 000000000..c6844d2ef
Binary files /dev/null and b/models/orbs/orbpink.md3 differ
diff --git a/models/orbs/orbpink.tga b/models/orbs/orbpink.tga
new file mode 100644
index 000000000..9dad41a21
Binary files /dev/null and b/models/orbs/orbpink.tga differ
diff --git a/models/orbs/orbpink_glow.tga b/models/orbs/orbpink_glow.tga
new file mode 100644
index 000000000..5f906382b
Binary files /dev/null and b/models/orbs/orbpink_glow.tga differ
diff --git a/models/orbs/orbred.md3 b/models/orbs/orbred.md3
new file mode 100644
index 000000000..041973a79
Binary files /dev/null and b/models/orbs/orbred.md3 differ
diff --git a/models/orbs/orbred.tga b/models/orbs/orbred.tga
new file mode 100644
index 000000000..ffb352e02
Binary files /dev/null and b/models/orbs/orbred.tga differ
diff --git a/models/orbs/orbred_glow.tga b/models/orbs/orbred_glow.tga
new file mode 100644
index 000000000..142092f20
Binary files /dev/null and b/models/orbs/orbred_glow.tga differ
diff --git a/models/orbs/orbyellow.md3 b/models/orbs/orbyellow.md3
new file mode 100644
index 000000000..ca63a33d4
Binary files /dev/null and b/models/orbs/orbyellow.md3 differ
diff --git a/models/orbs/orbyellow.tga b/models/orbs/orbyellow.tga
new file mode 100644
index 000000000..64b61f72b
Binary files /dev/null and b/models/orbs/orbyellow.tga differ
diff --git a/models/orbs/orbyellow_glow.tga b/models/orbs/orbyellow_glow.tga
new file mode 100644
index 000000000..9e0597b20
Binary files /dev/null and b/models/orbs/orbyellow_glow.tga differ
diff --git a/qcsrc/server/mutators/gamemode_keepaway.qc b/qcsrc/server/mutators/gamemode_keepaway.qc
index be5435c82..dd88aebc8 100644
--- a/qcsrc/server/mutators/gamemode_keepaway.qc
+++ b/qcsrc/server/mutators/gamemode_keepaway.qc
@@ -36,7 +36,7 @@ void ka_SpawnBall() // loads various values for the ball
 	e.scale = 1;
 	precache_model(e.model);
 	setmodel(e, e.model);
-	setsize(e, BALL_MINS, BALL_MAXS);
+	setsize(e, '-20 -20 -20', '20 20 20');
 	e.classname = "keepawayball";
 	e.damageforcescale = cvar("g_keepawayball_damageforcescale");
 	e.takedamage = DAMAGE_YES;
@@ -72,7 +72,7 @@ void ka_RespawnBall() // runs whenever the ball needs to be relocated
 		WaypointSprite_UpdateTeamRadar(self.waypointsprite_attachedforcarrier, RADARICON_FLAGCARRIER, '0 1 1');
 		WaypointSprite_Ping(self.waypointsprite_attachedforcarrier);	
 
-		sound(self, CHAN_AUTO, "keepaway/respawn.wav", VOL_BASE, ATTN_NONE);
+		sound(self, CHAN_AUTO, "keepaway/respawn.wav", VOL_BASE, ATTN_NONE); // no attenuation as this is a global sound
 	}
 	else
 	{
@@ -101,7 +101,7 @@ void ka_TouchEvent() // runs any time that the ball comes in contact with someth
 	self.owner = other;
 	other.ballcarried = self;
 	setattachment(self, other, "");
-	setorigin(self, BALL_ATTACHORG);
+	setorigin(self, '3 0 20');
 	
 	// make the ball invisible/unable to do anything
 	self.velocity = '0 0 0';
@@ -219,8 +219,8 @@ MUTATOR_HOOKFUNCTION(ka_PlayerPreThink)
 	if(self.ballcarried)
 		self.items |= IT_KEY1;
 	
-	if(self.BUTTON_USE)
-		if(self.ballcarried) { ka_DropEvent(self); } // drop the ball if the player presses the use button
+	if(self.BUTTON_USE) // drop the ball if the player presses the use button
+		if(self.ballcarried) { ka_DropEvent(self); } 
 
 	return 0;
 }
diff --git a/scripts/orbs.shader b/scripts/orbs.shader
new file mode 100644
index 000000000..26d1fdfa2
--- /dev/null
+++ b/scripts/orbs.shader
@@ -0,0 +1,48 @@
+models/orbs/orbblue
+{
+	deformVertexes autosprite
+	dpnoshadow
+
+ {
+	map models/orbs/orbblue.tga
+	blendfunc add
+	tcmod page 4 4 0.05
+	rgbgen vertex
+ }
+}
+models/orbs/orbred
+{
+	deformVertexes autosprite
+	dpnoshadow
+
+ {
+	map models/orbs/orbred.tga
+	blendfunc add
+	tcmod page 4 4 0.05
+	rgbgen vertex
+ }
+}
+models/orbs/orbyellow
+{
+	deformVertexes autosprite
+	dpnoshadow
+
+ {
+	map models/orbs/orbyellow.tga
+	blendfunc add
+	tcmod page 4 4 0.05
+	rgbgen vertex
+ }
+}
+models/orbs/orbpink
+{
+	deformVertexes autosprite
+	dpnoshadow
+
+ {
+	map models/orbs/orbpink.tga
+	blendfunc add
+	tcmod page 4 4 0.05
+	rgbgen vertex
+ }
+}
\ No newline at end of file