Merge remote-tracking branch 'origin/atheros/secret'

diff --git a/scripts/effects_warpzone.shader b/scripts/effects_warpzone.shader
index ebb9d26db804177b752b4b0279455ee813e2374c..dee4b2bb1ea090489ca3787857d4cc8bf17303fd 100644 (file)
--- a/scripts/effects_warpzone.shader
+++ b/scripts/effects_warpzone.shader
@@ -38,6 +38,19 @@ textures/effects_warpzone/rededge
        }
 }
 
+textures/effects_warpzone/greenedge
+{
+       surfaceparm nonsolid
+       surfaceparm nomarks
+       q3map_surfacelight 2500
+       cull none
+       {
+               map textures/effects_warpzone/greenedge.tga
+               blendfunc GL_SRC_ALPHA GL_ONE
+       }
+}
+
+
 textures/effects_warpzone/warpzone_backdrop
 {
        surfaceparm nomarks

diff --git a/scripts/entities.def b/scripts/entities.def
index f782f5c37983262dc2546f6c521b22ca13f6af8b..040595af0cf2b4f7610bfa0d0877c4e82443d807 100644 (file)
--- a/scripts/entities.def
+++ b/scripts/entities.def
@@ -129,7 +129,7 @@ health: (default 0) if set to any non-zero value, the button must take damage (a
 NOSPLASH: if set, splash damage cannot activate the door, only direct damage can (requires health to be set)
 */
 
-/*QUAKED func_door (0 .5 .8) ? START_OPEN - DOOR_DONT_LINK - - TOGGLE - - NOSPLASH
+/*QUAKED func_door (0 .5 .8) ? START_OPEN - DOOR_DONT_LINK GOLD_KEY SILVER_KEY TOGGLE - - NOSPLASH
 Normal sliding door entity. By default, the door will activate when player walks close to it or when damage is inflicted to it.
 If DOOR_DONT_LINK is not set, the door will be linked with all doors it touches. Note however that for linked doors to work properly, it is necessary that ALL linked doors have SOME volume of common area (that is, there must be a point that is part of ALL doors).
 -------- KEYS --------
@@ -146,11 +146,16 @@ dmg: damage to inflict when blocked (when triggered and someone is in the way)
 sounds: when 1, use default door sounds
 noise1: sound when the door opens
 noise2: sound when the door closes
+itemkeys: keys required to open this door.
 -------- SPAWNFLAGS --------
 START_OPEN: causes the door to move to its destination when spawned, and operate in reverse.  It is used to temporarily or permanently close off an area when triggered (not useful for touch or damage triggered doors).
 DOOR_DONT_LINK: the door won't link with another door it touches
+GOLD_KEY: causes the door to open only if the activator holds a gold key (Q1 compatibility).
+SILVER_KEY: causes the door to open only if the activator holds a silver key (Q1 compatibility).
 TOGGLE: causes the door to wait in both the start and end states for a trigger event.
 NOSPLASH: if set, splash damage cannot activate the door, only direct damage can (requires health to be set)
+-------- NOTES --------
+More information about keys can be found in item_key description.
 */
 
 /*QUAKED func_door_rotating (0 .5 .8) ? START_OPEN BIDIR DOOR_DONT_LINK BIDIR_IN_DOWN - TOGGLE X_AXIS Y_AXIS NOSPLASH
@@ -573,6 +578,59 @@ FLOATING: the item will float in air, instead of aligning to the floor by fallin
 modeldisabled="models/items/g_invincible.md3"
 */
 
+/*QUAKED item_key (0 .5 .8) (-16 -16 -24) (16 16 32) FLOATING
+A key entity.
+The itemkeys should contain one of the following key IDs:
+1 - GOLD key - 
+2 - SILVER key
+4 - BRONZE key
+8 - RED keycard
+16 - BLUE keycard
+32 - GREEN keycard
+Custom keys:
+... - last key is 1<<23
+Keys with bigger Id than 32 don't have a default netname and model, if you use one of them, you MUST provide those.
+-----------KEYS------------
+colormod: color of the key (default: '.9 .9 .9').
+itemkeys: a key Id.
+message: message to print when player picks up this key.
+model: custom key model to use.
+netname: the display name of the key.
+noise: custom sound to play when player picks up the key.
+-------- SPAWNFLAGS --------
+FLOATING: the item will float in air, instead of aligning to the floor by falling
+---------NOTES----------
+This is the only correct way to put keys on the map!
+
+itemkeys MUST always have exactly one bit set.
+*/
+
+/*QUAKED item_key1 (0 .5 .8) (-16 -16 -24) (16 16 32) FLOATING
+SILVER key.
+-----------KEYS------------
+colormod: color of the key (default: '.9 .9 .9').
+message: message to print when player picks up this key.
+model: custom model to use.
+noise: custom sound to play when player picks up the key.
+-------- SPAWNFLAGS --------
+FLOATING: the item will float in air, instead of aligning to the floor by falling
+---------NOTES----------
+Don't use this entity on new maps! Use item_key instead.
+*/
+
+/*QUAKED item_key2 (0 .5 .8) (-16 -16 -24) (16 16 32) FLOATING
+GOLD key.
+-----------KEYS------------
+colormod: color of the key (default: '1 .9 0').
+message: message to print when player picks up this key.
+model: custom model to use.
+noise: custom sound to play when player picks up the key.
+-------- SPAWNFLAGS --------
+FLOATING: the item will float in air, instead of aligning to the floor by falling
+---------NOTES----------
+Don't use this entity on new maps! Use item_key instead.
+*/
+
 /*QUAKED item_minst_cells (.3 .3 1) (-30 -30 0) (30 30 32) FLOATING
 Minstagib ammo.
 Always contains 5 (g_minstagib_ammo_drop) shots.
@@ -1072,6 +1130,26 @@ strength: "wind field", "gravity field": amount of force per second to apply. "d
 falloff: "gravity field": 0 means no falloff, 1 means linear falloff (zero at the outside), 2 means inverted linear falloff (zero at the inside)
 */
 
+/*QUAKED trigger_keylock (.0 .5 .8) ?
+Keylock trigger.  Must target other entities.
+This trigger will trigger target entities when all required keys are provided.
+-------- KEYS --------
+itemkeys: A bit field with key IDs that are needed to open this lock.
+sounds: 1 to play misc/secret.wav, 2 to play misc/talk.wav, 3 to play misc/trigger1.wav (3 is default)
+target: trigger all entities with this targetname when triggered and all keys have been given to it, then remove this trigger
+target2: trigger all entities with this targetname when triggered without giving it all the required keys.
+killtarget: remove all entities with this targetname when triggered with all the needed keys.
+message: print this message to the player who activated the trigger when all needed keys have been given.
+message2: print this message to the player who activated the trigger when not all of the needed keys have been given.
+noise: sound to play when lock gets unlocked (default: see sounds)
+noise1: sound to play when only some of the needed key were used but not all (default: misc/decreasevalue.wav)
+noise2: sound to play when a key is missing (default: misc/talk.wav)
+wait: prevent triggering again for this amount of time (default: 5) - applies to target2, target3, target4.
+---------NOTES----------
+If spawned without any key specified in itemkeys, this trigger will display an error and remove itself.
+message2 and noise2 will be resent to the player every 2 seconds while he is in the trigger zone.
+*/
+
 /*QUAKED trigger_multiple (.5 .5 .5) ? NOTOUCH ALLENTS INVERT_TEAM - - - - - NOSPLASH
 Variable sized repeatable trigger.  Must be targeted at one or more entities.  If "health" is set, the trigger must be killed to activate each time.
 -------- KEYS --------

diff --git a/scripts/ex2x.shader b/scripts/ex2x.shader
index 1fda6c912f8aee5a957d135484df24c316626799..0069b1a0c3abe2432fcc5b7643d85183e63f4d94 100644 (file)
--- a/scripts/ex2x.shader
+++ b/scripts/ex2x.shader
@@ -453,6 +453,28 @@ textures/ex2x/light-beam_red
                map textures/ex2x/light/light_beam_red.tga
                
 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/ex2x/light-beam_green
+{
+       qer_editorimage textures/ex2x/light/light_beam_green.tga
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 0.5 match8 99
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
+       {
+               map textures/ex2x/light/light_beam_green.tga
+               
+
        }
        {
                map $lightmap

diff --git a/scripts/facility114invx.shader b/scripts/facility114invx.shader
index 092aa6a3adb0c041fdf4032790e2ee3cce572906..c200057dc7c9dcec5b81030bfe16b3a5c84faaa5 100644 (file)
--- a/scripts/facility114invx.shader
+++ b/scripts/facility114invx.shader
@@ -208,6 +208,46 @@ textures/facility114invx/misc-lift02inv
                map textures/facility114invx/misc/lift02inv.tga
                
 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/facility114invx/misc-lift02invred
+{
+       qer_editorimage textures/facility114invx/misc/lift02invred.tga
+       dpoffsetmapping - 1 match8 98
+       
+       q3map_bounceScale 1.25
+
+
+       {
+               map textures/facility114invx/misc/lift02invred.tga
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/facility114invx/misc-lift02invgreen
+{
+       qer_editorimage textures/facility114invx/misc/lift02invgreen.tga
+       dpoffsetmapping - 1 match8 98
+       
+       q3map_bounceScale 1.25
+
+
+       {
+               map textures/facility114invx/misc/lift02invgreen.tga
+               
+
        }
        {
                map $lightmap

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

diff --git a/textures/ex2x/light/light_beam_green.tga b/textures/ex2x/light/light_beam_green.tga
new file mode 100644 (file)
index 0000000..0a5b648
Binary files /dev/null and b/textures/ex2x/light/light_beam_green.tga differ

diff --git a/textures/ex2x/light/light_beam_green_gloss.tga b/textures/ex2x/light/light_beam_green_gloss.tga
new file mode 100644 (file)
index 0000000..b5e08cf
Binary files /dev/null and b/textures/ex2x/light/light_beam_green_gloss.tga differ

diff --git a/textures/ex2x/light/light_beam_green_glow.tga b/textures/ex2x/light/light_beam_green_glow.tga
new file mode 100644 (file)
index 0000000..eb3cb16
Binary files /dev/null and b/textures/ex2x/light/light_beam_green_glow.tga differ

diff --git a/textures/ex2x/light/light_beam_green_norm.tga b/textures/ex2x/light/light_beam_green_norm.tga
new file mode 100644 (file)
index 0000000..f179cb6
Binary files /dev/null and b/textures/ex2x/light/light_beam_green_norm.tga differ

diff --git a/textures/facility114invx/misc/lift02invgreen.tga b/textures/facility114invx/misc/lift02invgreen.tga
new file mode 100644 (file)
index 0000000..eeda123
Binary files /dev/null and b/textures/facility114invx/misc/lift02invgreen.tga differ

diff --git a/textures/facility114invx/misc/lift02invgreen_gloss.tga b/textures/facility114invx/misc/lift02invgreen_gloss.tga
new file mode 100644 (file)
index 0000000..dd648a2
Binary files /dev/null and b/textures/facility114invx/misc/lift02invgreen_gloss.tga differ

diff --git a/textures/facility114invx/misc/lift02invgreen_norm.tga b/textures/facility114invx/misc/lift02invgreen_norm.tga
new file mode 100644 (file)
index 0000000..de85c54
Binary files /dev/null and b/textures/facility114invx/misc/lift02invgreen_norm.tga differ

diff --git a/textures/facility114invx/misc/lift02invred.tga b/textures/facility114invx/misc/lift02invred.tga
new file mode 100644 (file)
index 0000000..db53e67
Binary files /dev/null and b/textures/facility114invx/misc/lift02invred.tga differ

diff --git a/textures/facility114invx/misc/lift02invred_gloss.tga b/textures/facility114invx/misc/lift02invred_gloss.tga
new file mode 100644 (file)
index 0000000..3bd3dae
Binary files /dev/null and b/textures/facility114invx/misc/lift02invred_gloss.tga differ

diff --git a/textures/facility114invx/misc/lift02invred_norm.tga b/textures/facility114invx/misc/lift02invred_norm.tga
new file mode 100644 (file)
index 0000000..de85c54
Binary files /dev/null and b/textures/facility114invx/misc/lift02invred_norm.tga differ