Jace b95c1fdfa4 Merge remote-tracking branch 'origin/Menu' ...

# Conflicts:
#	include/Engine/Rendering/ModelJob.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Entities/RenderingWorld.xml
#	src/Game/Game.cpp

2016-01-25 00:25:03 +01:00

..

Events

Added EntityWrapper::IsChildOf and made snapshot interpolation and rendering exceptions for player less hacky

2016-01-23 11:44:16 +01:00

Systems

Merge remote-tracking branch 'origin/Menu'

2016-01-25 00:25:03 +01:00

Game.h

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

2016-01-21 10:19:32 +01:00