Jocke da81f21799 Merge remote-tracking branch 'origin/master' into SniperSprintBranch ...

# Conflicts:
#	include/Engine/Input/FirstPersonInputController.h

2016-03-03 12:16:09 +01:00

..

Components

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

2016-03-03 12:16:09 +01:00

Entities

Merge branch 'master' into HUD-Timers

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

Types

Merge remote-tracking branch 'origin/master' into HUD-Timers

2016-03-02 22:49:26 +01:00

Components.xsd

Merge remote-tracking branch 'origin/master' into HUD-Timers

2016-03-02 22:49:26 +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