kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes/updates

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6190 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Bukz
2011-04-01 07:04:28 +00:00
parent 39e610c9c0
commit ae2589021e
3 changed files with 95 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/docs.cfg
+24 -19
View File
@@ -549,6 +549,8 @@ dockey [MOUSE4] [] [cycle one up];
dockey [MOUSE5] [] [cycle one down];
docident [showmap] [Determines if the mini-map should be shown on screen.];
docargument [B] [show mini-map] [min 0/max 1/default 0];
docident [showmapbackdrop] [change wether to have a see-through map overview (0), or render it on a black backdrop (1) or a combination of both (2)];
docargument [B] [backdrop-style] [min 0/max 2/default 0];
docident [showscores] [Shows or hides the scores.];
dockey [TAB] [] [];
docident [showscoresondeath] [Determines if scores should be shown on death.];
@@ -850,6 +852,7 @@ docident [wpload] [];
docident [wpsave] [];
docident [wpvisible] [];
docargument [V] [visible] [0||1] [0];
docident [checkmapdependencies] [Find what media the map depends on, this is used for mediapack providers.];
docsection [Menus]
docident [chmenumdl] [Changes the menu model of a specified menu.];
docargument [N] [the name of the menu] [] [0];
@@ -1003,6 +1006,8 @@ docident [swayupspeeddiv] [];
docargument [V] [] [min 1/max 1000/default 105];
docident [cncolumncolor] [colour of CN column in scoreboard];
docargument [N] [0..9] [min 0/max 9/default 5];
docident [radarheight] [change at what height you are floating in the radar-view];
docargument [H] [height] [min 20/max 70/default 35];
docsection [Visuals]
docident [aadynshadow] [Sets the size/resolution of the dynamic shadow data.];
docargument [] [the size] [min 0/max 3/default 2];
@@ -1164,6 +1169,18 @@ docargument [V] [enable/disable water refractions] [min 0/max 1/default 0];
docident [watersubdiv] [Determines the subdivision of the water surface in maps.];
docargument [N] [the subdivisioin value] [min 1/max 64/default 4];
docremark [Must be a power of 2: 4 is the default, 8 is recommended for people on slow machines, 2 is nice for fast machines, and 1 is quite OTT. See "waterlevel" (edit reference) on how to add water to your own levels.];
docident [damagescreen] [show the blood-spat overlay when receiving damage?];
docargument [N] [0 (false), 1 (true)] [min 0/max 1/default 1];
docident [damagescreenalpha] [if overlay of blood-spat, at what blending (transparency) level?];
docargument [N] [1..100] [min 1/max 100/default 45];
docident [damagescreenfactor] [if overlay of blood-spat, use which factor?];
docargument [N] [1..100] [min 1/max 100/default 7];
docident [damagescreenfade] [if overlay of blood-spat, at what speed does it fade?];
docargument [N] [0..1000] [min 0/max 1000/default 125];
docident [popdeadplayers] [make dead players instantly pop out of existence, instead of falling over and sinking into the ground.];
docargument [N] [pop dead players] [min 0/max 1/default 0];
docident [maploaditemlength] [change at what position to truncate the map title string];
docargument [N] [chars] [min 0/max 255/default 46];
docsection [Sound]
docident [al_referencedistance] [The distance from the source emitting the sound to the listener.];
docargument [V] [] [min 0/max 1000000/default 400];
@@ -1508,23 +1525,17 @@ docident [addzip] [TODO: Description];
docargument [A] [TODO] [] [0];
docargument [B] [TODO] [] [0];
docargument [C] [TODO] [] [0];
docident [akimboendaction] [0: none, 1: switch to primary?, 2: switch to nades?-before-switch to primary?];
docargument [N] [TODO] [min 0/max 2/default 0];
docident [akimboendaction] [Sets the behavior of weapon switching upon akimbo expiration.];
docargument [N] [akimbo end action] [min 0/max 2/default 0];
docexample [akimboendaction 0] [none];
docexample [akimboendaction 1] [switch to primary];
docexample [akimboendaction 2] [switch to grenades, else switch to primary];
docident [ambient] [TODO];
docargument [N] [TODO] [min 0/max 16777215/default 0];
docident [applydialog] [do you really want to quit?];
docargument [N] [TODO] [min 0/max 1/default 1];
docident [autoscopesens] [TODO];
docargument [N] [TODO] [min 0/max 1/default 0];
docident [checkmapdependencies] [Find what media the map depends on, this is used for mediapack providers.];
docident [damagescreen] [show the blood-spat overlay when receiving damage?];
docargument [N] [TODO] [min 0/max 1/default 1];
docident [damagescreenalpha] [if overlay of blood-spat, at what blending (transparency) level?];
docargument [N] [TODO] [min 1/max 100/default 45];
docident [damagescreenfactor] [if overlay of blood-spat, use which factor];
docargument [N] [TODO] [min 1/max 100/default 7];
docident [damagescreenfade] [if overlay of blood-spat, at what speed does it fade];
docargument [N] [TODO] [min 0/max 1000/default 125];
docident [fontskip] [At what char does the definition proceed?];
docargument [A] [TODO] [] [0];
docident [gettext] [An alias used for i18n. Translateable text should be marked [(_ "this is the EN-us variant of the text")].];
@@ -1533,8 +1544,6 @@ docident [interms] [TODO];
docargument [N] [TODO] [min 0/max 1/default 0];
docident [mapdimsfactor] [TODO];
docargument [N] [TODO] [min 0/max 4/default 2];
docident [maploaditemlength] [change at what position to truncate the map title string];
docargument [N] [CHAR] [min 0/max 255/default 46];
docident [maxrollremote] [TODO];
docargument [N] [TODO] [min 0/max 1/default 1];
docident [mdldlist] [TODO];
@@ -1550,11 +1559,9 @@ docident [mouseaccel] [TODO];
docargument [N] [TODO] [min 0,0/max 1000,0/default 0,0];
docident [musicpreload] [TODO: Description];
docargument [A] [TODO] [] [0];
docident [orderscorecolumns] [variants of ordering CN first or not in scoreboard];
docargument [N] [TODO] [min 0/max 1/default 0];
docident [orderscorecolumns] [Show the client number column on the scoreboard first?];
docargument [N] [0 (false), 1 (true)] [min 0/max 1/default 0];
docident [quicknadethrow] [TODO: Description];
docident [radarheight] [change at what height you are floating in the radar-view];
docargument [H] [height] [min 20/max 70/default 35];
docident [removezip] [TODO: Description];
docargument [A] [TODO] [] [0];
docident [scopesensscale] [TODO];
@@ -1578,8 +1585,6 @@ docremark [other call forms may use the numerical item type];
docident [setwptriggernr] [TODO: Description];
docargument [A] [TODO] [] [0];
docident [showedithide] [shows the settings of edithide (sparklies)];
docident [showmapbackdrop] [change wether to have a see-through map overview (0), or render it on a black backdrop (1) or a combination of both (2)];
docargument [B] [backdrop-style] [min 0/max 2/default 0];
docident [showmapbackdroptransparency] [];
docargument [T] [transparency] [min 0/max 100/default 75];
docident [soundmuted] [Returns 1 if sound A is muted, else 0.];
config/scripts.cfg
+3 -3
View File
@@ -277,9 +277,9 @@ megabind = [
// getscrext - Returns the proper file extension for the client's current screenshottype setting, including the "."
getscrext = [
if (= $screenshottype 0) [result ".bmp"] [
if (= $screenshottype 1) [result ".jpg"] [
if (= $screenshottype 2) [result ".png"] [
if (= $screenshottype 0) [ result ".bmp" ] [
if (= $screenshottype 1) [ result ".jpg" ] [
if (= $screenshottype 2) [ result ".png" ] [
result -1
]
]
docs/reference.xml
+68 -56
View File
@@ -636,6 +636,9 @@
<variable name="screenshottype">
<description>Toggle format of screenshot image. Your choice is for BMP (0), JPEG (1) or PNG (2).</description>
<value token="T" description="0=BMP, 1=JPEG, 2=PNG" minValue="0" maxValue="2" defaultValue="1"/>
<references>
<identifierReference identifier="getscrext"/>
</references>
</variable>
<command name="getscrext">
@@ -2341,6 +2344,11 @@ Output:
<description>Determines if the mini-map should be shown on screen.</description>
<value token="B" description="show mini-map" minValue="0" maxValue="1" defaultValue="0"/>
</variable>
<variable name="showmapbackdrop">
<description>change wether to have a see-through map overview (0), or render it on a black backdrop (1) or a combination of both (2)</description>
<value token="B" description="backdrop-style" minValue="0" maxValue="2" defaultValue="0" />
</variable>
<variable name="showscoresondeath">
<description>Determines if scores should be shown on death.</description>
@@ -2382,6 +2390,16 @@ Output:
</remarks>
<value token="N" description="the game speed" minValue="10" maxValue="1000" defaultValue="100"/>
</variable>
<variable name="akimboendaction">
<description>Sets the behavior of weapon switching upon akimbo expiration.</description>
<value token="N" description="akimbo end action" minValue="0" maxValue="2" defaultValue="0" />
<arguments>
<argument valueNotes="0 (none)"/>
<argument valueNotes="1 (switch to primary)"/>
<argument valueNotes="2 (switch to grenades, else switch to primary)"/>
</arguments>
</variable>
</identifiers>
</section>
@@ -3295,6 +3313,10 @@ Output:
</references>
<value token="N" description="the brightness of the scene" minValue="1" maxValue="100" defaultValue="4"/>
</variable>
<command name="checkmapdependencies">
<description>Find what media the map depends on, this is used for mediapack providers.</description>
</command>
</identifiers>
</section>
@@ -3798,10 +3820,20 @@ Output:
<argument valueNotes="9 (orange)"/>
</arguments>
</variable>
<variable name="orderscorecolumns">
<description>Show the client number column on the scoreboard first?</description>
<value token="N" description="cn column order" minValue="0" maxValue="1" defaultValue="0" valueNotes="0 (false), 1 (true)" />
</variable>
<variable name="radarheight">
<description>change at what height you are floating in the radar-view</description>
<value token="H" description="height" minValue="20" maxValue="70" defaultValue="35" />
</variable>
</identifiers>
</section>
<!-- Head-Up Display Section ends -->
<!-- Heads-Up Display Section ends -->
<!-- Visuals Section Starts -->
<section name="Visuals" sortindex="05">
@@ -4226,6 +4258,36 @@ Output:
<argument valueNotes="4 - Unrealistic"/>
</arguments>
</variable>
<variable name="damagescreen">
<description>show the blood-spat overlay when receiving damage?</description>
<value token="N" description="damagescreen" minValue="0" maxValue="1" defaultValue="1" valueNotes="0 (false), 1 (true)" />
</variable>
<variable name="damagescreenalpha">
<description>if overlay of blood-spat, at what blending (transparency) level?</description>
<value token="N" description="damagescreen transparency" minValue="1" maxValue="100" defaultValue="45" />
</variable>
<variable name="damagescreenfactor">
<description>if overlay of blood-spat, use which factor?</description>
<value token="N" description="damagescreen factor" minValue="1" maxValue="100" defaultValue="7" />
</variable>
<variable name="damagescreenfade">
<description>if overlay of blood-spat, at what speed does it fade?</description>
<value token="N" description="damagescreen fade" minValue="0" maxValue="1000" defaultValue="125" />
</variable>
<variable name="popdeadplayers">
<description>make dead players instantly pop out of existence, instead of falling over and sinking into the ground.</description>
<value token="B" description="BOOL" minValue="0" maxValue="1" defaultValue="0" />
</variable>
<variable name="maploaditemlength">
<description>change at what position to truncate the map title string</description>
<value token="N" description="chars" minValue="0" maxValue="255" defaultValue="46" />
</variable>
</identifiers>
</section>
@@ -5468,6 +5530,7 @@ Output:
<identifierReference identifier="positiontype"/>
</references>
</command>
<variable name="positiontype">
<description>0: int, 1: float</description>
<value token="T" description="TYPE" minValue="0" maxValue="1" defaultValue="1" />
@@ -5484,6 +5547,7 @@ Output:
<identifierReference identifier="demonameformat"/>
</references>
</command>
<command name="getdemotimeformat">
<description>returns the currently used formatstring for demo timestamp</description>
<references>
@@ -5492,6 +5556,7 @@ Output:
<identifierReference identifier="demonameformat"/>
</references>
</command>
<command name="demonameformat">
<description>set the formatstring for demo filenames - default: TODO (when stable)</description>
<arguments>
@@ -5512,6 +5577,7 @@ Output:
<identifierReference identifier="getdemonameformat"/>
</references>
</command>
<command name="demotimeformat">
<description>set the formatstring for demo timestamp - default: TODO (when stable)</description>
<arguments>
@@ -5527,17 +5593,12 @@ Output:
<webReference url="http://www.cplusplus.com/reference/clibrary/ctime/strftime/" name="C++-Reference"/>
</references>
</command>
<variable name="demotimelocal">
<description>use localtime (1) or GMT (0)?</description>
<value token="B" description="BOOL" minValue="0" maxValue="1" defaultValue="0" />
</variable>
<variable name="popdeadplayers">
<description>make dead players instantly pop out of existence, instead of falling over and sinking into the ground.</description>
<value token="B" description="BOOL" minValue="0" maxValue="1" defaultValue="0" />
</variable>
<command name="addzip">
<description>TODO: Description</description>
<arguments>
@@ -5547,10 +5608,6 @@ Output:
</arguments>
</command>
<command name="checkmapdependencies">
<description>Find what media the map depends on, this is used for mediapack providers.</description>
</command>
<command name="fontskip">
<description>At what char does the definition proceed?</description>
<arguments>
@@ -5629,11 +5686,6 @@ Output:
</arguments>
</command>
<variable name="akimboendaction">
<description>0: none, 1: switch to primary?, 2: switch to nades?-before-switch to primary?</description>
<value token="N" description="TODO" minValue="0" maxValue="2" defaultValue="0" />
</variable>
<variable name="ambient">
<description>TODO</description>
<value token="N" description="TODO" minValue="0" maxValue="16777215" defaultValue="0" />
@@ -5649,26 +5701,6 @@ Output:
<value token="N" description="TODO" minValue="0" maxValue="1" defaultValue="0" />
</variable>
<variable name="damagescreen">
<description>show the blood-spat overlay when receiving damage?</description>
<value token="N" description="TODO" minValue="0" maxValue="1" defaultValue="1" />
</variable>
<variable name="damagescreenalpha">
<description>if overlay of blood-spat, at what blending (transparency) level?</description>
<value token="N" description="TODO" minValue="1" maxValue="100" defaultValue="45" />
</variable>
<variable name="damagescreenfactor">
<description>if overlay of blood-spat, use which factor</description>
<value token="N" description="TODO" minValue="1" maxValue="100" defaultValue="7" />
</variable>
<variable name="damagescreenfade">
<description>if overlay of blood-spat, at what speed does it fade</description>
<value token="N" description="TODO" minValue="0" maxValue="1000" defaultValue="125" />
</variable>
<variable name="interms">
<description>TODO</description>
<value token="N" description="TODO" minValue="0" maxValue="1" defaultValue="0" />
@@ -5699,11 +5731,6 @@ Output:
<value token="N" description="TODO" minValue="0,0" maxValue="1000,0" defaultValue="0,0" />
</variable>
<variable name="orderscorecolumns">
<description>variants of ordering CN first or not in scoreboard</description>
<value token="N" description="TODO" minValue="0" maxValue="1" defaultValue="0" />
</variable>
<variable name="scopesensscale">
<description>TODO</description>
<value token="N" description="TODO" minValue="0,001" maxValue="1000,0" defaultValue="0,5" />
@@ -5734,26 +5761,11 @@ Output:
<value token="N" description="TODO" minValue="16" maxValue="64" defaultValue="32" />
</variable>
<variable name="maploaditemlength">
<description>change at what position to truncate the map title string</description>
<value token="N" description="CHAR" minValue="0" maxValue="255" defaultValue="46" />
</variable>
<variable name="showmapbackdrop">
<description>change wether to have a see-through map overview (0), or render it on a black backdrop (1) or a combination of both (2)</description>
<value token="B" description="backdrop-style" minValue="0" maxValue="2" defaultValue="0" />
</variable>
<variable name="showmapbackdroptransparency">
<description></description>
<value token="T" description="transparency" minValue="0" maxValue="100" defaultValue="75" />
</variable>
<variable name="radarheight">
<description>change at what height you are floating in the radar-view</description>
<value token="H" description="height" minValue="20" maxValue="70" defaultValue="35" />
</variable>
<command name="showedithide">
<description>shows the settings of edithide (sparklies)</description>
</command>