Merge branch 'havok'

Conflicts: src/GameWorld.cpp src/Systems/PhysicsSystem.cpp src/Systems/PhysicsSystem.h vs11/Returngeance/Returngeance.vcxproj.filters
2014-04-24 23:11:16 +02:00
parent 0fbce570ff 613610d5b1
commit 0b7c383e8a
17 changed files with 1834 additions and 128 deletions
@@ -29,6 +29,8 @@
 #include "Components/Physics.h"
 #include "Components/Sphere.h"
 #include "Components/Box.h"
+#include "Components/Vehicle.h"
+#include "Components/Wheel.h"

 class GameWorld : public World
 {