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

Conflicts: src/game/Game/LevelSystem.cpp src/game/Physics/PhysicsSystem.cpp
2015-10-13 17:02:31 +02:00
parent 94cac38cc6 40343744c1
commit 1065d3abc3
31 changed files with 596 additions and 158 deletions
@@ -21,6 +21,7 @@ struct ParticleEmitter : public Component
    float Spread = 0.f;
    float Speed = 2.f;
    double LifeTime = 100;
+	float RadiusDistribution = 0;

 	//values to interpolate between.
 	std::vector<float> RadiusValues;