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

# Conflicts:
#	src/Engine/Editor/EditorSystem.cpp
#	src/Engine/Rendering/PickingPass.cpp
#	src/Game/Game.cpp

2015-12-17 11:17:58 +01:00

..

Engine

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

2015-12-17 11:17:58 +01:00

Game

Added RenderSystem and removed RenderQueueFactory

2015-12-14 20:07:02 +01:00