William Moberg b2d35c80f7 Merge branch 'master' into FrustumCulling ...

# Conflicts:
#	src/Engine/Collision/Collision.cpp

2016-02-10 15:08:40 +01:00

..

Engine

Merge branch 'master' into FrustumCulling

2016-02-10 15:08:40 +01:00

Game

Drum sounds does not start every single time a TriggerTouch happens. Specific and temporary logic for play test.

2016-02-10 11:36:54 +01:00