BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
This commit is contained in:
ViktorLjung
2014-06-05 06:01:49 +02:00
parent 56e6545f0f
commit e4a59cec61
31 changed files with 288 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Systems/PhysicsSystem.h
+5 -1
View File
@@ -86,9 +86,10 @@
#include "Events/DisableCollisions.h"
#include "Components/Trigger.h"
#include "Components/Template.h"
#include "Components/Camera.h"
#include "Events/EnterTrigger.h"
#include "Events/JeepSteer.h"
#include "Events/Dead.h"
namespace Systems
{
@@ -192,6 +193,9 @@ private:
bool OnEnableCollisions(const Events::EnableCollisions &e);
EventRelay<PhysicsSystem, Events::DisableCollisions> m_EDisableCollisions;
bool OnDisableCollisions(const Events::DisableCollisions &e);
EventRelay<PhysicsSystem, Events::Dead> m_EDead;
bool OnDead(const Events::Dead &e);
void SetUpPhysicsState(EntityID entity, EntityID parent);
void TearDownPhysicsState(EntityID entity, EntityID parent);