r5072 - in trunk/data: models qcsrc/server scripts textures textures/portals
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Nov 21 11:40:52 EST 2008
Author: m0rfar
Date: 2008-11-21 11:40:52 -0500 (Fri, 21 Nov 2008)
New Revision: 5072
Added:
trunk/data/models/portal.md3_0.skin
trunk/data/models/portal.md3_1.skin
trunk/data/models/portal.md3_2.skin
trunk/data/scripts/portals.shader
trunk/data/textures/portals/
trunk/data/textures/portals/portals_blue.tga
trunk/data/textures/portals/portals_blue_gloss.tga
trunk/data/textures/portals/portals_blue_glow.tga
trunk/data/textures/portals/portals_blue_norm.tga
trunk/data/textures/portals/portals_blue_vortex.tga
trunk/data/textures/portals/portals_inactive.tga
trunk/data/textures/portals/portals_inactive_vortex.tga
trunk/data/textures/portals/portals_red.tga
trunk/data/textures/portals/portals_red_gloss.tga
trunk/data/textures/portals/portals_red_glow.tga
trunk/data/textures/portals/portals_red_norm.tga
trunk/data/textures/portals/portals_red_vortex.tga
Modified:
trunk/data/models/portal.md3
trunk/data/qcsrc/server/portals.qc
trunk/data/scripts/shaderlist.txt
Log:
New portal models by ai!
I helped with .skin and .shader files. And changed the qc code to use the correct skins.
Modified: trunk/data/models/portal.md3
===================================================================
(Binary files differ)
Added: trunk/data/models/portal.md3_0.skin
===================================================================
--- trunk/data/models/portal.md3_0.skin (rev 0)
+++ trunk/data/models/portal.md3_0.skin 2008-11-21 16:40:52 UTC (rev 5072)
@@ -0,0 +1,2 @@
+portal,textures/portals/portals_red.tga
+vortex,portals_red_vortex
Added: trunk/data/models/portal.md3_1.skin
===================================================================
--- trunk/data/models/portal.md3_1.skin (rev 0)
+++ trunk/data/models/portal.md3_1.skin 2008-11-21 16:40:52 UTC (rev 5072)
@@ -0,0 +1,2 @@
+portal,textures/portals/portals_blue.tga
+vortex,portals_blue_vortex
Added: trunk/data/models/portal.md3_2.skin
===================================================================
--- trunk/data/models/portal.md3_2.skin (rev 0)
+++ trunk/data/models/portal.md3_2.skin 2008-11-21 16:40:52 UTC (rev 5072)
@@ -0,0 +1,2 @@
+portal,textures/portals/portals_inactive.tga
+vortex,portals_inactive_vortex
Modified: trunk/data/qcsrc/server/portals.qc
===================================================================
--- trunk/data/qcsrc/server/portals.qc 2008-11-21 13:57:34 UTC (rev 5071)
+++ trunk/data/qcsrc/server/portals.qc 2008-11-21 16:40:52 UTC (rev 5072)
@@ -312,44 +312,44 @@
void Portal_Think();
void Portal_MakeBrokenPortal(entity portal)
{
+ portal.skin = 2;
portal.solid = SOLID_NOT;
portal.touch = SUB_Null;
portal.think = SUB_Null;
portal.effects = 0;
- //portal.colormod = '1 1 1';
portal.nextthink = 0;
portal.takedamage = DAMAGE_NO;
}
void Portal_MakeWaitingPortal(entity portal)
{
+ portal.skin = 2;
portal.solid = SOLID_NOT;
portal.touch = SUB_Null;
portal.think = SUB_Null;
portal.effects = EF_ADDITIVE;
- portal.colormod = '1 1 1';
portal.nextthink = 0;
portal.takedamage = DAMAGE_YES;
}
void Portal_MakeInPortal(entity portal)
{
+ portal.skin = 0;
portal.solid = SOLID_TRIGGER;
portal.touch = Portal_Touch;
portal.think = Portal_Think;
portal.effects = EF_RED;
- portal.colormod = '1 0 0';
portal.nextthink = time;
portal.takedamage = DAMAGE_NO;
}
void Portal_MakeOutPortal(entity portal)
{
+ portal.skin = 1;
portal.solid = SOLID_NOT;
portal.touch = SUB_Null;
portal.think = SUB_Null;
portal.effects = EF_STARDUST | EF_BLUE;
- portal.colormod = '0 0 1';
portal.nextthink = 0;
portal.takedamage = DAMAGE_YES;
}
Added: trunk/data/scripts/portals.shader
===================================================================
--- trunk/data/scripts/portals.shader (rev 0)
+++ trunk/data/scripts/portals.shader 2008-11-21 16:40:52 UTC (rev 5072)
@@ -0,0 +1,32 @@
+portals_red_vortex
+{
+ cull none
+ deformVertexes wave 150.0 sin 2 0.5 0 2
+ {
+ map textures/portals/portals_red_vortex.tga
+ tcMod rotate 10
+ blendfunc blend
+ }
+}
+
+portals_blue_vortex
+{
+ cull none
+ deformVertexes wave 150.0 sin 2 0.5 0 2
+ {
+ map textures/portals/portals_blue_vortex.tga
+ tcMod rotate 10
+ blendfunc blend
+ }
+}
+
+portals_inactive_vortex
+{
+ cull none
+ deformVertexes wave 150.0 sin 2 0.5 0 2
+ {
+ map textures/portals/portals_inactive_vortex.tga
+ tcMod rotate 10
+ blendfunc blend
+ }
+}
Modified: trunk/data/scripts/shaderlist.txt
===================================================================
--- trunk/data/scripts/shaderlist.txt 2008-11-21 13:57:34 UTC (rev 5071)
+++ trunk/data/scripts/shaderlist.txt 2008-11-21 16:40:52 UTC (rev 5072)
@@ -23,7 +23,8 @@
mflag
morphed
nexdm18_rmx
-official_cmp1
+official_cmp1
+portals
reaper
ruiner
savdm6ish
Added: trunk/data/textures/portals/portals_blue.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/portals/portals_blue.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/portals/portals_blue_gloss.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/portals/portals_blue_gloss.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/portals/portals_blue_glow.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/portals/portals_blue_glow.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/portals/portals_blue_norm.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/portals/portals_blue_norm.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/portals/portals_blue_vortex.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/portals/portals_blue_vortex.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/portals/portals_inactive.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/portals/portals_inactive.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/portals/portals_inactive_vortex.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/portals/portals_inactive_vortex.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/portals/portals_red.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/portals/portals_red.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/portals/portals_red_gloss.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/portals/portals_red_gloss.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/portals/portals_red_glow.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/portals/portals_red_glow.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/portals/portals_red_norm.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/portals/portals_red_norm.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/portals/portals_red_vortex.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/portals/portals_red_vortex.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the nexuiz-commits
mailing list