viktorljung e7427bf3ad Merge remote-tracking branch 'origin/master' into Rendering ...

# Conflicts:
#	include/Game/HardcodedTestWorld.h

2015-12-08 10:15:00 +01:00

..

Game.h

Added a RenderQueueFactory that produces a RenderQueueCollection for the Renderer to use.

2015-12-07 16:24:34 +01:00

HardcodedTestWorld.h

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

2015-12-08 10:15:00 +01:00