William Moberg 9f6fa40448 Merge branch 'master' into BoxModelCollision ...

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

2016-01-21 17:16:55 +01:00

..

Engine

Merge branch 'master' into BoxModelCollision

2016-01-21 17:16:55 +01:00

Game

Merge pull request #44 from teamfisk/EditorUsefulness

2016-01-21 17:03:52 +01:00