Tleety e7bb8954bf Merge remote-tracking branch 'origin/master' into Forward+ ...

# Conflicts:
#	include/Engine/Rendering/Renderer.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Test.xml
#	src/Engine/Rendering/Renderer.cpp

2016-01-06 11:35:55 +01:00

..

Components

Merge remote-tracking branch 'origin/master' into Forward+

2016-01-06 11:35:55 +01:00

Entities

Merge branch 'Forward+' of github.com:teamfisk/TacticalZ into Forward+

2015-12-18 15:28:25 +01:00

Types

Added PointLight Component in XML files

2015-12-18 13:20:55 +01:00

Components.xsd

Merge remote-tracking branch 'origin/master' into Forward+

2016-01-06 11:35:55 +01:00

Types.xsd

Added Model component to schema

2015-12-08 18:21:24 +01:00

xml.xsd

Updated schema

2015-11-25 18:04:11 +01:00