viktorljung d03b3fb071 Merge remote-tracking branch 'origin/master' into Menu ...

# Conflicts:
#	resources/Schema/Entities/Player.xml

2016-01-24 22:23:53 +01:00

..

Components

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

2016-01-24 20:48:17 +01:00

Entities

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

2016-01-24 22:23:53 +01:00

Types

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

2016-01-23 11:48:10 +01:00

Components.xsd

HealthMeter

2016-01-23 14:53:17 +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