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
@@ -22,6 +22,7 @@ struct CreateParticleSequence : public Event
    float Spread = 1.f;
    float EmittingAngle = 0.f;
    float MaxCount = 0;
+	float RadiusDistribution = 0;
 	glm::vec4 Color = glm::vec4(0);
 	EntityID parent = 0;
 	// values to interpolate between.