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

Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias

Browse Source 
# Conflicts:
#	include/Core/Engine.h
This commit is contained in:
tleety
2015-10-19 15:14:14 +02:00
parent 55232a4ec2 c83aee9b5d
commit 36947611d3
47 changed files with 1660 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Physics/PhysicsSystem.h
+3
View File
@@ -34,6 +34,7 @@
#include "CRectangleShape.h"
#include "Game/EPause.h"
#include "Game/EResume.h"
#include "Game/CPad.h"
#include "Game/CBrick.h"
#include "Game/CBall.h"
@@ -116,6 +117,8 @@ namespace dd
bool SetImpulse(const Events::SetImpulse &event);
dd::EventRelay<PhysicsSystem, dd::Events::Pause> m_EPause;
bool OnPause(const dd::Events::Pause &event);
dd::EventRelay<PhysicsSystem, dd::Events::Resume> m_EResume;
bool OnResume(const dd::Events::Resume &event);
dd::EventRelay<PhysicsSystem, dd::Events::Contact> m_EContact;
bool OnContact(const dd::Events::Contact &event);
EventRelay<PhysicsSystem, Events::CreateParticleSequence> m_ECreateParticleSequence;