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

# Conflicts:
#	include/Engine/Rendering/RenderQueueFactory.h

2015-12-14 19:11:00 +01:00

..

EditorTestWorld.xml

Editor version 1

2015-12-14 13:57:55 +01:00

OtherEntity.xml

Updated schema with custom type names to better match their C++ counterparts

2015-11-26 16:09:11 +01:00

Test.xml

Fixed some transparency bugs and started on component based camera

2015-12-14 19:10:00 +01:00