Tleety 0a21fe15dd Merge remote-tracking branch 'origin/master' into ScoreBoard ...

# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Types/Entity.xsd

2016-03-03 22:56:39 +01:00

..

Components

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

2016-03-03 22:56:39 +01:00

Entities

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

2016-03-03 22:56:39 +01:00

Types

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

2016-03-03 22:56:39 +01:00

Components.xsd

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

2016-03-03 22:56:39 +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