stiffly 0a8a9e5099 Merge remote-tracking branch 'origin/master' into Networking ...

# Conflicts:
#	src/Engine/Rendering/RenderState.cpp
#	src/Game/Game.cpp

2015-12-15 11:50:01 +01:00

..

Components

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

2015-12-15 11:50:01 +01:00

Entities

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

2015-12-15 11:50:01 +01:00

Types

Added Component to Components.xsd and Entity.xsd

2015-12-11 14:27:54 +01:00

Components.xsd

Added Component to Components.xsd and Entity.xsd

2015-12-11 14:27:54 +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