William Moberg d7b02e79c8 Merge branch 'master' into BoxModelCollision ...

# Conflicts:
#	include/Engine/Collision/CollisionSystem.h
#	src/Engine/Collision/CollisionSystem.cpp

2016-02-01 13:48:05 +01:00

..

Components

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

2016-01-27 15:41:31 +01:00

Entities

Merge branch 'master' into BoxModelCollision

2016-02-01 13:48:05 +01:00

Types

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

Components.xsd

Merge branch 'Cleanup'

2016-01-27 13:44:15 +01:00

Types.xsd

Basic movement and camera management between players and editor

2016-01-22 16:12:51 +01:00

xml.xsd

Updated schema

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