William Moberg ce7b26ccac Merge branch 'master' into OctTree ...

# Conflicts:
#	include/Game/Game.h
#	include/Game/HardcodedTestWorld.h
#	src/Game/Game.cpp

2015-12-10 16:37:55 +01:00

..

Engine

Merge branch 'master' into OctTree

2015-12-10 16:37:55 +01:00

Game

OctTree doesn't check the same object multiple times if it exists in multiple places in the tree.

2015-12-10 16:04:55 +01:00