William Moberg 4f99f6ef74 Merge branch 'master' into RestartMap ...

# Conflicts:
#	src/Game/Systems/CapturePointSystem.cpp

2016-03-13 13:37:51 +01:00

..

Components

Merge branch 'master' into RestartMap

2016-03-13 13:37:51 +01:00

Entities

Fixed rotation/translation on some objects on CP_Rocky2.

2016-03-13 13:13:14 +01:00

Types

Options menu started working on

2016-03-11 13:00:34 +01:00

Components.xsd

Options menu started working on

2016-03-11 13:00:34 +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