verysecrethero 8f257b9a58 Merge remote-tracking branch 'origin/master' into CapturePointTake ...

# Conflicts:
#	src/Game/Game.cpp
#	src/Tests/ResourceManagerTest.cpp

2016-01-15 11:24:20 +01:00

..

Components

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

2016-01-15 11:24:20 +01:00

Entities

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

2016-01-12 16:13:20 +01:00

Types

Removed ShootEvent from CapturePoint

2016-01-15 11:17:22 +01:00

Components.xsd

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

2016-01-15 11:24:20 +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