Stiffly 3f0f45f509 Merge remote-tracking branch 'origin/master' into water ...

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

2015-10-08 11:16:31 +02:00

..

CCircleShape.h

Added IceBrick and started to remove the scale dependency for physics bodies

2015-10-05 16:25:00 +02:00

CParticle.h

MSVC12 compiler compability fixes

2015-10-06 15:27:11 +02:00

CParticleEmitter.h

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

2015-10-07 18:34:36 +02:00

CPhysics.h

Merge branch 'Physics'

2015-10-06 20:16:57 +02:00

CRectangleShape.h

Added IceBrick and started to remove the scale dependency for physics bodies

2015-10-05 16:25:00 +02:00

CWaterVolume.h

Removed wierd glow on water

2015-09-29 11:10:08 +02:00

EContact.h

collisions remade

2015-09-17 16:52:43 +02:00

ECreateParticleSequence.h

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

2015-10-07 18:34:36 +02:00

ESetImpulse.h

SetImpulse event

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

PhysicsSystem.h

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

2015-10-08 11:16:31 +02:00