Merge remote-tracking branch 'origin/master' into Menu

# Conflicts:
#	src/Game/Game.cpp
This commit is contained in:
viktorljung
2016-02-12 02:09:14 +01:00
20 changed files with 2413 additions and 687 deletions
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<AmmoPickup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="AmmoPickup.xsd">
<RespawnTimer>3</RespawnTimer>
<AmmoGain>30</AmmoGain>
</AmmoPickup>
@@ -0,0 +1,21 @@
<?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="AmmoPickup">
<xs:annotation>
<xs:documentation>An Ammo Pickup</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:all>
<xs:element name="RespawnTimer" type="t:double" minOccurs="0">
<xs:annotation><xs:documentation>The respawn timer for a ammo pickup</xs:documentation></xs:annotation>
</xs:element>
<xs:element name="AmmoGain" type="t:double" minOccurs="0">
<xs:annotation><xs:documentation>How much percent ammo gain the player will get</xs:documentation></xs:annotation>
</xs:element>
</xs:all>
</xs:complexType>
</xs:element>
</xs:schema>