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

# Conflicts: # resources/Schema/Components/ExplosionEffect.xml # resources/Shaders/ExplosionEffect.geom.glsl # src/Game/Systems/ExplosionEffectSystem.cpp
2016-03-10 11:49:51 +01:00
parent 68634126e5 f26b24ef6b
commit 6c072aae45
184 changed files with 36165 additions and 12717 deletions
@@ -3,6 +3,8 @@
 	<ExplosionOrigin X="0" Y="0" Z="0"/>
 	<TimeSinceDeath>0.0</TimeSinceDeath>
 	<ExplosionDuration>2.0</ExplosionDuration>
+	<Speed>1</Speed>
+	<Delay>0</Delay>
 	<!--<Gravity>1</Gravity>-->
 	<!--<GravityForce>1</GravityForce>-->
 	<!--<ObjectRadius>2</ObjectRadius>-->