William Moberg 4cf6dcfc14 Merge branch 'master' into AsyncResourceLoad ...

# Conflicts:
#	include/Engine/Rendering/RawModel.h
#	src/Engine/Rendering/RenderQueueFactory.cpp

2016-01-15 10:10:57 +01:00

..

CollisionTestLevel.xml

WIP, multithreaded loading based on exceptions, very slow probably.

2016-01-13 10:58:31 +01:00

EditorTestWorld.xml

Working rotations and translations relative to global and local space for children

2015-12-16 17:20:56 +01:00

Empty.xml

Added template entity "Empty.xml" for use as root entity when creating a new map.

2016-01-11 16:40:26 +01:00

OtherEntity.xml

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

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

RaptorCopter.xml

EntityFilePreprocessor

2016-01-11 14:35:15 +01:00

RenderingWorld.xml

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

2016-01-12 16:13:20 +01:00

Test.xml

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

2016-01-12 16:13:20 +01:00