BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	resources/Schema/Components/ExplosionEffect.xml
#	resources/Shaders/ExplosionEffect.geom.glsl
#	src/Game/Systems/ExplosionEffectSystem.cpp
This commit is contained in:
FakeShemp
2016-03-10 11:49:51 +01:00
parent 68634126e5 f26b24ef6b
commit 6c072aae45
184 changed files with 36165 additions and 12717 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Components/ExplosionEffect.xsd
+2
View File
@@ -18,6 +18,8 @@
<xs:element name="ExplosionDuration" type="t:double" minOccurs="0">
<xs:annotation><xs:documentation>How many seconds the death animation should be</xs:documentation></xs:annotation>
</xs:element>
<xs:element name="Speed" type="t:double" minOccurs="0"/>
<xs:element name="Delay" type="t:double" minOccurs="0"/>
<!--<xs:element name="Gravity" type="t:bool" minOccurs="0">
<xs:annotation><xs:documentation>Enable/disable gravity</xs:documentation></xs:annotation>
</xs:element>-->