Merge branch 'master' into kuniuthefrogg/boil

[xonotic/xonotic-maps.pk3dir.git] / scripts / entities.ent

diff --git a/scripts/entities.ent b/scripts/entities.ent
index beb8620d931c7bc6544427e7628be87c062ea52e..c27c2ec3ed2f01634d3d349dae08bbddc6ac917a 100644 (file)
--- a/scripts/entities.ent
+++ b/scripts/entities.ent
@@ -58,6 +58,7 @@ This is a brush model which can be damaged. Once triggered it's active and will
 <string key="mdl_dead" name="mdl_dead">optional replacement model to show when destroyed</string>
 <string key="debris" name="debris">names of debris models to show when destroyed, separated by spaces</string>
 <sound key="noise" name="noise">sound to play when destroyed</sound>
+<sound key="noise1" name="noise1">sound to play while alive (either plays at spawn only, or can be a looping sound file)</sound>
 <real key="dmg" name="dmg">damage to deal to the environment when destroyed</real>
 <real key="dmg_edge" name="dmg_edge">edge damage to deal to the environment when destroyed</real>
 <real key="dmg_radius" name="dmg_radius">damage radius</real>
@@ -205,6 +206,8 @@ BIDIR_IN_DOWN will the door prevent from reopening while closing if it is trigge
 <flag key="DOOR_DONT_LINK" name="DOOR_DONT_LINK" bit="2">the door won't link with another door it touches</flag>
 <flag key="TOGGLE" name="TOGGLE" bit="5">causes the door to wait in both the start and end states for a trigger event.</flag>
 <flag key="NOSPLASH" name="NOSPLASH" bit="8">if set, splash damage cannot activate the door, only direct damage can (requires health to be set)</flag>
+<flag key="X_AXIS" name="X_AXIS" bit="6">rotate around the X axis</flag>
+<flag key="Y_AXIS" name="Y_AXIS" bit="7">rotate around the Y axis</flag>
 </group>
 
 <group name="func_door_secret" color="0 .5 .8">
@@ -817,6 +820,8 @@ Generic placeholder for inserting MD3 models in game. Requires compilation of ma
 </point>
 
 <point name="misc_gamemodel" color="0 .5 .8" box="-8 -8 -8 8 8 8">
+NOTE: usually misc_clientmodel will predict better and have more fps!
+Use this only if you need to.
 A way to load models from a map by the engine (e.g. self-animated zym models).
 Is non-solid by default.
 The keys below actually apply to most engine-loaded model entities as they are engine features; however, they are described here as they aren't overridden by game code in misc_gamemodel. Its q3map2 keys below will work on any brush entity!
@@ -1625,7 +1630,7 @@ For the number fields, not specifying a value means not changing it. To clear ar
 You may want to target this by a race checkpoint, a teleporter, or a trigger_multiple with ALLENTS set (so it removes weapons thrown through the field to avoid getting a weapon through it).
 -------- KEYS --------
 <targetname key="targetname" name="targetname">used to trigger this</targetname>
-<string key="netname" name="netname">space separated list of items (either weapon short names (like in g_start_weapon_* cvars), or item short names &quot;unlimited_ammo&quot;, &quot;unlimited_weapon_ammo&quot;, &quot;unlimited_superweapons&quot;, &quot;invincible&quot;, &quot;strength&quot;, &quot;jetpack&quot; and &quot;fuel_regen&quot;</string>
+<string key="netname" name="netname">space separated list of items (either weapon short names (like in g_start_weapon_* cvars), or item short names &quot;unlimited_ammo&quot;, &quot;unlimited_weapon_ammo&quot;, &quot;unlimited_superweapons&quot;, &quot;invincible&quot;, &quot;strength&quot;, &quot;jetpack&quot; and &quot;fuel_regen&quot;)</string>
 <string key="message" name="message">message to print</string>
 <real key="ammo_shells" name="ammo_shells">amount of shells</real>
 <real key="ammo_nails" name="ammo_nails">amount of bullets</real>
@@ -1697,6 +1702,7 @@ When triggered, it resets to full health, and unbreaks.
 <string key="mdl_dead" name="mdl_dead">optional replacement model to show when destroyed</string>
 <string key="debris" name="debris">names of debris models to show when destroyed, separated by spaces</string>
 <sound key="noise" name="noise">sound to play when destroyed</sound>
+<sound key="noise1" name="noise1">sound to play while alive (either plays at spawn only, or can be a looping sound file)</sound>
 <real key="dmg" name="dmg">damage to deal to the environment when destroyed</real>
 <real key="dmg_edge" name="dmg_edge">edge damage to deal to the environment when destroyed</real>
 <real key="dmg_radius" name="dmg_radius">damage radius</real>
@@ -1734,6 +1740,7 @@ When triggered, it resets to full health, and unbreaks.
 <string key="mdl_dead" name="mdl_dead">optional replacement model to show when destroyed</string>
 <string key="debris" name="debris">names of debris models to show when destroyed, separated by spaces</string>
 <sound key="noise" name="noise">sound to play when destroyed</sound>
+<sound key="noise1" name="noise1">sound to play while alive (either plays at spawn only, or can be a looping sound file)</sound>
 <real key="dmg" name="dmg">damage to deal to the environment when destroyed</real>
 <real key="dmg_edge" name="dmg_edge">edge damage to deal to the environment when destroyed</real>
 <real key="dmg_radius" name="dmg_radius">damage radius</real>