Merge remote-tracking branch 'origin/master' into Sound+Particles

Conflicts: src/GameWorld.cpp
2014-06-04 01:27:15 +02:00
parent 9f1d5206bd 0addc672b4
commit 90a92d05e4
4 changed files with 272 additions and 322 deletions
@@ -80,7 +80,7 @@ void Systems::PhysicsSystem::Initialize()
 		worldInfo.m_broadPhaseBorderBehaviour = hkpWorldCinfo::BROADPHASE_BORDER_FIX_ENTITY;

 		// You must specify the size of the broad phase - objects should not be simulated outside this region
-		worldInfo.setBroadPhaseWorldSize(500.0f);
+		worldInfo.setBroadPhaseWorldSize(1000.0f);
 		m_PhysicsWorld = new hkpWorld(worldInfo);

 		// When the simulation type is SIMULATION_TYPE_MULTITHREADED, in the debug build, the sdk performs checks