tleety b32934dba6 Merge remote-tracking branch 'origin/physics' into water ...

# Conflicts:
#	include/Core/Engine.h
#	include/Physics/PhysicsSystem.h
#	src/game/Game/PadSystem.cpp
#	src/game/Physics/PhysicsSystem.cpp

2015-09-17 17:37:58 +02:00

..

CCircleShape.h

CircleShape

2015-09-10 22:24:19 +01:00

CPhysics.h

Ball hitting bricks destroys bricks! We can PLAY! (kind of)

2015-09-11 10:50:49 +02:00

CRectangleShape.h

Base water set up

2015-09-17 17:35:17 +02:00

CWaterVolume.h

Base water set up

2015-09-17 17:35:17 +02:00

EContact.h

Collisions kind of working

2015-09-17 14:11:09 +01:00

ESetImpulse.h

SetImpulse event

2015-09-10 22:43:25 +01:00

PhysicsSystem.h

Merge remote-tracking branch 'origin/physics' into water

2015-09-17 17:37:58 +02:00