Jace b2213dbe9a Merge remote-tracking branch 'origin/master' into PlayerMovement ...

# Conflicts:
#	include/Engine/Collision/Collision.h
#	include/Engine/Collision/CollisionSystem.h
#	include/Engine/Collision/TriggerSystem.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/CollisionTestLevel.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Collision/Collision.cpp
#	src/Game/Game.cpp

2016-01-15 20:28:43 +01:00

..

Components

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

2016-01-15 20:28:43 +01:00

Entities

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

2016-01-15 20:28:43 +01:00

Types

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

2016-01-15 20:28:43 +01:00

Components.xsd

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

2016-01-15 20:28:43 +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