verysecrethero b1ae96f737 Merge remote-tracking branch 'origin/master' into AndersTest ...

# Conflicts:
#	include/Game/Game.h
#	src/Engine/Core/OctTree.cpp
#	src/Game/Game.cpp
#	src/Tests/CMakeLists.txt
#	src/Tests/OctTreeTest.cpp
#	src/Tests/WorldTest.cpp

2015-12-18 11:57:21 +01:00

..

EventFixture.h

The tests seems to work under boost 1.59 but test explorer window is broken in 1.60. also changed ResourceManagerTest.cpp

2015-12-18 11:37:02 +01:00

OctTreeTestGameClass.h

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

2015-12-18 11:57:21 +01:00

OctTreeTestHardCodedTestWorld.h

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

2015-12-18 11:57:21 +01:00