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

Conflicts: src/Components/Physics.h src/GameWorld.cpp src/World.cpp src/World.h vs11/Returngeance/Returngeance.vcxproj.filters
2014-05-12 13:55:48 +02:00
parent 1a365bf069 b6372d44b8
commit e0b5b72454
60 changed files with 2404 additions and 340 deletions
@@ -9,9 +9,10 @@ namespace Components
 struct Physics : Component
 {
 	Physics()
-		: Mass(0.f) { }
+		: Mass(0.f), Static(false){}

 	float Mass;
+	bool Static;

 	virtual Physics* Clone() const override { return new Physics(*this); }
 };