Merge remote branch 'origin/morphed/narmorx'

diff --git a/models/containers/barrel01.md3 b/models/containers/barrel01.md3
new file mode 100644 (file)
index 0000000..ab7266c
Binary files /dev/null and b/models/containers/barrel01.md3 differ

diff --git a/models/containers/barrel01.tga b/models/containers/barrel01.tga
new file mode 100644 (file)
index 0000000..d80a68c
Binary files /dev/null and b/models/containers/barrel01.tga differ

diff --git a/models/containers/barrel01_gloss.tga b/models/containers/barrel01_gloss.tga
new file mode 100644 (file)
index 0000000..d842a9e
Binary files /dev/null and b/models/containers/barrel01_gloss.tga differ

diff --git a/models/containers/barrel01_norm.tga b/models/containers/barrel01_norm.tga
new file mode 100644 (file)
index 0000000..0b9a2db
Binary files /dev/null and b/models/containers/barrel01_norm.tga differ

diff --git a/models/containers/crate01.md3 b/models/containers/crate01.md3
new file mode 100644 (file)
index 0000000..24e9612
Binary files /dev/null and b/models/containers/crate01.md3 differ

diff --git a/models/containers/crate01.tga b/models/containers/crate01.tga
new file mode 100644 (file)
index 0000000..55abff8
Binary files /dev/null and b/models/containers/crate01.tga differ

diff --git a/models/containers/crate01_bump.tga b/models/containers/crate01_bump.tga
new file mode 100644 (file)
index 0000000..b539aeb
Binary files /dev/null and b/models/containers/crate01_bump.tga differ

diff --git a/models/containers/crate01_gloss.tga b/models/containers/crate01_gloss.tga
new file mode 100644 (file)
index 0000000..0a8f611
Binary files /dev/null and b/models/containers/crate01_gloss.tga differ

diff --git a/models/containers/crate01_lod.md3 b/models/containers/crate01_lod.md3
new file mode 100644 (file)
index 0000000..04244f6
Binary files /dev/null and b/models/containers/crate01_lod.md3 differ

diff --git a/models/containers/crate01_lod.tga b/models/containers/crate01_lod.tga
new file mode 100644 (file)
index 0000000..cd3c231
Binary files /dev/null and b/models/containers/crate01_lod.tga differ

diff --git a/scripts/entities.def b/scripts/entities.def
index f14953985629b7c137766871669567e4ca73e650..5ecb09e658f003a23804fa761646f453dfe10e99 100644 (file)
--- a/scripts/entities.def
+++ b/scripts/entities.def
@@ -1848,3 +1848,57 @@ targetname: you can use this to target the grazity zone with a trigger, which wi
 STICKY: entities keep their gravity after leaving the gravity zone
 START_OFF: when targeted, the gravity zone starts off and is enabled upon triggering
 */
+
+/*QUAKED relay_activate (0 1 0) (-8 -8 -8) (8 8 8) 
+Activates all .target's
+List of currently supported target ents:
+trigger_hurt
+trigger_heal
+trigger_impulse
+trigger_push
+trigger_teleport
+func_rotating
+func_bobbing
+func_button
+func_fourier
+func_vectormamamam
+-------- KEYS --------
+target: trigger all entities with this targetname when triggered
+targetname: name that identifies this entity so it can be triggered
+*/
+
+/*QUAKED relay_deactivate (1 0 0) (-8 -8 -8) (8 8 8) 
+Deactivates all .target's
+List of currently supported target ents:
+trigger_hurt
+trigger_heal
+trigger_impulse
+trigger_push
+trigger_teleport
+func_rotating
+func_bobbing
+func_button
+func_fourier
+func_vectormamamam
+-------- KEYS --------
+target: trigger all entities with this targetname when triggered
+targetname: name that identifies this entity so it can be triggered
+*/
+
+/*QUAKED relay_activatetoggle (0 1 1) (-8 -8 -8) (8 8 8) 
+Toggles all .target's de/active
+List of currently supported target ents:
+trigger_hurt
+trigger_heal
+trigger_impulse
+trigger_push
+trigger_teleport
+func_rotating
+func_bobbing
+func_button
+func_fourier
+func_vectormamamam
+-------- KEYS --------
+target: trigger all entities with this targetname when triggered
+targetname: name that identifies this entity so it can be triggered
+*/