Merge remote-tracking branch 'origin/master' into Kill-streak-sounds
This commit is contained in:
stiffly
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
|
||||
<Camera xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Camera.xsd">
|
||||
<FOV>45</FOV>
|
||||
<FOV>59</FOV> <!-- 90 horizontal FOV at 1080p -->
|
||||
<NearClip>0.01</NearClip>
|
||||
<FarClip>5000</FarClip>
|
||||
</Camera>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
|
||||
<ConfigBtnFloat xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ConfigBtnFloat.xsd">
|
||||
<Header></Header>
|
||||
<Field></Field>
|
||||
<PressValue></PressValue>
|
||||
</ConfigBtnFloat>
|
||||
@@ -0,0 +1,22 @@
|
||||
<?xml version="1.0"?>
|
||||
|
||||
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
|
||||
<xs:import schemaLocation="../Types.xsd" namespace="types"/>
|
||||
|
||||
<xs:element name="ConfigBtnFloat">
|
||||
<xs:annotation><xs:documentation>Used with a Button component, this button will change a variable in the config file.</xs:documentation></xs:annotation>
|
||||
<xs:complexType>
|
||||
<xs:all>
|
||||
<xs:element name="Header" type="t:string" minOccurs="0">
|
||||
<xs:annotation><xs:documentation>The header of the section in config.</xs:documentation></xs:annotation>
|
||||
</xs:element>
|
||||
<xs:element name="Field" type="t:string" minOccurs="0">
|
||||
<xs:annotation><xs:documentation>The name of the field to be changed in the config.</xs:documentation></xs:annotation>
|
||||
</xs:element>
|
||||
<xs:element name="PressValue" type="t:float" minOccurs="0">
|
||||
<xs:annotation><xs:documentation>The value to give the field.</xs:documentation></xs:annotation>
|
||||
</xs:element>
|
||||
</xs:all>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:schema>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
|
||||
<ConfigBtnResolution xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ConfigBtnResolution.xsd">
|
||||
<Header></Header>
|
||||
<Field></Field>
|
||||
<PressValue></PressValue>
|
||||
</ConfigBtnResolution>
|
||||
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0"?>
|
||||
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
|
||||
<xs:import schemaLocation="../Types.xsd" namespace="types"/>
|
||||
<xs:element name="ConfigBtnResolution">
|
||||
<xs:annotation><xs:documentation>Used with a Button component, this button will change a variable in the config file.</xs:documentation></xs:annotation>
|
||||
<xs:complexType>
|
||||
<xs:all>
|
||||
<xs:element name="Width" type="t:int" minOccurs="0">
|
||||
<xs:annotation><xs:documentation>Value of the resolution width.</xs:documentation></xs:annotation>
|
||||
</xs:element>
|
||||
<xs:element name="Height" type="t:int" minOccurs="0">
|
||||
<xs:annotation><xs:documentation>Value of the resolution height.</xs:documentation></xs:annotation>
|
||||
</xs:element>
|
||||
</xs:all>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:schema>
|
||||
@@ -9,5 +9,5 @@
|
||||
<SpecularMap>true</SpecularMap>
|
||||
<GlowMap>true</GlowMap>
|
||||
<Shadow>true</Shadow>
|
||||
<GlowIntensity>3.0</GlowIntensity>
|
||||
<GlowIntensity>1.0</GlowIntensity>
|
||||
</Model>
|
||||
@@ -1,9 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
|
||||
<Sprite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Sprite.xsd">
|
||||
<Model>Models/Core/UnitQuad.mesh</Model>
|
||||
<DiffuseTexture></DiffuseTexture>
|
||||
<GlowMap></GlowMap>
|
||||
<Color R="1" G="1" B="1" A="1"/>
|
||||
<Visible>true</Visible>
|
||||
<DepthSort>true</DepthSort>
|
||||
<KeepRatioX>false</KeepRatioX>
|
||||
<KeepRatioY>false</KeepRatioY>
|
||||
<KeepRatio>false</KeepRatio>
|
||||
<Linear>true</Linear>
|
||||
<BlurBackground>false</BlurBackground>
|
||||
</Sprite>
|
||||
|
||||
@@ -9,14 +9,17 @@
|
||||
</xs:annotation>
|
||||
<xs:complexType>
|
||||
<xs:all>
|
||||
<xs:element name="Model" type="t:string" minOccurs="0">
|
||||
<xs:annotation><xs:documentation>The model the sprite will use.</xs:documentation></xs:annotation>
|
||||
</xs:element>
|
||||
<xs:element name="DiffuseTexture" type="t:string" minOccurs="0">
|
||||
<xs:annotation><xs:documentation>Diffuse Texture file</xs:documentation></xs:annotation>
|
||||
<xs:annotation><xs:documentation>Diffuse Texture file.</xs:documentation></xs:annotation>
|
||||
</xs:element>
|
||||
<xs:element name="GlowMap" type="t:string" minOccurs="0">
|
||||
<xs:annotation><xs:documentation>GlowMap file</xs:documentation></xs:annotation>
|
||||
<xs:annotation><xs:documentation>GlowMap file.</xs:documentation></xs:annotation>
|
||||
</xs:element>
|
||||
<xs:element name="Color" type="t:Color" minOccurs="0">
|
||||
<xs:annotation><xs:documentation>Color tint</xs:documentation></xs:annotation>
|
||||
<xs:annotation><xs:documentation>Color tint.</xs:documentation></xs:annotation>
|
||||
</xs:element>
|
||||
<xs:element name="Visible" type="t:bool" minOccurs="0">
|
||||
<xs:annotation><xs:documentation>Whether the model is visible or not</xs:documentation></xs:annotation>
|
||||
@@ -24,6 +27,18 @@
|
||||
<xs:element name="DepthSort" type="t:bool" minOccurs="0">
|
||||
<xs:annotation><xs:documentation>Whether the sprite should be sorted with depth or not. Only use false for textures that are on HUD</xs:documentation></xs:annotation>
|
||||
</xs:element>
|
||||
<xs:element name="KeepRatioX" type="t:bool" minOccurs="0">
|
||||
<xs:annotation><xs:documentation>Wether the sprite should repeat in x instead of stretch when scaled.</xs:documentation></xs:annotation>
|
||||
</xs:element>
|
||||
<xs:element name="KeepRatioY" type="t:bool" minOccurs="0">
|
||||
<xs:annotation><xs:documentation>Wether the sprite should repeat in y instead of stretch when scaled.</xs:documentation></xs:annotation>
|
||||
</xs:element>
|
||||
<xs:element name="KeepRatio" type="t:bool" minOccurs="0">
|
||||
<xs:annotation><xs:documentation>Keep a 1:1 ratio between X and Y.</xs:documentation></xs:annotation>
|
||||
</xs:element>
|
||||
<xs:element name="Linear" type="t:bool" minOccurs="0">
|
||||
<xs:annotation><xs:documentation>If it should use Linear or Nearest sampling method.</xs:documentation></xs:annotation>
|
||||
</xs:element>
|
||||
<xs:element name="BlurBackground" type="t:bool" minOccurs="0">
|
||||
<xs:annotation><xs:documentation>Wether the background should be blurred begind this sprite.</xs:documentation></xs:annotation>
|
||||
</xs:element>
|
||||
|
||||
Reference in New Issue
Block a user