Jace fc7f57fd5d Merge remote-tracking branch 'origin/master' ...

Conflicts:
	resources/Schema/Entities/ScoreBoard_Main.xml

2016-03-13 22:27:17 +01:00

..

Components

Merge branch 'master' into Movement

2016-03-13 22:22:36 +01:00

Entities

Merge remote-tracking branch 'origin/master'

2016-03-13 22:27:17 +01:00

Types

Merge branch 'master' into Movement

2016-03-13 22:22:36 +01:00

Components.xsd

Merge branch 'master' into Movement

2016-03-13 22:22:36 +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