stiffly 330f08b926 Merge remote-tracking branch 'origin/master' into Networking ...

# Conflicts:
#	include/Game/PlayerSystem.h
#	src/Game/Game.cpp
#	src/Game/PlayerSystem.cpp

2015-12-18 14:18:53 +01:00

..

Components

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

2015-12-18 14:18:53 +01:00

Entities

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

2015-12-18 14:18:53 +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