Jace a715f7fe86 Merge branch 'master' into Movement ...

# Conflicts:
#	include/Engine/Network/Client.h
#	resources/DefaultConfig.ini
#	resources/Schema/Entities/OverwatchCamera.xml
#	resources/Schema/Types/Entity.xsd

2016-03-13 22:22:36 +01:00

..

Color.xsd

Added Model component to schema

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

Entity.xsd

Merge branch 'master' into Movement

2016-03-13 22:22:36 +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