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

Conflicts: assets src/GameWorld.cpp vs11/Returngeance/Returngeance.vcxproj.filters
2014-05-12 14:03:02 +02:00
parent d7e5630f1b b6372d44b8
commit c8a77d5c3d
43 changed files with 1204 additions and 267 deletions
@@ -25,7 +25,7 @@
 #include "PhysicsSystem.h"
 #include "World.h"

-Systems::PhysicsSystem::PhysicsSystem(World* world) : System(world)
+void Systems::PhysicsSystem::Initialize()
 {
 	m_Accumulator = 0;