From: Rudolf Polzer Date: Thu, 6 May 2010 14:55:25 +0000 (+0200) Subject: Merge remote branch 'origin/tzork/facility114x' X-Git-Tag: xonotic-v0.1.0preview~175^2~2 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=f879e0523ca5a81650ea0edee80ad5a8410e25ae;hp=8e9fd7bd22f6c4efadb84ce788f820eed6a3abdd Merge remote branch 'origin/tzork/facility114x' Conflicts: scripts/shaderlist.txt --- diff --git a/scripts/common.shader b/scripts/common.shader new file mode 100644 index 00000000..80632b80 --- /dev/null +++ b/scripts/common.shader @@ -0,0 +1,222 @@ +textures/common/antiportal +{ + qer_trans 0.30 + qer_nocarve + surfaceparm nodraw + surfaceparm nonsolid + surfaceparm structural + surfaceparm trans + surfaceparm antiportal +} + +textures/common/caulk +{ + surfaceparm nodraw + surfaceparm nolightmap + surfaceparm nomarks +} + +textures/common/forcecaulk +{ + surfaceparm nodraw + surfaceparm nolightmap + surfaceparm nomarks + surfaceparm structural +} + +textures/common/clip +{ + qer_trans 0.40 + surfaceparm nodraw + surfaceparm nolightmap + surfaceparm nonsolid + surfaceparm trans + surfaceparm nomarks + surfaceparm noimpact + surfaceparm playerclip +} + +textures/common/donotenter +{ + qer_trans 0.50 + surfaceparm nodraw + surfaceparm nonsolid + surfaceparm trans + surfaceparm nomarks + surfaceparm donotenter +} + +textures/common/full_clip // silly shader, use weapclip instead +{ + qer_trans 0.40 + surfaceparm nodraw + surfaceparm playerclip +} + +textures/common/hint // should NOT use surfaceparm hint.. strange but true +{ + qer_nocarve + qer_trans 0.30 + surfaceparm nodraw + surfaceparm nonsolid + surfaceparm structural + surfaceparm trans + surfaceparm noimpact + surfaceparm hint // ydnar: yes it should. +} + +textures/common/invisible // solid, transparent polygons, casts shadows +{ + surfaceparm nolightmap + { + map textures/common/invisible.tga + alphaFunc GE128 + depthWrite + rgbGen vertex + } +} + +textures/common/nodraw +{ + surfaceparm nodraw + surfaceparm nolightmap + surfaceparm nonsolid + surfaceparm trans + surfaceparm nomarks +} + +textures/common/nodrawnonsolid +{ + surfaceparm nonsolid + surfaceparm nolightmap + surfaceparm nodraw +} + +textures/common/nodrop +{ + qer_nocarve + qer_trans 0.5 + surfaceparm nodraw + surfaceparm nolightmap + surfaceparm nonsolid + surfaceparm trans + surfaceparm nomarks + surfaceparm nodrop +} + + +textures/common/noimpact +{ + qer_editorimage textures/common/nolightmap.tga + qer_nocarve + qer_trans 0.5 + surfaceparm nodraw + surfaceparm nolightmap + surfaceparm trans + surfaceparm nomarks + surfaceparm noimpact +} + +textures/common/nolightmap +{ + surfaceparm nolightmap +} + +textures/common/origin +{ + qer_nocarve + surfaceparm nodraw + surfaceparm nolightmap + surfaceparm nonsolid + surfaceparm trans + surfaceparm origin +} + +textures/common/skip +{ + qer_nocarve + qer_trans 0.30 + surfaceparm nodraw + surfaceparm nonsolid + surfaceparm skip + surfaceparm structural + surfaceparm trans +} + +textures/common/terrain +{ + q3map_terrain + surfaceparm nodraw + surfaceparm nolightmap + surfaceparm nomarks +} + +textures/common/terrain2 +{ + q3map_terrain + qer_editorimage textures/common/terrain.tga + surfaceparm dust + surfaceparm nodraw + surfaceparm nomarks + surfaceparm nolightmap +} + +textures/common/trigger +{ + qer_trans 0.50 + qer_nocarve + surfaceparm nodraw +} + +textures/common/weapclip +{ + qer_trans 0.40 + surfaceparm nodraw + surfaceparm nolightmap + surfaceparm trans + surfaceparm nomarks +} + +// +// ydnar q3map lightgrid bounds +// +// the min/max bounds of brushes with this shader in a map +// will define the bounds of the map's lightgrid (model lighting) +// note: make it as small as possible around player space +// to minimize bsp size and compile time +// + +textures/common/lightgrid +{ + qer_trans 0.5 + surfaceparm nodraw + surfaceparm nolightmap + surfaceparm nonsolid + surfaceparm detail + surfaceparm nomarks + surfaceparm trans + surfaceparm lightgrid +} + +textures/common/warpzone +{ + surfaceparm nolightmap + // surfaceparm nonsolid // no, it must be solid like trigger + surfaceparm trans + surfaceparm nomarks + { + map textures/common/mirror1.tga // fully transparent + blendfunc blend + } + dp_camera + dp_refract 1 1 1 1 // makes the camera render like a refraction +} + +textures/common/camera +{ + { + map textures/common/mirror1.tga // fully transparent + blendfunc blend + } + dp_camera +} diff --git a/scripts/entities.def b/scripts/entities.def index 8e6b9b5b..8a89f28f 100644 --- 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 b3ceaa31..73b57b56 100644 --- 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 index 00000000..8a90743a 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 index 00000000..73077b30 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 index 00000000..6293d3d4 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 index 00000000..947cfce4 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 index 00000000..8f3ddc45 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 index 00000000..50709f8d 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 index 00000000..22591e85 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 index 00000000..ae760e1f 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 index 00000000..5e28f199 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 index 00000000..976216e5 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 index 00000000..c7393edf 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 index 00000000..94e5493f 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 index 00000000..2b202b66 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 index 00000000..4f4a59d5 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 index 00000000..2f544621 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 index 00000000..703a39ff 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 index 00000000..16a24828 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 index 00000000..1879a5eb 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 index 00000000..8ec7774f 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 index 00000000..97579e57 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 index 00000000..fa786f29 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 index 00000000..d0781f7a 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 index 00000000..477fd86d Binary files /dev/null and b/textures/radiant/shadernotex.tga differ