Jace 47f4711b85 Merge remote-tracking branch 'origin/Menu' into WeaponSystem ...

# Conflicts:
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Types/Entity.xsd
#	src/Game/Systems/PlayerSpawnSystem.cpp

2016-02-12 07:18:20 +01:00

..

Color.xsd

Added Model component to schema

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

Entity.xsd

Merge remote-tracking branch 'origin/Menu' into WeaponSystem

2016-02-12 07:18:20 +01:00

Quaternion.xsd

Added resource folder for lightweight run-time resources that is also relevant to code, eg. shaders and XML schemas

2015-11-20 16:06:30 +01:00

TeamEnum.xsd

Made entity parser give more useful errors and fixed the errors that were while I was at it

2016-01-27 15:16:59 +01:00

Vector.xsd

Added resource folder for lightweight run-time resources that is also relevant to code, eg. shaders and XML schemas

2015-11-20 16:06:30 +01:00