Stiffly e9ca58de64 Merge branch 'master' into water ...

Conflicts:
	src/game/Game/LevelSystem.cpp
	src/game/Physics/PhysicsSystem.cpp

2015-10-14 15:43:34 +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

"Lightening" particle bugg fixed. Scale and alpha interpolation implemented through ScalarInterpolation-funtion

2015-10-13 15:22:11 +02:00

CParticleEmitter.h

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

2015-10-13 17:02:31 +02:00

CPhysics.h

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

2015-10-08 20:08:10 +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

Added two new particle sprites.

2015-10-08 18:19:15 +02:00

ECreateParticleSequence.h

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

2015-10-13 17:02:31 +02:00

ESetImpulse.h

SetImpulse event

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

PhysicsSystem.h

Merge branch 'master' into water

2015-10-14 15:43:34 +02:00