William Moberg 97b915f130 Merge branch 'master' into Respawning ...

# Conflicts:
#	src/Game/Game.cpp
#	src/Game/Systems/PlayerSpawnSystem.cpp
#	src/Game/Systems/SoundSystem.cpp

2016-02-11 16:15:47 +01:00

..

Components

Fixed depth sorting for HUD elements.

2016-02-11 15:27:07 +01:00

Entities

Merge branch 'master' into Respawning

2016-02-11 16:15:47 +01:00

Types

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

2016-02-11 14:43:30 +01:00

Components.xsd

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

2016-02-11 14:43:30 +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