Tleety 2cb4a307eb Merge branch 'master' into HUD-Timers ...

# Conflicts:
#	resources/Schema/Entities/QualityAssurance.xml
#	src/Game/Game.cpp

2016-03-02 22:42:12 +01:00

..

Color.xsd

Added Model component to schema

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

Entity.xsd

Merge branch 'master' into HUD-Timers

2016-03-02 22:42:12 +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

WeaponSlotEnum.xsd

WIP multi-weapon behaviours

2016-02-29 06:58:57 +01:00