Tleety 2cb4a307eb Merge branch 'master' into HUD-Timers ...

# Conflicts:
#	resources/Schema/Entities/QualityAssurance.xml
#	src/Game/Game.cpp

2016-03-02 22:42:12 +01:00

..

Components

Merge branch 'master' into HUD-Timers

2016-03-02 22:42:12 +01:00

Entities

Merge branch 'master' into HUD-Timers

2016-03-02 22:42:12 +01:00

Types

Merge branch 'master' into HUD-Timers

2016-03-02 22:42:12 +01:00

Components.xsd

Merge branch 'master' into HUD-Timers

2016-03-02 22:42:12 +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