William Moberg 46ae2d39af Merge branch 'master' into OctTree ...

# Conflicts:
#	src/Game/Game.cpp

2015-12-17 16:44:01 +01:00

..

Components

Merge branch 'master' into OctTree

2015-12-17 16:44:01 +01:00

Entities

Merge branch 'master' into OctTree

2015-12-17 16:44:01 +01:00

Types

Added Component to Components.xsd and Entity.xsd

2015-12-11 14:27:54 +01:00

Components.xsd

Started on CollisionSystem and TriggerSystem. Moved collision code to Collision folder.

2015-12-14 17:08:00 +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