Merge remote branch 'origin/tzork/facility114x'

Conflicts:
	scripts/shaderlist.txt

diff --git a/scripts/common.shader b/scripts/common.shader
new file mode 100644 (file)
index 0000000..80632b8
--- /dev/null
+++ b/scripts/common.shader
@@ -0,0 +1,222 @@
+textures/common/antiportal\r
+{\r
+       qer_trans 0.30\r
+       qer_nocarve\r
+       surfaceparm nodraw\r
+       surfaceparm nonsolid\r
+       surfaceparm structural\r
+       surfaceparm trans\r
+       surfaceparm antiportal\r
+}\r
+\r
+textures/common/caulk\r
+{\r
+       surfaceparm nodraw\r
+       surfaceparm nolightmap\r
+       surfaceparm nomarks\r
+}\r
+\r
+textures/common/forcecaulk\r
+{\r
+       surfaceparm nodraw\r
+       surfaceparm nolightmap\r
+       surfaceparm nomarks\r
+       surfaceparm structural\r
+}\r
+\r
+textures/common/clip\r
+{\r
+       qer_trans 0.40\r
+       surfaceparm nodraw\r
+       surfaceparm nolightmap\r
+       surfaceparm nonsolid\r
+       surfaceparm trans\r
+       surfaceparm nomarks\r
+       surfaceparm noimpact\r
+       surfaceparm playerclip\r
+}\r
+\r
+textures/common/donotenter\r
+{\r
+       qer_trans 0.50\r
+       surfaceparm nodraw\r
+       surfaceparm nonsolid\r
+       surfaceparm trans\r
+       surfaceparm nomarks\r
+       surfaceparm donotenter\r
+}\r
+\r
+textures/common/full_clip // silly shader, use weapclip instead\r
+{\r
+       qer_trans 0.40\r
+       surfaceparm nodraw\r
+       surfaceparm playerclip\r
+}\r
+\r
+textures/common/hint // should NOT use surfaceparm hint.. strange but true\r
+{\r
+       qer_nocarve\r
+       qer_trans 0.30\r
+       surfaceparm nodraw\r
+       surfaceparm nonsolid\r
+       surfaceparm structural\r
+       surfaceparm trans\r
+       surfaceparm noimpact\r
+       surfaceparm hint        // ydnar: yes it should.\r
+}\r
+\r
+textures/common/invisible // solid, transparent polygons, casts shadows\r
+{\r
+       surfaceparm nolightmap\r
+        {\r
+               map textures/common/invisible.tga\r
+               alphaFunc GE128\r
+               depthWrite\r
+               rgbGen vertex\r
+       }       \r
+}\r
+\r
+textures/common/nodraw\r
+{\r
+       surfaceparm nodraw\r
+       surfaceparm nolightmap\r
+       surfaceparm nonsolid\r
+       surfaceparm trans\r
+       surfaceparm nomarks\r
+}\r
+\r
+textures/common/nodrawnonsolid\r
+{\r
+       surfaceparm nonsolid\r
+       surfaceparm nolightmap\r
+       surfaceparm nodraw\r
+}\r
+\r
+textures/common/nodrop\r
+{\r
+       qer_nocarve\r
+       qer_trans 0.5\r
+       surfaceparm nodraw\r
+       surfaceparm nolightmap\r
+       surfaceparm nonsolid\r
+       surfaceparm trans\r
+       surfaceparm nomarks\r
+       surfaceparm nodrop\r
+}\r
+\r
+\r
+textures/common/noimpact\r
+{\r
+       qer_editorimage textures/common/nolightmap.tga\r
+       qer_nocarve\r
+       qer_trans 0.5\r
+       surfaceparm nodraw\r
+       surfaceparm nolightmap\r
+       surfaceparm trans\r
+       surfaceparm nomarks\r
+       surfaceparm noimpact\r
+}\r
+\r
+textures/common/nolightmap\r
+{\r
+       surfaceparm nolightmap\r
+}\r
+\r
+textures/common/origin\r
+{\r
+       qer_nocarve\r
+       surfaceparm nodraw\r
+       surfaceparm nolightmap\r
+       surfaceparm nonsolid\r
+       surfaceparm trans\r
+       surfaceparm origin\r
+}\r
+\r
+textures/common/skip\r
+{\r
+       qer_nocarve\r
+       qer_trans 0.30\r
+       surfaceparm nodraw\r
+       surfaceparm nonsolid\r
+       surfaceparm skip\r
+       surfaceparm structural\r
+       surfaceparm trans\r
+}\r
+\r
+textures/common/terrain\r
+{\r
+       q3map_terrain\r
+       surfaceparm nodraw\r
+       surfaceparm nolightmap\r
+       surfaceparm nomarks\r
+}\r
+\r
+textures/common/terrain2\r
+{\r
+       q3map_terrain\r
+       qer_editorimage textures/common/terrain.tga\r
+       surfaceparm dust\r
+       surfaceparm nodraw\r
+       surfaceparm nomarks\r
+       surfaceparm nolightmap\r
+}\r
+\r
+textures/common/trigger\r
+{\r
+       qer_trans 0.50\r
+       qer_nocarve\r
+       surfaceparm nodraw\r
+}\r
+\r
+textures/common/weapclip\r
+{\r
+       qer_trans 0.40\r
+       surfaceparm nodraw\r
+       surfaceparm nolightmap\r
+       surfaceparm trans\r
+       surfaceparm nomarks\r
+}\r
+\r
+//\r
+// ydnar q3map lightgrid bounds\r
+//\r
+// the min/max bounds of brushes with this shader in a map\r
+// will define the bounds of the map's lightgrid (model lighting)\r
+// note: make it as small as possible around player space\r
+// to minimize bsp size and compile time\r
+//\r
+\r
+textures/common/lightgrid\r
+{\r
+       qer_trans 0.5\r
+       surfaceparm nodraw\r
+       surfaceparm nolightmap\r
+       surfaceparm nonsolid\r
+       surfaceparm detail\r
+       surfaceparm nomarks\r
+       surfaceparm trans\r
+       surfaceparm lightgrid\r
+}\r
+\r
+textures/common/warpzone\r
+{\r
+       surfaceparm nolightmap\r
+       // surfaceparm nonsolid // no, it must be solid like trigger\r
+       surfaceparm trans\r
+       surfaceparm nomarks\r
+       {\r
+               map textures/common/mirror1.tga // fully transparent\r
+               blendfunc blend\r
+       }\r
+       dp_camera\r
+       dp_refract 1 1 1 1 // makes the camera render like a refraction\r
+}\r
+\r
+textures/common/camera\r
+{\r
+       {\r
+               map textures/common/mirror1.tga // fully transparent\r
+               blendfunc blend\r
+       }\r
+       dp_camera\r
+}\r

diff --git a/scripts/entities.def b/scripts/entities.def
index 8e6b9b5bfab57388ccf6d4045bcd772afff7ec76..8a89f28f1e408ede8d21e474ae702a2c521054e1 100644 (file)
--- a/scripts/entities.def
+++ b/scripts/entities.def
@@ -1431,7 +1431,7 @@ Example is a Mario-style question mark block which could throw a new weapon_nex
 -------- KEYS --------
 targetname: used to trigger this
 message: entity field list
-target: when set, target_spawn edits entities, instead of creating new ones
+target: when set, target_spawn edits entities, instead of creating new ones; the special value *activator causes the activator to be edited
 count: make sure no more than count entities have been created by this (refuse to spawn new ones if exceeded)
 killtarget: reference entity (can be used as $killtarget)
 target2: reference entity (can be used as $target2)
@@ -1775,3 +1775,31 @@ Must target a target_position that indicates the view to be shown (and whose ang
 target: must point to a target_position
 */
 
+/*QUAKED target_music (1 0 0) (-8 -8 -8) (8 8 8)
+Background music target (when this is used, the cdtrack line in mapinfo must not be used, and there MUST be a default target_music).
+When triggered, the background music is switched to the given track.
+When targetname is not set, this is the default track of the map.
+-------- KEYS --------
+targetname: The name other entities can use to target this entity (when not set, this one is the default)
+noise: the music to play (as full sound file name)
+volume: the volume (default: 1)
+fade_time: fade-in time
+fade_rate: fade-out time
+lifetime: when set, the music created by this target is switched back to the default one when this time expires
+-------- SPAWNFLAGS --------
+START_OFF: the trigger is off initially
+*/
+
+/*QUAKED trigger_music (1 0 0) ?
+Background music trigger (when this is used, the cdtrack line in mapinfo must not be used, and there MUST be a default target_music).
+When triggered, its effect is turned off until triggered again.
+-------- KEYS --------
+targetname: The name other entities can use to target this entity
+noise: the music to play (as full sound file name)
+volume: the volume (default: 1)
+fade_time: fade-in time
+fade_rate: fade-out time
+-------- SPAWNFLAGS --------
+START_OFF: the trigger is off initially
+*/
+

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index b3ceaa311e01bdc73691c837db6d054f591817b7..73b57b56aaf3b5f041713fc209de8ada09f19dd2 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -1,5 +1,6 @@
+common
 exosystem
 exx
 trak5x
 trak4x
-facility114x
\ No newline at end of file
+facility114x

diff --git a/textures/common/antiportal.tga b/textures/common/antiportal.tga
new file mode 100644 (file)
index 0000000..8a90743
Binary files /dev/null and b/textures/common/antiportal.tga differ

diff --git a/textures/common/camera.tga b/textures/common/camera.tga
new file mode 100644 (file)
index 0000000..73077b3
Binary files /dev/null and b/textures/common/camera.tga differ

diff --git a/textures/common/caulk.tga b/textures/common/caulk.tga
new file mode 100644 (file)
index 0000000..6293d3d
Binary files /dev/null and b/textures/common/caulk.tga differ

diff --git a/textures/common/clip.tga b/textures/common/clip.tga
new file mode 100644 (file)
index 0000000..947cfce
Binary files /dev/null and b/textures/common/clip.tga differ

diff --git a/textures/common/donotenter.tga b/textures/common/donotenter.tga
new file mode 100644 (file)
index 0000000..8f3ddc4
Binary files /dev/null and b/textures/common/donotenter.tga differ

diff --git a/textures/common/forcecaulk.tga b/textures/common/forcecaulk.tga
new file mode 100644 (file)
index 0000000..50709f8
Binary files /dev/null and b/textures/common/forcecaulk.tga differ

diff --git a/textures/common/full_clip.tga b/textures/common/full_clip.tga
new file mode 100644 (file)
index 0000000..22591e8
Binary files /dev/null and b/textures/common/full_clip.tga differ

diff --git a/textures/common/hint.tga b/textures/common/hint.tga
new file mode 100644 (file)
index 0000000..ae760e1
Binary files /dev/null and b/textures/common/hint.tga differ

diff --git a/textures/common/invisible.tga b/textures/common/invisible.tga
new file mode 100644 (file)
index 0000000..5e28f19
Binary files /dev/null and b/textures/common/invisible.tga differ

diff --git a/textures/common/lightgrid.tga b/textures/common/lightgrid.tga
new file mode 100644 (file)
index 0000000..976216e
Binary files /dev/null and b/textures/common/lightgrid.tga differ

diff --git a/textures/common/nodraw.tga b/textures/common/nodraw.tga
new file mode 100644 (file)
index 0000000..c7393ed
Binary files /dev/null and b/textures/common/nodraw.tga differ

diff --git a/textures/common/nodrawnonsolid.tga b/textures/common/nodrawnonsolid.tga
new file mode 100644 (file)
index 0000000..94e5493
Binary files /dev/null and b/textures/common/nodrawnonsolid.tga differ

diff --git a/textures/common/nodrop.tga b/textures/common/nodrop.tga
new file mode 100644 (file)
index 0000000..2b202b6
Binary files /dev/null and b/textures/common/nodrop.tga differ

diff --git a/textures/common/nolightmap.tga b/textures/common/nolightmap.tga
new file mode 100644 (file)
index 0000000..4f4a59d
Binary files /dev/null and b/textures/common/nolightmap.tga differ

diff --git a/textures/common/origin.tga b/textures/common/origin.tga
new file mode 100644 (file)
index 0000000..2f54462
Binary files /dev/null and b/textures/common/origin.tga differ

diff --git a/textures/common/skip.tga b/textures/common/skip.tga
new file mode 100644 (file)
index 0000000..703a39f
Binary files /dev/null and b/textures/common/skip.tga differ

diff --git a/textures/common/terrain.tga b/textures/common/terrain.tga
new file mode 100644 (file)
index 0000000..16a2482
Binary files /dev/null and b/textures/common/terrain.tga differ

diff --git a/textures/common/trigger.tga b/textures/common/trigger.tga
new file mode 100644 (file)
index 0000000..1879a5e
Binary files /dev/null and b/textures/common/trigger.tga differ

diff --git a/textures/common/warpzone.tga b/textures/common/warpzone.tga
new file mode 100644 (file)
index 0000000..8ec7774
Binary files /dev/null and b/textures/common/warpzone.tga differ

diff --git a/textures/common/weapclip.tga b/textures/common/weapclip.tga
new file mode 100644 (file)
index 0000000..97579e5
Binary files /dev/null and b/textures/common/weapclip.tga differ

diff --git a/textures/common/white.tga b/textures/common/white.tga
new file mode 100644 (file)
index 0000000..fa786f2
Binary files /dev/null and b/textures/common/white.tga differ

diff --git a/textures/radiant/notex.tga b/textures/radiant/notex.tga
new file mode 100644 (file)
index 0000000..d0781f7
Binary files /dev/null and b/textures/radiant/notex.tga differ

diff --git a/textures/radiant/shadernotex.tga b/textures/radiant/shadernotex.tga
new file mode 100644 (file)
index 0000000..477fd86
Binary files /dev/null and b/textures/radiant/shadernotex.tga differ